392 files changed, 8251 insertions, 3837 deletions

diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index e723b0fd8e4..5e1ad3cd1bb 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -47,7 +47,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20090903
+#define ACPI_CA_VERSION                 0x20091112
 
 #include "actypes.h"
 #include "actbl.h"
@@ -154,7 +154,8 @@ acpi_status
 acpi_walk_namespace(acpi_object_type type,
                     acpi_handle start_object,
                     u32 max_depth,
-                    acpi_walk_callback user_function,
+                    acpi_walk_callback pre_order_visit,
+                    acpi_walk_callback post_order_visit,
                     void *context, void **return_value);
 
 acpi_status
diff --git a/include/asm-generic/cacheflush.h b/include/asm-generic/cacheflush.h
index ba4ec39a113..57b5c3c82e8 100644
--- a/include/asm-generic/cacheflush.h
+++ b/include/asm-generic/cacheflush.h
@@ -13,6 +13,7 @@
 #define flush_cache_dup_mm(mm)                  do { } while (0)
 #define flush_cache_range(vma, start, end)      do { } while (0)
 #define flush_cache_page(vma, vmaddr, pfn)      do { } while (0)
+#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0
 #define flush_dcache_page(page)                 do { } while (0)
 #define flush_dcache_mmap_lock(mapping)         do { } while (0)
 #define flush_dcache_mmap_unlock(mapping)       do { } while (0)
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h
index cd2d7896e34..495dc8af404 100644
--- a/include/asm-generic/fcntl.h
+++ b/include/asm-generic/fcntl.h
@@ -89,7 +89,7 @@
 
 #define F_OWNER_TID     0
 #define F_OWNER_PID     1
-#define F_OWNER_GID     2
+#define F_OWNER_PGRP    2
 
 struct f_owner_ex {
         int     type;
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h
index 4c8d0afae71..fb2d63f13f4 100644
--- a/include/asm-generic/memory_model.h
+++ b/include/asm-generic/memory_model.h
@@ -47,7 +47,7 @@
 
 #elif defined(CONFIG_SPARSEMEM_VMEMMAP)
 
-/* memmap is virtually contigious.  */
+/* memmap is virtually contiguous.  */
 #define __pfn_to_page(pfn)      (vmemmap + (pfn))
 #define __page_to_pfn(page)     (unsigned long)((page) - vmemmap)
 
diff --git a/include/asm-generic/socket.h b/include/asm-generic/socket.h
index 538991cef6f..9a6115e7cf6 100644
--- a/include/asm-generic/socket.h
+++ b/include/asm-generic/socket.h
@@ -63,4 +63,5 @@
 #define SO_PROTOCOL             38
 #define SO_DOMAIN               39
 
+#define SO_RXQ_OVFL             40
 #endif /* __ASM_GENERIC_SOCKET_H */
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h
index d76b66acea9..7c38c147e5e 100644
--- a/include/asm-generic/unistd.h
+++ b/include/asm-generic/unistd.h
@@ -631,7 +631,7 @@ __SYSCALL(__NR_perf_event_open, sys_perf_event_open)
  * these are provided for both review and as a porting
  * help for the C library version.
 *
- * Last chance: are any of these important enought to
+ * Last chance: are any of these important enough to
  * enable by default?
  */
 #ifdef __ARCH_WANT_SYSCALL_NO_AT
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 1ffb53f74d3..fc0d575c71e 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -106,7 +106,6 @@ struct blkcipher_walk {
 extern const struct crypto_type crypto_ablkcipher_type;
 extern const struct crypto_type crypto_aead_type;
 extern const struct crypto_type crypto_blkcipher_type;
-extern const struct crypto_type crypto_hash_type;
 
 void crypto_mod_put(struct crypto_alg *alg);
 
diff --git a/include/crypto/cryptd.h b/include/crypto/cryptd.h
index 2f65a6e8ea4..1c96b255017 100644
--- a/include/crypto/cryptd.h
+++ b/include/crypto/cryptd.h
@@ -39,6 +39,7 @@ static inline struct cryptd_ahash *__cryptd_ahash_cast(
 struct cryptd_ahash *cryptd_alloc_ahash(const char *alg_name,
                                         u32 type, u32 mask);
 struct crypto_shash *cryptd_ahash_child(struct cryptd_ahash *tfm);
+struct shash_desc *cryptd_shash_desc(struct ahash_request *req);
 void cryptd_free_ahash(struct cryptd_ahash *tfm);
 
 #endif
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 1feed71551c..5a5385749e1 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -330,6 +330,7 @@ unifdef-y += scc.h
 unifdef-y += sched.h
 unifdef-y += screen_info.h
 unifdef-y += sdla.h
+unifdef-y += securebits.h
 unifdef-y += selinux_netlink.h
 unifdef-y += sem.h
 unifdef-y += serial_core.h
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 4fb357312b3..38a6948ce0c 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -75,6 +75,7 @@ enum {
         ATA_ID_EIDE_DMA_TIME    = 66,
         ATA_ID_EIDE_PIO         = 67,
         ATA_ID_EIDE_PIO_IORDY   = 68,
+        ATA_ID_ADDITIONAL_SUPP  = 69,
         ATA_ID_QUEUE_DEPTH      = 75,
         ATA_ID_MAJOR_VER        = 80,
         ATA_ID_COMMAND_SET_1    = 82,
@@ -87,6 +88,7 @@ enum {
         ATA_ID_HW_CONFIG        = 93,
         ATA_ID_SPG              = 98,
         ATA_ID_LBA_CAPACITY_2   = 100,
+        ATA_ID_SECTOR_SIZE      = 106,
         ATA_ID_LAST_LUN         = 126,
         ATA_ID_DLF              = 128,
         ATA_ID_CSFO             = 129,
@@ -638,6 +640,18 @@ static inline int ata_id_flush_ext_enabled(const u16 *id)
         return (id[ATA_ID_CFS_ENABLE_2] & 0x2400) == 0x2400;
 }
 
+static inline int ata_id_has_large_logical_sectors(const u16 *id)
+{
+        if ((id[ATA_ID_SECTOR_SIZE] & 0xc000) != 0x4000)
+                return 0;
+        return id[ATA_ID_SECTOR_SIZE] & (1 << 13);
+}
+
+static inline u8 ata_id_logical_per_physical_sectors(const u16 *id)
+{
+        return id[ATA_ID_SECTOR_SIZE] & 0xf;
+}
+
 static inline int ata_id_has_lba48(const u16 *id)
 {
         if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
@@ -803,6 +817,16 @@ static inline int ata_id_has_trim(const u16 *id)
         return 0;
 }
 
+static inline int ata_id_has_zero_after_trim(const u16 *id)
+{
+        /* DSM supported, deterministic read, and read zero after trim set */
+        if (ata_id_has_trim(id) &&
+            (id[ATA_ID_ADDITIONAL_SUPP] & 0x4020) == 0x4020)
+                return 1;
+
+        return 0;
+}
+
 static inline int ata_id_current_chs_valid(const u16 *id)
 {
         /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
@@ -958,17 +982,17 @@ static inline void ata_id_to_hd_driveid(u16 *id)
 }
 
 /*
- * Write up to 'max' LBA Range Entries to the buffer that will cover the
- * extent from sector to sector + count.  This is used for TRIM and for
- * ADD LBA(S) TO NV CACHE PINNED SET.
+ * Write LBA Range Entries to the buffer that will cover the extent from
+ * sector to sector + count.  This is used for TRIM and for ADD LBA(S)
+ * TO NV CACHE PINNED SET.
  */
-static inline unsigned ata_set_lba_range_entries(void *_buffer, unsigned max,
-                                                u64 sector, unsigned long count)
+static inline unsigned ata_set_lba_range_entries(void *_buffer,
+                unsigned buf_size, u64 sector, unsigned long count)
 {
         __le64 *buffer = _buffer;
-        unsigned i = 0;
+        unsigned i = 0, used_bytes;
 
-        while (i < max) {
+        while (i < buf_size / 8 ) { /* 6-byte LBA + 2-byte range per entry */
                 u64 entry = sector |
                         ((u64)(count > 0xffff ? 0xffff : count) << 48);
                 buffer[i++] = __cpu_to_le64(entry);
@@ -978,9 +1002,9 @@ static inline unsigned ata_set_lba_range_entries(void *_buffer, unsigned max,
                 sector += 0xffff;
         }
 
-        max = ALIGN(i * 8, 512);
-        memset(buffer + i, 0, max - i * 8);
-        return max;
+        used_bytes = ALIGN(i * 8, 512);
+        memset(buffer + i, 0, used_bytes - i * 8);
+        return used_bytes;
 }
 
 static inline int is_multi_taskfile(struct ata_taskfile *tf)
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index b449e738533..fcbc26af00e 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -331,4 +331,17 @@ static inline int bdi_sched_wait(void *word)
         return 0;
 }
 
+static inline void blk_run_backing_dev(struct backing_dev_info *bdi,
+                                       struct page *page)
+{
+        if (bdi && bdi->unplug_io_fn)
+                bdi->unplug_io_fn(bdi, page);
+}
+
+static inline void blk_run_address_space(struct address_space *mapping)
+{
+        if (mapping)
+                blk_run_backing_dev(mapping->backing_dev_info, NULL);
+}
+
 #endif          /* _LINUX_BACKING_DEV_H */
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 5be93f18d84..7fc5606e6ea 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -391,6 +391,18 @@ extern struct bio *bio_copy_kern(struct request_queue *, void *, unsigned int,
                                  gfp_t, int);
 extern void bio_set_pages_dirty(struct bio *bio);
 extern void bio_check_pages_dirty(struct bio *bio);
+
+#ifndef ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
+# error "You should define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE for your platform"
+#endif
+#if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
+extern void bio_flush_dcache_pages(struct bio *bi);
+#else
+static inline void bio_flush_dcache_pages(struct bio *bi)
+{
+}
+#endif
+
 extern struct bio *bio_copy_user(struct request_queue *, struct rq_map_data *,
                                  unsigned long, unsigned int, int, gfp_t);
 extern struct bio *bio_copy_user_iov(struct request_queue *,
@@ -450,11 +462,8 @@ extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly;
 /*
  * remember never ever reenable interrupts between a bvec_kmap_irq and
  * bvec_kunmap_irq!
- *
- * This function MUST be inlined - it plays with the CPU interrupt flags.
  */
-static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec,
-                unsigned long *flags)
+static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags)
 {
         unsigned long addr;
 
@@ -470,8 +479,7 @@ static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec,
         return (char *) addr + bvec->bv_offset;
 }
 
-static __always_inline void bvec_kunmap_irq(char *buffer,
-                unsigned long *flags)
+static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags)
 {
         unsigned long ptr = (unsigned long) buffer & PAGE_MASK;
 
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 221cecd86bd..784a919aa0d 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -312,13 +312,17 @@ struct queue_limits {
         unsigned int            io_min;
         unsigned int            io_opt;
         unsigned int            max_discard_sectors;
+        unsigned int            discard_granularity;
+        unsigned int            discard_alignment;
 
         unsigned short          logical_block_size;
         unsigned short          max_hw_segments;
         unsigned short          max_phys_segments;
 
         unsigned char           misaligned;
+        unsigned char           discard_misaligned;
         unsigned char           no_cluster;
+        signed char             discard_zeroes_data;
 };
 
 struct request_queue
@@ -749,6 +753,17 @@ struct req_iterator {
 #define rq_iter_last(rq, _iter)                                 \
                 (_iter.bio->bi_next == NULL && _iter.i == _iter.bio->bi_vcnt-1)
 
+#ifndef ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
+# error "You should define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE for your platform"
+#endif
+#if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
+extern void rq_flush_dcache_pages(struct request *rq);
+#else
+static inline void rq_flush_dcache_pages(struct request *rq)
+{
+}
+#endif
+
 extern int blk_register_queue(struct gendisk *disk);
 extern void blk_unregister_queue(struct gendisk *disk);
 extern void register_disk(struct gendisk *dev);
@@ -823,19 +838,6 @@ static inline struct request_queue *bdev_get_queue(struct block_device *bdev)
         return bdev->bd_disk->queue;
 }
 
-static inline void blk_run_backing_dev(struct backing_dev_info *bdi,
-                                       struct page *page)
-{
-        if (bdi && bdi->unplug_io_fn)
-                bdi->unplug_io_fn(bdi, page);
-}
-
-static inline void blk_run_address_space(struct address_space *mapping)
-{
-        if (mapping)
-                blk_run_backing_dev(mapping->backing_dev_info, NULL);
-}
-
 /*
  * blk_rq_pos()                 : the current sector
  * blk_rq_bytes()               : bytes left in the entire request
@@ -1134,6 +1136,34 @@ static inline int bdev_alignment_offset(struct block_device *bdev)
         return q->limits.alignment_offset;
 }
 
+static inline int queue_discard_alignment(struct request_queue *q)
+{
+        if (q->limits.discard_misaligned)
+                return -1;
+
+        return q->limits.discard_alignment;
+}
+
+static inline int queue_sector_discard_alignment(struct request_queue *q,
+                                                 sector_t sector)
+{
+        return ((sector << 9) - q->limits.discard_alignment)
+                & (q->limits.discard_granularity - 1);
+}
+
+static inline unsigned int queue_discard_zeroes_data(struct request_queue *q)
+{
+        if (q->limits.discard_zeroes_data == 1)
+                return 1;
+
+        return 0;
+}
+
+static inline unsigned int bdev_discard_zeroes_data(struct block_device *bdev)
+{
+        return queue_discard_zeroes_data(bdev_get_queue(bdev));
+}
+
 static inline int queue_dma_alignment(struct request_queue *q)
 {
         return q ? q->dma_alignment : 511;
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index dd97fb8408a..b10ec49ee2d 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -53,6 +53,7 @@ extern void free_bootmem_node(pg_data_t *pgdat,
                               unsigned long addr,
                               unsigned long size);
 extern void free_bootmem(unsigned long addr, unsigned long size);
+extern void free_bootmem_late(unsigned long addr, unsigned long size);
 
 /*
  * Flags for reserve_bootmem (also if CONFIG_HAVE_ARCH_BOOTMEM_NODE,
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 9b64b6d6787..2b31b91f587 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -1,6 +1,13 @@
-#define PHY_BRCM_WIRESPEED_ENABLE       0x00000001
-#define PHY_BRCM_AUTO_PWRDWN_ENABLE     0x00000002
-#define PHY_BRCM_APD_CLK125_ENABLE      0x00000004
-#define PHY_BRCM_STD_IBND_DISABLE       0x00000008
-#define PHY_BRCM_EXT_IBND_RX_ENABLE     0x00000010
-#define PHY_BRCM_EXT_IBND_TX_ENABLE     0x00000020
+#define PHY_BCM_FLAGS_MODE_COPPER       0x00000001
+#define PHY_BCM_FLAGS_MODE_1000BX       0x00000002
+#define PHY_BCM_FLAGS_INTF_SGMII        0x00000010
+#define PHY_BCM_FLAGS_INTF_XAUI         0x00000020
+#define PHY_BRCM_WIRESPEED_ENABLE       0x00000100
+#define PHY_BRCM_AUTO_PWRDWN_ENABLE     0x00000200
+#define PHY_BRCM_RX_REFCLK_UNUSED       0x00000400
+#define PHY_BRCM_STD_IBND_DISABLE       0x00000800
+#define PHY_BRCM_EXT_IBND_RX_ENABLE     0x00001000
+#define PHY_BRCM_EXT_IBND_TX_ENABLE     0x00002000
+#define PHY_BRCM_CLEAR_RGMII_MODE       0x00004000
+#define PHY_BRCM_DIS_TXCRXC_NOENRGY     0x00008000
+#define PHY_BCM_FLAGS_VALID             0x80000000
diff --git a/include/linux/can/core.h b/include/linux/can/core.h
index 25085cbadcf..6c507bea275 100644
--- a/include/linux/can/core.h
+++ b/include/linux/can/core.h
@@ -32,14 +32,12 @@
  * struct can_proto - CAN protocol structure
  * @type:       type argument in socket() syscall, e.g. SOCK_DGRAM.
  * @protocol:   protocol number in socket() syscall.
- * @capability: capability needed to open the socket, or -1 for no restriction.
  * @ops:        pointer to struct proto_ops for sock->ops.
  * @prot:       pointer to struct proto structure.
  */
 struct can_proto {
         int              type;
         int              protocol;
-        int              capability;
         struct proto_ops *ops;
         struct proto     *prot;
 };
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 5824b20b5fc..1ed2a5cc03f 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -29,8 +29,6 @@ enum can_mode {
 /*
  * CAN common private data
  */
-#define CAN_ECHO_SKB_MAX  4
-
 struct can_priv {
         struct can_device_stats can_stats;
 
@@ -44,15 +42,16 @@ struct can_priv {
         int restart_ms;
         struct timer_list restart_timer;
 
-        struct sk_buff *echo_skb[CAN_ECHO_SKB_MAX];
-
         int (*do_set_bittiming)(struct net_device *dev);
         int (*do_set_mode)(struct net_device *dev, enum can_mode mode);
         int (*do_get_state)(const struct net_device *dev,
                             enum can_state *state);
+
+        unsigned int echo_skb_max;
+        struct sk_buff **echo_skb;
 };
 
-struct net_device *alloc_candev(int sizeof_priv);
+struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max);
 void free_candev(struct net_device *dev);
 
 int open_candev(struct net_device *dev);
@@ -64,8 +63,13 @@ void unregister_candev(struct net_device *dev);
 int can_restart_now(struct net_device *dev);
 void can_bus_off(struct net_device *dev);
 
-void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev, int idx);
-void can_get_echo_skb(struct net_device *dev, int idx);
-void can_free_echo_skb(struct net_device *dev, int idx);
+void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,
+                      unsigned int idx);
+void can_get_echo_skb(struct net_device *dev, unsigned int idx);
+void can_free_echo_skb(struct net_device *dev, unsigned int idx);
+
+struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf);
+struct sk_buff *alloc_can_err_skb(struct net_device *dev,
+                                  struct can_frame **cf);
 
 #endif /* CAN_DEV_H */
diff --git a/include/linux/can/platform/mcp251x.h b/include/linux/can/platform/mcp251x.h
new file mode 100644
index 00000000000..1448177d86d
--- /dev/null
+++ b/include/linux/can/platform/mcp251x.h
@@ -0,0 +1,36 @@
+#ifndef __CAN_PLATFORM_MCP251X_H__
+#define __CAN_PLATFORM_MCP251X_H__
+
+/*
+ *
+ * CAN bus driver for Microchip 251x CAN Controller with SPI Interface
+ *
+ */
+
+#include <linux/spi/spi.h>
+
+/**
+ * struct mcp251x_platform_data - MCP251X SPI CAN controller platform data
+ * @oscillator_frequency:       - oscillator frequency in Hz
+ * @model:                      - actual type of chip
+ * @board_specific_setup:       - called before probing the chip (power,reset)
+ * @transceiver_enable:         - called to power on/off the transceiver
+ * @power_enable:               - called to power on/off the mcp *and* the
+ *                                transceiver
+ *
+ * Please note that you should define power_enable or transceiver_enable or
+ * none of them. Defining both of them is no use.
+ *
+ */
+
+struct mcp251x_platform_data {
+        unsigned long oscillator_frequency;
+        int model;
+#define CAN_MCP251X_MCP2510 0
+#define CAN_MCP251X_MCP2515 1
+        int (*board_specific_setup)(struct spi_device *spi);
+        int (*transceiver_enable)(int enable);
+        int (*power_enable) (int enable);
+};
+
+#endif /* __CAN_PLATFORM_MCP251X_H__ */
diff --git a/include/linux/can/platform/ti_hecc.h b/include/linux/can/platform/ti_hecc.h
new file mode 100644
index 00000000000..4688c7bb1bd
--- /dev/null
+++ b/include/linux/can/platform/ti_hecc.h
@@ -0,0 +1,40 @@
+/*
+ * TI HECC (High End CAN Controller) driver platform header
+ *
+ * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed as is WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+/**
+ * struct hecc_platform_data - HECC Platform Data
+ *
+ * @scc_hecc_offset:    mostly 0 - should really never change
+ * @scc_ram_offset:     SCC RAM offset
+ * @hecc_ram_offset:    HECC RAM offset
+ * @mbx_offset:         Mailbox RAM offset
+ * @int_line:           Interrupt line to use - 0 or 1
+ * @version:            version for future use
+ *
+ * Platform data structure to get all platform specific settings.
+ * this structure also accounts the fact that the IP may have different
+ * RAM and mailbox offsets for different SOC's
+ */
+struct ti_hecc_platform_data {
+        u32 scc_hecc_offset;
+        u32 scc_ram_offset;
+        u32 hecc_ram_offset;
+        u32 mbx_offset;
+        u32 int_line;
+        u32 version;
+};
+
+
diff --git a/include/linux/capability.h b/include/linux/capability.h
index c8f2a5f70ed..39e5ff512fb 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -92,9 +92,7 @@ struct vfs_cap_data {
 #define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3
 #define _KERNEL_CAPABILITY_U32S    _LINUX_CAPABILITY_U32S_3
 
-#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
 extern int file_caps_enabled;
-#endif
 
 typedef struct kernel_cap_struct {
         __u32 cap[_KERNEL_CAPABILITY_U32S];
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h
index cb57c30081a..eb130b4d8e7 100644
--- a/include/linux/cciss_ioctl.h
+++ b/include/linux/cciss_ioctl.h
@@ -39,7 +39,7 @@ typedef __u32 DriverVer_type;
 #ifndef CCISS_CMD_H
 // This defines are duplicated in cciss_cmd.h in the driver directory 
 
-//general boundary defintions
+//general boundary definitions
 #define SENSEINFOBYTES          32//note that this value may vary between host implementations
 
 //Command Status value
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index 9c8d31bacf4..ccefff02b6c 100644
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -60,3 +60,9 @@ SUBSYS(net_cls)
 #endif
 
 /* */
+
+#ifdef CONFIG_BLK_CGROUP
+SUBSYS(blkio)
+#endif
+
+/* */
diff --git a/include/linux/chio.h b/include/linux/chio.h
index 519248d8b2b..d9bac7f9728 100644
--- a/include/linux/chio.h
+++ b/include/linux/chio.h
@@ -21,7 +21,7 @@
  *    query vendor-specific element types
  *
  *    accessing elements works by specifing type and unit of the element.
- *    for eample, storage elements are addressed with type = CHET_ST and
+ *    for example, storage elements are addressed with type = CHET_ST and
  *    unit = 0 .. cp_nslots-1
  *
  */
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 3a1dbba4d3a..0cf725bdd2a 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -77,10 +77,10 @@ enum clock_event_nofitiers {
 struct clock_event_device {
         const char              *name;
         unsigned int            features;
-        unsigned long           max_delta_ns;
-        unsigned long           min_delta_ns;
-        unsigned long           mult;
-        int                     shift;
+        u64                     max_delta_ns;
+        u64                     min_delta_ns;
+        u32                     mult;
+        u32                     shift;
         int                     rating;
         int                     irq;
         const struct cpumask    *cpumask;
@@ -116,8 +116,8 @@ static inline unsigned long div_sc(unsigned long ticks, unsigned long nsec,
 }
 
 /* Clock event layer functions */
-extern unsigned long clockevent_delta2ns(unsigned long latch,
-                                         struct clock_event_device *evt);
+extern u64 clockevent_delta2ns(unsigned long latch,
+                               struct clock_event_device *evt);
 extern void clockevents_register_device(struct clock_event_device *dev);
 
 extern void clockevents_exchange_device(struct clock_event_device *old,
@@ -130,6 +130,13 @@ extern int clockevents_program_event(struct clock_event_device *dev,
 
 extern void clockevents_handle_noop(struct clock_event_device *dev);
 
+static inline void
+clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec)
+{
+        return clocks_calc_mult_shift(&ce->mult, &ce->shift, NSEC_PER_SEC,
+                                      freq, minsec);
+}
+
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
 extern void clockevents_notify(unsigned long reason, void *arg);
 #else
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 83d2fbd81b9..8a4a130cc19 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -151,6 +151,7 @@ extern u64 timecounter_cyc2time(struct timecounter *tc,
  *                      subtraction of non 64 bit counters
  * @mult:               cycle to nanosecond multiplier
  * @shift:              cycle to nanosecond divisor (power of two)
+ * @max_idle_ns:        max idle time permitted by the clocksource (nsecs)
  * @flags:              flags describing special properties
  * @vread:              vsyscall based read
  * @resume:             resume function for the clocksource, if necessary
@@ -168,6 +169,7 @@ struct clocksource {
         cycle_t mask;
         u32 mult;
         u32 shift;
+        u64 max_idle_ns;
         unsigned long flags;
         cycle_t (*vread)(void);
         void (*resume)(void);
@@ -279,11 +281,23 @@ extern void clocksource_resume(void);
 extern struct clocksource * __init __weak clocksource_default_clock(void);
 extern void clocksource_mark_unstable(struct clocksource *cs);
 
+extern void
+clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec);
+
+static inline void
+clocksource_calc_mult_shift(struct clocksource *cs, u32 freq, u32 minsec)
+{
+        return clocks_calc_mult_shift(&cs->mult, &cs->shift, freq,
+                                      NSEC_PER_SEC, minsec);
+}
+
 #ifdef CONFIG_GENERIC_TIME_VSYSCALL
-extern void update_vsyscall(struct timespec *ts, struct clocksource *c);
+extern void
+update_vsyscall(struct timespec *ts, struct clocksource *c, u32 mult);
 extern void update_vsyscall_tz(void);
 #else
-static inline void update_vsyscall(struct timespec *ts, struct clocksource *c)
+static inline void
+update_vsyscall(struct timespec *ts, struct clocksource *c, u32 mult)
 {
 }
 
diff --git a/include/linux/compat.h b/include/linux/compat.h
index af931ee43dd..ef68119a4fd 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -10,6 +10,8 @@
 #include <linux/stat.h>
 #include <linux/param.h>        /* for HZ */
 #include <linux/sem.h>
+#include <linux/socket.h>
+#include <linux/if.h>
 
 #include <asm/compat.h>
 #include <asm/siginfo.h>
@@ -154,6 +156,48 @@ typedef struct compat_sigevent {
         } _sigev_un;
 } compat_sigevent_t;
 
+struct compat_ifmap {
+        compat_ulong_t mem_start;
+        compat_ulong_t mem_end;
+        unsigned short base_addr;
+        unsigned char irq;
+        unsigned char dma;
+        unsigned char port;
+};
+
+struct compat_if_settings
+{
+        unsigned int type;      /* Type of physical device or protocol */
+        unsigned int size;      /* Size of the data allocated by the caller */
+        compat_uptr_t ifs_ifsu; /* union of pointers */
+};
+
+struct compat_ifreq {
+        union {
+                char    ifrn_name[IFNAMSIZ];    /* if name, e.g. "en0" */
+        } ifr_ifrn;
+        union {
+                struct  sockaddr ifru_addr;
+                struct  sockaddr ifru_dstaddr;
+                struct  sockaddr ifru_broadaddr;
+                struct  sockaddr ifru_netmask;
+                struct  sockaddr ifru_hwaddr;
+                short   ifru_flags;
+                compat_int_t    ifru_ivalue;
+                compat_int_t    ifru_mtu;
+                struct  compat_ifmap ifru_map;
+                char    ifru_slave[IFNAMSIZ];   /* Just fits the size */
+                char    ifru_newname[IFNAMSIZ];
+                compat_caddr_t  ifru_data;
+                struct  compat_if_settings ifru_settings;
+        } ifr_ifru;
+};
+
+struct compat_ifconf {
+        compat_int_t    ifc_len;                        /* size of buffer       */
+        compat_caddr_t  ifcbuf;
+};
+
 struct compat_robust_list {
         compat_uptr_t                   next;
 };
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index a3ed7cb8ca3..73dcf804bc9 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -79,6 +79,7 @@
 #define  noinline                       __attribute__((noinline))
 #define __attribute_const__             __attribute__((__const__))
 #define __maybe_unused                  __attribute__((unused))
+#define __always_unused                 __attribute__((unused))
 
 #define __gcc_header(x) #x
 #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index 450fa597c94..94dea3ffbfa 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -36,4 +36,26 @@
    the kernel context */
 #define __cold                  __attribute__((__cold__))
 
+
+#if __GNUC_MINOR__ >= 5
+/*
+ * Mark a position in code as unreachable.  This can be used to
+ * suppress control flow warnings after asm blocks that transfer
+ * control elsewhere.
+ *
+ * Early snapshots of gcc 4.5 don't support this and we can't detect
+ * this in the preprocessor, but we can live with this because they're
+ * unreleased.  Really, we need to have autoconf for the kernel.
+ */
+#define unreachable() __builtin_unreachable()
+#endif
+
+#endif
+
+#if __GNUC_MINOR__ > 0
+#define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
+#endif
+#if __GNUC_MINOR__ >= 4
+#define __compiletime_warning(message) __attribute__((warning(message)))
+#define __compiletime_error(message) __attribute__((error(message)))
 #endif
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 04fb5135b4e..5be3dab4a69 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -144,6 +144,11 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 # define barrier() __memory_barrier()
 #endif
 
+/* Unreachable code */
+#ifndef unreachable
+# define unreachable() do { } while (1)
+#endif
+
 #ifndef RELOC_HIDE
 # define RELOC_HIDE(ptr, off)                                   \
   ({ unsigned long __ptr;                                       \
@@ -213,6 +218,10 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 # define __maybe_unused         /* unimplemented */
 #endif
 
+#ifndef __always_unused
+# define __always_unused        /* unimplemented */
+#endif
+
 #ifndef noinline
 #define noinline
 #endif
@@ -266,6 +275,17 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
 #endif
 
+/* Compile time object size, -1 for unknown */
+#ifndef __compiletime_object_size
+# define __compiletime_object_size(obj) -1
+#endif
+#ifndef __compiletime_warning
+# define __compiletime_warning(message)
+#endif
+#ifndef __compiletime_error
+# define __compiletime_error(message)
+#endif
+
 /*
  * Prevent the compiler from merging or refetching accesses.  The compiler
  * is also forbidden from reordering successive instances of ACCESS_ONCE(),
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 3a14615fd35..72ba63eb83c 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -43,6 +43,8 @@
 #define CN_DST_VAL                      0x1
 #define CN_IDX_DM                       0x7     /* Device Mapper */
 #define CN_VAL_DM_USERSPACE_LOG         0x1
+#define CN_IDX_DRBD                     0x8
+#define CN_VAL_DRBD                     0x1
 
 #define CN_NETLINK_USERS                8
 
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index fd929889e8d..24d2e30f1b4 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -250,29 +250,6 @@ struct cipher_alg {
         void (*cia_decrypt)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
 };
 
-struct digest_alg {
-        unsigned int dia_digestsize;
-        void (*dia_init)(struct crypto_tfm *tfm);
-        void (*dia_update)(struct crypto_tfm *tfm, const u8 *data,
-                           unsigned int len);
-        void (*dia_final)(struct crypto_tfm *tfm, u8 *out);
-        int (*dia_setkey)(struct crypto_tfm *tfm, const u8 *key,
-                          unsigned int keylen);
-};
-
-struct hash_alg {
-        int (*init)(struct hash_desc *desc);
-        int (*update)(struct hash_desc *desc, struct scatterlist *sg,
-                      unsigned int nbytes);
-        int (*final)(struct hash_desc *desc, u8 *out);
-        int (*digest)(struct hash_desc *desc, struct scatterlist *sg,
-                      unsigned int nbytes, u8 *out);
-        int (*setkey)(struct crypto_hash *tfm, const u8 *key,
-                      unsigned int keylen);
-
-        unsigned int digestsize;
-};
-
 struct compress_alg {
         int (*coa_compress)(struct crypto_tfm *tfm, const u8 *src,
                             unsigned int slen, u8 *dst, unsigned int *dlen);
@@ -293,8 +270,6 @@ struct rng_alg {
 #define cra_aead        cra_u.aead
 #define cra_blkcipher   cra_u.blkcipher
 #define cra_cipher      cra_u.cipher
-#define cra_digest      cra_u.digest
-#define cra_hash        cra_u.hash
 #define cra_compress    cra_u.compress
 #define cra_rng         cra_u.rng
 
@@ -320,8 +295,6 @@ struct crypto_alg {
                 struct aead_alg aead;
                 struct blkcipher_alg blkcipher;
                 struct cipher_alg cipher;
-                struct digest_alg digest;
-                struct hash_alg hash;
                 struct compress_alg compress;
                 struct rng_alg rng;
         } cra_u;
diff --git a/include/linux/cryptohash.h b/include/linux/cryptohash.h
index c118b2ad980..ec78a4bbe1d 100644
--- a/include/linux/cryptohash.h
+++ b/include/linux/cryptohash.h
@@ -2,6 +2,7 @@
 #define __CRYPTOHASH_H
 
 #define SHA_DIGEST_WORDS 5
+#define SHA_MESSAGE_BYTES (512 /*bits*/ / 8)
 #define SHA_WORKSPACE_WORDS 80
 
 void sha_init(__u32 *buf);
diff --git a/include/linux/dm-log-userspace.h b/include/linux/dm-log-userspace.h
index 8a1f972c0fe..0c3c3a2110c 100644
--- a/include/linux/dm-log-userspace.h
+++ b/include/linux/dm-log-userspace.h
@@ -363,7 +363,7 @@
  * various request types above.  The remaining 24-bits are currently
  * set to zero and are reserved for future use and compatibility concerns.
  *
- * User-space should always use DM_ULOG_REQUEST_TYPE to aquire the
+ * User-space should always use DM_ULOG_REQUEST_TYPE to acquire the
  * request type from the 'request_type' field to maintain forward compatibility.
  */
 #define DM_ULOG_REQUEST_MASK 0xFF
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index 4a2b162c256..d7cecc90ed3 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -126,7 +126,9 @@ extern int free_irte(int irq);
 extern int irq_remapped(int irq);
 extern struct intel_iommu *map_dev_to_ir(struct pci_dev *dev);
 extern struct intel_iommu *map_ioapic_to_ir(int apic);
+extern struct intel_iommu *map_hpet_to_ir(u8 id);
 extern int set_ioapic_sid(struct irte *irte, int apic);
+extern int set_hpet_sid(struct irte *irte, u8 id);
 extern int set_msi_sid(struct irte *irte, struct pci_dev *dev);
 #else
 static inline int alloc_irte(struct intel_iommu *iommu, int irq, u16 count)
@@ -158,10 +160,18 @@ static inline struct intel_iommu *map_ioapic_to_ir(int apic)
 {
         return NULL;
 }
+static inline struct intel_iommu *map_hpet_to_ir(unsigned int hpet_id)
+{
+        return NULL;
+}
 static inline int set_ioapic_sid(struct irte *irte, int apic)
 {
         return 0;
 }
+static inline int set_hpet_sid(struct irte *irte, u8 id)
+{
+        return -1;
+}
 static inline int set_msi_sid(struct irte *irte, struct pci_dev *dev)
 {
         return 0;
@@ -208,16 +218,9 @@ struct dmar_atsr_unit {
         u8 include_all:1;               /* include all ports */
 };
 
-/* Intel DMAR  initialization functions */
 extern int intel_iommu_init(void);
-#else
-static inline int intel_iommu_init(void)
-{
-#ifdef CONFIG_INTR_REMAP
-        return dmar_dev_scope_init();
-#else
-        return -ENODEV;
-#endif
-}
-#endif /* !CONFIG_DMAR */
+#else /* !CONFIG_DMAR: */
+static inline int intel_iommu_init(void) { return -ENODEV; }
+#endif /* CONFIG_DMAR */
+
 #endif /* __DMAR_H__ */
diff --git a/include/linux/dn.h b/include/linux/dn.h
index fe999082319..9c50445462d 100644
--- a/include/linux/dn.h
+++ b/include/linux/dn.h
@@ -71,14 +71,12 @@
 /* Structures */
 
 
-struct dn_naddr 
-{
+struct dn_naddr {
         __le16          a_len;
         __u8 a_addr[DN_MAXADDL]; /* Two bytes little endian */
 };
 
-struct sockaddr_dn
-{
+struct sockaddr_dn {
         __u16           sdn_family;
         __u8            sdn_flags;
         __u8            sdn_objnum;
@@ -101,8 +99,7 @@ struct optdata_dn {
         __u8   opt_data[16];   /* User data              */
 };
 
-struct accessdata_dn
-{
+struct accessdata_dn {
         __u8            acc_accl;
         __u8            acc_acc[DN_MAXACCL];
         __u8            acc_passl;
diff --git a/include/linux/drbd.h b/include/linux/drbd.h
new file mode 100644
index 00000000000..e84f4733cb5
--- /dev/null
+++ b/include/linux/drbd.h
@@ -0,0 +1,343 @@
+/*
+  drbd.h
+  Kernel module for 2.6.x Kernels
+
+  This file is part of DRBD by Philipp Reisner and Lars Ellenberg.
+
+  Copyright (C) 2001-2008, LINBIT Information Technologies GmbH.
+  Copyright (C) 2001-2008, Philipp Reisner <philipp.reisner@linbit.com>.
+  Copyright (C) 2001-2008, Lars Ellenberg <lars.ellenberg@linbit.com>.
+
+  drbd 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, or (at your option)
+  any later version.
+
+  drbd 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 drbd; see the file COPYING.  If not, write to
+  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+#ifndef DRBD_H
+#define DRBD_H
+#include <linux/connector.h>
+#include <asm/types.h>
+
+#ifdef __KERNEL__
+#include <linux/types.h>
+#include <asm/byteorder.h>
+#else
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <limits.h>
+
+/* Altough the Linux source code makes a difference between
+   generic endianness and the bitfields' endianness, there is no
+   architecture as of Linux-2.6.24-rc4 where the bitfileds' endianness
+   does not match the generic endianness. */
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define __LITTLE_ENDIAN_BITFIELD
+#elif __BYTE_ORDER == __BIG_ENDIAN
+#define __BIG_ENDIAN_BITFIELD
+#else
+# error "sorry, weird endianness on this box"
+#endif
+
+#endif
+
+
+extern const char *drbd_buildtag(void);
+#define REL_VERSION "8.3.6"
+#define API_VERSION 88
+#define PRO_VERSION_MIN 86
+#define PRO_VERSION_MAX 91
+
+
+enum drbd_io_error_p {
+        EP_PASS_ON, /* FIXME should the better be named "Ignore"? */
+        EP_CALL_HELPER,
+        EP_DETACH
+};
+
+enum drbd_fencing_p {
+        FP_DONT_CARE,
+        FP_RESOURCE,
+        FP_STONITH
+};
+
+enum drbd_disconnect_p {
+        DP_RECONNECT,
+        DP_DROP_NET_CONF,
+        DP_FREEZE_IO
+};
+
+enum drbd_after_sb_p {
+        ASB_DISCONNECT,
+        ASB_DISCARD_YOUNGER_PRI,
+        ASB_DISCARD_OLDER_PRI,
+        ASB_DISCARD_ZERO_CHG,
+        ASB_DISCARD_LEAST_CHG,
+        ASB_DISCARD_LOCAL,
+        ASB_DISCARD_REMOTE,
+        ASB_CONSENSUS,
+        ASB_DISCARD_SECONDARY,
+        ASB_CALL_HELPER,
+        ASB_VIOLENTLY
+};
+
+/* KEEP the order, do not delete or insert. Only append. */
+enum drbd_ret_codes {
+        ERR_CODE_BASE           = 100,
+        NO_ERROR                = 101,
+        ERR_LOCAL_ADDR          = 102,
+        ERR_PEER_ADDR           = 103,
+        ERR_OPEN_DISK           = 104,
+        ERR_OPEN_MD_DISK        = 105,
+        ERR_DISK_NOT_BDEV       = 107,
+        ERR_MD_NOT_BDEV         = 108,
+        ERR_DISK_TO_SMALL       = 111,
+        ERR_MD_DISK_TO_SMALL    = 112,
+        ERR_BDCLAIM_DISK        = 114,
+        ERR_BDCLAIM_MD_DISK     = 115,
+        ERR_MD_IDX_INVALID      = 116,
+        ERR_IO_MD_DISK          = 118,
+        ERR_MD_INVALID          = 119,
+        ERR_AUTH_ALG            = 120,
+        ERR_AUTH_ALG_ND         = 121,
+        ERR_NOMEM               = 122,
+        ERR_DISCARD             = 123,
+        ERR_DISK_CONFIGURED     = 124,
+        ERR_NET_CONFIGURED      = 125,
+        ERR_MANDATORY_TAG       = 126,
+        ERR_MINOR_INVALID       = 127,
+        ERR_INTR                = 129, /* EINTR */
+        ERR_RESIZE_RESYNC       = 130,
+        ERR_NO_PRIMARY          = 131,
+        ERR_SYNC_AFTER          = 132,
+        ERR_SYNC_AFTER_CYCLE    = 133,
+        ERR_PAUSE_IS_SET        = 134,
+        ERR_PAUSE_IS_CLEAR      = 135,
+        ERR_PACKET_NR           = 137,
+        ERR_NO_DISK             = 138,
+        ERR_NOT_PROTO_C         = 139,
+        ERR_NOMEM_BITMAP        = 140,
+        ERR_INTEGRITY_ALG       = 141, /* DRBD 8.2 only */
+        ERR_INTEGRITY_ALG_ND    = 142, /* DRBD 8.2 only */
+        ERR_CPU_MASK_PARSE      = 143, /* DRBD 8.2 only */
+        ERR_CSUMS_ALG           = 144, /* DRBD 8.2 only */
+        ERR_CSUMS_ALG_ND        = 145, /* DRBD 8.2 only */
+        ERR_VERIFY_ALG          = 146, /* DRBD 8.2 only */
+        ERR_VERIFY_ALG_ND       = 147, /* DRBD 8.2 only */
+        ERR_CSUMS_RESYNC_RUNNING= 148, /* DRBD 8.2 only */
+        ERR_VERIFY_RUNNING      = 149, /* DRBD 8.2 only */
+        ERR_DATA_NOT_CURRENT    = 150,
+        ERR_CONNECTED           = 151, /* DRBD 8.3 only */
+        ERR_PERM                = 152,
+
+        /* insert new ones above this line */
+        AFTER_LAST_ERR_CODE
+};
+
+#define DRBD_PROT_A   1
+#define DRBD_PROT_B   2
+#define DRBD_PROT_C   3
+
+enum drbd_role {
+        R_UNKNOWN = 0,
+        R_PRIMARY = 1,     /* role */
+        R_SECONDARY = 2,   /* role */
+        R_MASK = 3,
+};
+
+/* The order of these constants is important.
+ * The lower ones (<C_WF_REPORT_PARAMS) indicate
+ * that there is no socket!
+ * >=C_WF_REPORT_PARAMS ==> There is a socket
+ */
+enum drbd_conns {
+        C_STANDALONE,
+        C_DISCONNECTING,  /* Temporal state on the way to StandAlone. */
+        C_UNCONNECTED,    /* >= C_UNCONNECTED -> inc_net() succeeds */
+
+        /* These temporal states are all used on the way
+         * from >= C_CONNECTED to Unconnected.
+         * The 'disconnect reason' states
+         * I do not allow to change beween them. */
+        C_TIMEOUT,
+        C_BROKEN_PIPE,
+        C_NETWORK_FAILURE,
+        C_PROTOCOL_ERROR,
+        C_TEAR_DOWN,
+
+        C_WF_CONNECTION,
+        C_WF_REPORT_PARAMS, /* we have a socket */
+        C_CONNECTED,      /* we have introduced each other */
+        C_STARTING_SYNC_S,  /* starting full sync by admin request. */
+        C_STARTING_SYNC_T,  /* stariing full sync by admin request. */
+        C_WF_BITMAP_S,
+        C_WF_BITMAP_T,
+        C_WF_SYNC_UUID,
+
+        /* All SyncStates are tested with this comparison
+         * xx >= C_SYNC_SOURCE && xx <= C_PAUSED_SYNC_T */
+        C_SYNC_SOURCE,
+        C_SYNC_TARGET,
+        C_VERIFY_S,
+        C_VERIFY_T,
+        C_PAUSED_SYNC_S,
+        C_PAUSED_SYNC_T,
+        C_MASK = 31
+};
+
+enum drbd_disk_state {
+        D_DISKLESS,
+        D_ATTACHING,      /* In the process of reading the meta-data */
+        D_FAILED,         /* Becomes D_DISKLESS as soon as we told it the peer */
+                        /* when >= D_FAILED it is legal to access mdev->bc */
+        D_NEGOTIATING,    /* Late attaching state, we need to talk to the peer */
+        D_INCONSISTENT,
+        D_OUTDATED,
+        D_UNKNOWN,       /* Only used for the peer, never for myself */
+        D_CONSISTENT,     /* Might be D_OUTDATED, might be D_UP_TO_DATE ... */
+        D_UP_TO_DATE,       /* Only this disk state allows applications' IO ! */
+        D_MASK = 15
+};
+
+union drbd_state {
+/* According to gcc's docs is the ...
+ * The order of allocation of bit-fields within a unit (C90 6.5.2.1, C99 6.7.2.1).
+ * Determined by ABI.
+ * pointed out by Maxim Uvarov q<muvarov@ru.mvista.com>
+ * even though we transmit as "cpu_to_be32(state)",
+ * the offsets of the bitfields still need to be swapped
+ * on different endianess.
+ */
+        struct {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+                unsigned role:2 ;   /* 3/4       primary/secondary/unknown */
+                unsigned peer:2 ;   /* 3/4       primary/secondary/unknown */
+                unsigned conn:5 ;   /* 17/32     cstates */
+                unsigned disk:4 ;   /* 8/16      from D_DISKLESS to D_UP_TO_DATE */
+                unsigned pdsk:4 ;   /* 8/16      from D_DISKLESS to D_UP_TO_DATE */
+                unsigned susp:1 ;   /* 2/2       IO suspended  no/yes */
+                unsigned aftr_isp:1 ; /* isp .. imposed sync pause */
+                unsigned peer_isp:1 ;
+                unsigned user_isp:1 ;
+                unsigned _pad:11;   /* 0         unused */
+#elif defined(__BIG_ENDIAN_BITFIELD)
+                unsigned _pad:11;   /* 0         unused */
+                unsigned user_isp:1 ;
+                unsigned peer_isp:1 ;
+                unsigned aftr_isp:1 ; /* isp .. imposed sync pause */
+                unsigned susp:1 ;   /* 2/2       IO suspended  no/yes */
+                unsigned pdsk:4 ;   /* 8/16      from D_DISKLESS to D_UP_TO_DATE */
+                unsigned disk:4 ;   /* 8/16      from D_DISKLESS to D_UP_TO_DATE */
+                unsigned conn:5 ;   /* 17/32     cstates */
+                unsigned peer:2 ;   /* 3/4       primary/secondary/unknown */
+                unsigned role:2 ;   /* 3/4       primary/secondary/unknown */
+#else
+# error "this endianess is not supported"
+#endif
+        };
+        unsigned int i;
+};
+
+enum drbd_state_ret_codes {
+        SS_CW_NO_NEED = 4,
+        SS_CW_SUCCESS = 3,
+        SS_NOTHING_TO_DO = 2,
+        SS_SUCCESS = 1,
+        SS_UNKNOWN_ERROR = 0, /* Used to sleep longer in _drbd_request_state */
+        SS_TWO_PRIMARIES = -1,
+        SS_NO_UP_TO_DATE_DISK = -2,
+        SS_NO_LOCAL_DISK = -4,
+        SS_NO_REMOTE_DISK = -5,
+        SS_CONNECTED_OUTDATES = -6,
+        SS_PRIMARY_NOP = -7,
+        SS_RESYNC_RUNNING = -8,
+        SS_ALREADY_STANDALONE = -9,
+        SS_CW_FAILED_BY_PEER = -10,
+        SS_IS_DISKLESS = -11,
+        SS_DEVICE_IN_USE = -12,
+        SS_NO_NET_CONFIG = -13,
+        SS_NO_VERIFY_ALG = -14,       /* drbd-8.2 only */
+        SS_NEED_CONNECTION = -15,    /* drbd-8.2 only */
+        SS_LOWER_THAN_OUTDATED = -16,
+        SS_NOT_SUPPORTED = -17,      /* drbd-8.2 only */
+        SS_IN_TRANSIENT_STATE = -18,  /* Retry after the next state change */
+        SS_CONCURRENT_ST_CHG = -19,   /* Concurrent cluster side state change! */
+        SS_AFTER_LAST_ERROR = -20,    /* Keep this at bottom */
+};
+
+/* from drbd_strings.c */
+extern const char *drbd_conn_str(enum drbd_conns);
+extern const char *drbd_role_str(enum drbd_role);
+extern const char *drbd_disk_str(enum drbd_disk_state);
+extern const char *drbd_set_st_err_str(enum drbd_state_ret_codes);
+
+#define SHARED_SECRET_MAX 64
+
+#define MDF_CONSISTENT          (1 << 0)
+#define MDF_PRIMARY_IND         (1 << 1)
+#define MDF_CONNECTED_IND       (1 << 2)
+#define MDF_FULL_SYNC           (1 << 3)
+#define MDF_WAS_UP_TO_DATE      (1 << 4)
+#define MDF_PEER_OUT_DATED      (1 << 5)
+#define MDF_CRASHED_PRIMARY     (1 << 6)
+
+enum drbd_uuid_index {
+        UI_CURRENT,
+        UI_BITMAP,
+        UI_HISTORY_START,
+        UI_HISTORY_END,
+        UI_SIZE,      /* nl-packet: number of dirty bits */
+        UI_FLAGS,     /* nl-packet: flags */
+        UI_EXTENDED_SIZE   /* Everything. */
+};
+
+enum drbd_timeout_flag {
+        UT_DEFAULT      = 0,
+        UT_DEGRADED     = 1,
+        UT_PEER_OUTDATED = 2,
+};
+
+#define UUID_JUST_CREATED ((__u64)4)
+
+#define DRBD_MAGIC 0x83740267
+#define BE_DRBD_MAGIC __constant_cpu_to_be32(DRBD_MAGIC)
+
+/* these are of type "int" */
+#define DRBD_MD_INDEX_INTERNAL -1
+#define DRBD_MD_INDEX_FLEX_EXT -2
+#define DRBD_MD_INDEX_FLEX_INT -3
+
+/* Start of the new netlink/connector stuff */
+
+#define DRBD_NL_CREATE_DEVICE 0x01
+#define DRBD_NL_SET_DEFAULTS  0x02
+
+
+/* For searching a vacant cn_idx value */
+#define CN_IDX_STEP                     6977
+
+struct drbd_nl_cfg_req {
+        int packet_type;
+        unsigned int drbd_minor;
+        int flags;
+        unsigned short tag_list[];
+};
+
+struct drbd_nl_cfg_reply {
+        int packet_type;
+        unsigned int minor;
+        int ret_code; /* enum ret_code or set_st_err_t */
+        unsigned short tag_list[]; /* only used with get_* calls */
+};
+
+#endif
diff --git a/include/linux/drbd_limits.h b/include/linux/drbd_limits.h
new file mode 100644
index 00000000000..51f47a586ad
--- /dev/null
+++ b/include/linux/drbd_limits.h
@@ -0,0 +1,137 @@
+/*
+  drbd_limits.h
+  This file is part of DRBD by Philipp Reisner and Lars Ellenberg.
+*/
+
+/*
+ * Our current limitations.
+ * Some of them are hard limits,
+ * some of them are arbitrary range limits, that make it easier to provide
+ * feedback about nonsense settings for certain configurable values.
+ */
+
+#ifndef DRBD_LIMITS_H
+#define DRBD_LIMITS_H 1
+
+#define DEBUG_RANGE_CHECK 0
+
+#define DRBD_MINOR_COUNT_MIN 1
+#define DRBD_MINOR_COUNT_MAX 255
+
+#define DRBD_DIALOG_REFRESH_MIN 0
+#define DRBD_DIALOG_REFRESH_MAX 600
+
+/* valid port number */
+#define DRBD_PORT_MIN 1
+#define DRBD_PORT_MAX 0xffff
+
+/* startup { */
+  /* if you want more than 3.4 days, disable */
+#define DRBD_WFC_TIMEOUT_MIN 0
+#define DRBD_WFC_TIMEOUT_MAX 300000
+#define DRBD_WFC_TIMEOUT_DEF 0
+
+#define DRBD_DEGR_WFC_TIMEOUT_MIN 0
+#define DRBD_DEGR_WFC_TIMEOUT_MAX 300000
+#define DRBD_DEGR_WFC_TIMEOUT_DEF 0
+
+#define DRBD_OUTDATED_WFC_TIMEOUT_MIN 0
+#define DRBD_OUTDATED_WFC_TIMEOUT_MAX 300000
+#define DRBD_OUTDATED_WFC_TIMEOUT_DEF 0
+/* }*/
+
+/* net { */
+  /* timeout, unit centi seconds
+   * more than one minute timeout is not usefull */
+#define DRBD_TIMEOUT_MIN 1
+#define DRBD_TIMEOUT_MAX 600
+#define DRBD_TIMEOUT_DEF 60       /* 6 seconds */
+
+  /* active connection retries when C_WF_CONNECTION */
+#define DRBD_CONNECT_INT_MIN 1
+#define DRBD_CONNECT_INT_MAX 120
+#define DRBD_CONNECT_INT_DEF 10   /* seconds */
+
+  /* keep-alive probes when idle */
+#define DRBD_PING_INT_MIN 1
+#define DRBD_PING_INT_MAX 120
+#define DRBD_PING_INT_DEF 10
+
+ /* timeout for the ping packets.*/
+#define DRBD_PING_TIMEO_MIN  1
+#define DRBD_PING_TIMEO_MAX  100
+#define DRBD_PING_TIMEO_DEF  5
+
+  /* max number of write requests between write barriers */
+#define DRBD_MAX_EPOCH_SIZE_MIN 1
+#define DRBD_MAX_EPOCH_SIZE_MAX 20000
+#define DRBD_MAX_EPOCH_SIZE_DEF 2048
+
+  /* I don't think that a tcp send buffer of more than 10M is usefull */
+#define DRBD_SNDBUF_SIZE_MIN  0
+#define DRBD_SNDBUF_SIZE_MAX  (10<<20)
+#define DRBD_SNDBUF_SIZE_DEF  0
+
+#define DRBD_RCVBUF_SIZE_MIN  0
+#define DRBD_RCVBUF_SIZE_MAX  (10<<20)
+#define DRBD_RCVBUF_SIZE_DEF  0
+
+  /* @4k PageSize -> 128kB - 512MB */
+#define DRBD_MAX_BUFFERS_MIN  32
+#define DRBD_MAX_BUFFERS_MAX  131072
+#define DRBD_MAX_BUFFERS_DEF  2048
+
+  /* @4k PageSize -> 4kB - 512MB */
+#define DRBD_UNPLUG_WATERMARK_MIN  1
+#define DRBD_UNPLUG_WATERMARK_MAX  131072
+#define DRBD_UNPLUG_WATERMARK_DEF (DRBD_MAX_BUFFERS_DEF/16)
+
+  /* 0 is disabled.
+   * 200 should be more than enough even for very short timeouts */
+#define DRBD_KO_COUNT_MIN  0
+#define DRBD_KO_COUNT_MAX  200
+#define DRBD_KO_COUNT_DEF  0
+/* } */
+
+/* syncer { */
+  /* FIXME allow rate to be zero? */
+#define DRBD_RATE_MIN 1
+/* channel bonding 10 GbE, or other hardware */
+#define DRBD_RATE_MAX (4 << 20)
+#define DRBD_RATE_DEF 250  /* kb/second */
+
+  /* less than 7 would hit performance unneccessarily.
+   * 3833 is the largest prime that still does fit
+   * into 64 sectors of activity log */
+#define DRBD_AL_EXTENTS_MIN  7
+#define DRBD_AL_EXTENTS_MAX  3833
+#define DRBD_AL_EXTENTS_DEF  127
+
+#define DRBD_AFTER_MIN  -1
+#define DRBD_AFTER_MAX  255
+#define DRBD_AFTER_DEF  -1
+
+/* } */
+
+/* drbdsetup XY resize -d Z
+ * you are free to reduce the device size to nothing, if you want to.
+ * the upper limit with 64bit kernel, enough ram and flexible meta data
+ * is 16 TB, currently. */
+/* DRBD_MAX_SECTORS */
+#define DRBD_DISK_SIZE_SECT_MIN  0
+#define DRBD_DISK_SIZE_SECT_MAX  (16 * (2LLU << 30))
+#define DRBD_DISK_SIZE_SECT_DEF  0 /* = disabled = no user size... */
+
+#define DRBD_ON_IO_ERROR_DEF EP_PASS_ON
+#define DRBD_FENCING_DEF FP_DONT_CARE
+#define DRBD_AFTER_SB_0P_DEF ASB_DISCONNECT
+#define DRBD_AFTER_SB_1P_DEF ASB_DISCONNECT
+#define DRBD_AFTER_SB_2P_DEF ASB_DISCONNECT
+#define DRBD_RR_CONFLICT_DEF ASB_DISCONNECT
+
+#define DRBD_MAX_BIO_BVECS_MIN 0
+#define DRBD_MAX_BIO_BVECS_MAX 128
+#define DRBD_MAX_BIO_BVECS_DEF 0
+
+#undef RANGE
+#endif
diff --git a/include/linux/drbd_nl.h b/include/linux/drbd_nl.h
new file mode 100644
index 00000000000..db5721ad50d
--- /dev/null
+++ b/include/linux/drbd_nl.h
@@ -0,0 +1,137 @@
+/*
+   PAKET( name,
+          TYPE ( pn, pr, member )
+          ...
+   )
+
+   You may never reissue one of the pn arguments
+*/
+
+#if !defined(NL_PACKET) || !defined(NL_STRING) || !defined(NL_INTEGER) || !defined(NL_BIT) || !defined(NL_INT64)
+#error "The macros NL_PACKET, NL_STRING, NL_INTEGER, NL_INT64 and NL_BIT needs to be defined"
+#endif
+
+NL_PACKET(primary, 1,
+       NL_BIT(          1,      T_MAY_IGNORE,   overwrite_peer)
+)
+
+NL_PACKET(secondary, 2, )
+
+NL_PACKET(disk_conf, 3,
+        NL_INT64(       2,      T_MAY_IGNORE,   disk_size)
+        NL_STRING(      3,      T_MANDATORY,    backing_dev,    128)
+        NL_STRING(      4,      T_MANDATORY,    meta_dev,       128)
+        NL_INTEGER(     5,      T_MANDATORY,    meta_dev_idx)
+        NL_INTEGER(     6,      T_MAY_IGNORE,   on_io_error)
+        NL_INTEGER(     7,      T_MAY_IGNORE,   fencing)
+        NL_BIT(         37,     T_MAY_IGNORE,   use_bmbv)
+        NL_BIT(         53,     T_MAY_IGNORE,   no_disk_flush)
+        NL_BIT(         54,     T_MAY_IGNORE,   no_md_flush)
+          /*  55 max_bio_size was available in 8.2.6rc2 */
+        NL_INTEGER(     56,     T_MAY_IGNORE,   max_bio_bvecs)
+        NL_BIT(         57,     T_MAY_IGNORE,   no_disk_barrier)
+        NL_BIT(         58,     T_MAY_IGNORE,   no_disk_drain)
+)
+
+NL_PACKET(detach, 4, )
+
+NL_PACKET(net_conf, 5,
+        NL_STRING(      8,      T_MANDATORY,    my_addr,        128)
+        NL_STRING(      9,      T_MANDATORY,    peer_addr,      128)
+        NL_STRING(      10,     T_MAY_IGNORE,   shared_secret,  SHARED_SECRET_MAX)
+        NL_STRING(      11,     T_MAY_IGNORE,   cram_hmac_alg,  SHARED_SECRET_MAX)
+        NL_STRING(      44,     T_MAY_IGNORE,   integrity_alg,  SHARED_SECRET_MAX)
+        NL_INTEGER(     14,     T_MAY_IGNORE,   timeout)
+        NL_INTEGER(     15,     T_MANDATORY,    wire_protocol)
+        NL_INTEGER(     16,     T_MAY_IGNORE,   try_connect_int)
+        NL_INTEGER(     17,     T_MAY_IGNORE,   ping_int)
+        NL_INTEGER(     18,     T_MAY_IGNORE,   max_epoch_size)
+        NL_INTEGER(     19,     T_MAY_IGNORE,   max_buffers)
+        NL_INTEGER(     20,     T_MAY_IGNORE,   unplug_watermark)
+        NL_INTEGER(     21,     T_MAY_IGNORE,   sndbuf_size)
+        NL_INTEGER(     22,     T_MAY_IGNORE,   ko_count)
+        NL_INTEGER(     24,     T_MAY_IGNORE,   after_sb_0p)
+        NL_INTEGER(     25,     T_MAY_IGNORE,   after_sb_1p)
+        NL_INTEGER(     26,     T_MAY_IGNORE,   after_sb_2p)
+        NL_INTEGER(     39,     T_MAY_IGNORE,   rr_conflict)
+        NL_INTEGER(     40,     T_MAY_IGNORE,   ping_timeo)
+        NL_INTEGER(     67,     T_MAY_IGNORE,   rcvbuf_size)
+          /* 59 addr_family was available in GIT, never released */
+        NL_BIT(         60,     T_MANDATORY,    mind_af)
+        NL_BIT(         27,     T_MAY_IGNORE,   want_lose)
+        NL_BIT(         28,     T_MAY_IGNORE,   two_primaries)
+        NL_BIT(         41,     T_MAY_IGNORE,   always_asbp)
+        NL_BIT(         61,     T_MAY_IGNORE,   no_cork)
+        NL_BIT(         62,     T_MANDATORY,    auto_sndbuf_size)
+)
+
+NL_PACKET(disconnect, 6, )
+
+NL_PACKET(resize, 7,
+        NL_INT64(               29,     T_MAY_IGNORE,   resize_size)
+)
+
+NL_PACKET(syncer_conf, 8,
+        NL_INTEGER(     30,     T_MAY_IGNORE,   rate)
+        NL_INTEGER(     31,     T_MAY_IGNORE,   after)
+        NL_INTEGER(     32,     T_MAY_IGNORE,   al_extents)
+        NL_STRING(      52,     T_MAY_IGNORE,   verify_alg,     SHARED_SECRET_MAX)
+        NL_STRING(      51,     T_MAY_IGNORE,   cpu_mask,       32)
+        NL_STRING(      64,     T_MAY_IGNORE,   csums_alg,      SHARED_SECRET_MAX)
+        NL_BIT(         65,     T_MAY_IGNORE,   use_rle)
+)
+
+NL_PACKET(invalidate, 9, )
+NL_PACKET(invalidate_peer, 10, )
+NL_PACKET(pause_sync, 11, )
+NL_PACKET(resume_sync, 12, )
+NL_PACKET(suspend_io, 13, )
+NL_PACKET(resume_io, 14, )
+NL_PACKET(outdate, 15, )
+NL_PACKET(get_config, 16, )
+NL_PACKET(get_state, 17,
+        NL_INTEGER(     33,     T_MAY_IGNORE,   state_i)
+)
+
+NL_PACKET(get_uuids, 18,
+        NL_STRING(      34,     T_MAY_IGNORE,   uuids,  (UI_SIZE*sizeof(__u64)))
+        NL_INTEGER(     35,     T_MAY_IGNORE,   uuids_flags)
+)
+
+NL_PACKET(get_timeout_flag, 19,
+        NL_BIT(         36,     T_MAY_IGNORE,   use_degraded)
+)
+
+NL_PACKET(call_helper, 20,
+        NL_STRING(      38,     T_MAY_IGNORE,   helper,         32)
+)
+
+/* Tag nr 42 already allocated in drbd-8.1 development. */
+
+NL_PACKET(sync_progress, 23,
+        NL_INTEGER(     43,     T_MAY_IGNORE,   sync_progress)
+)
+
+NL_PACKET(dump_ee, 24,
+        NL_STRING(      45,     T_MAY_IGNORE,   dump_ee_reason, 32)
+        NL_STRING(      46,     T_MAY_IGNORE,   seen_digest, SHARED_SECRET_MAX)
+        NL_STRING(      47,     T_MAY_IGNORE,   calc_digest, SHARED_SECRET_MAX)
+        NL_INT64(       48,     T_MAY_IGNORE,   ee_sector)
+        NL_INT64(       49,     T_MAY_IGNORE,   ee_block_id)
+        NL_STRING(      50,     T_MAY_IGNORE,   ee_data,        32 << 10)
+)
+
+NL_PACKET(start_ov, 25,
+        NL_INT64(       66,     T_MAY_IGNORE,   start_sector)
+)
+
+NL_PACKET(new_c_uuid, 26,
+       NL_BIT(          63,     T_MANDATORY,    clear_bm)
+)
+
+#undef NL_PACKET
+#undef NL_INTEGER
+#undef NL_INT64
+#undef NL_BIT
+#undef NL_STRING
+
diff --git a/include/linux/drbd_tag_magic.h b/include/linux/drbd_tag_magic.h
new file mode 100644
index 00000000000..fcdff8410e9
--- /dev/null
+++ b/include/linux/drbd_tag_magic.h
@@ -0,0 +1,83 @@
+#ifndef DRBD_TAG_MAGIC_H
+#define DRBD_TAG_MAGIC_H
+
+#define TT_END     0
+#define TT_REMOVED 0xE000
+
+/* declare packet_type enums */
+enum packet_types {
+#define NL_PACKET(name, number, fields) P_ ## name = number,
+#define NL_INTEGER(pn, pr, member)
+#define NL_INT64(pn, pr, member)
+#define NL_BIT(pn, pr, member)
+#define NL_STRING(pn, pr, member, len)
+#include "drbd_nl.h"
+        P_nl_after_last_packet,
+};
+
+/* These struct are used to deduce the size of the tag lists: */
+#define NL_PACKET(name, number, fields) \
+        struct name ## _tag_len_struct { fields };
+#define NL_INTEGER(pn, pr, member)              \
+        int member; int tag_and_len ## member;
+#define NL_INT64(pn, pr, member)                \
+        __u64 member; int tag_and_len ## member;
+#define NL_BIT(pn, pr, member)          \
+        unsigned char member:1; int tag_and_len ## member;
+#define NL_STRING(pn, pr, member, len)  \
+        unsigned char member[len]; int member ## _len; \
+        int tag_and_len ## member;
+#include "linux/drbd_nl.h"
+
+/* declate tag-list-sizes */
+static const int tag_list_sizes[] = {
+#define NL_PACKET(name, number, fields) 2 fields ,
+#define NL_INTEGER(pn, pr, member)      + 4 + 4
+#define NL_INT64(pn, pr, member)        + 4 + 8
+#define NL_BIT(pn, pr, member)          + 4 + 1
+#define NL_STRING(pn, pr, member, len)  + 4 + (len)
+#include "drbd_nl.h"
+};
+
+/* The two highest bits are used for the tag type */
+#define TT_MASK      0xC000
+#define TT_INTEGER   0x0000
+#define TT_INT64     0x4000
+#define TT_BIT       0x8000
+#define TT_STRING    0xC000
+/* The next bit indicates if processing of the tag is mandatory */
+#define T_MANDATORY  0x2000
+#define T_MAY_IGNORE 0x0000
+#define TN_MASK      0x1fff
+/* The remaining 13 bits are used to enumerate the tags */
+
+#define tag_type(T)   ((T) & TT_MASK)
+#define tag_number(T) ((T) & TN_MASK)
+
+/* declare tag enums */
+#define NL_PACKET(name, number, fields) fields
+enum drbd_tags {
+#define NL_INTEGER(pn, pr, member)     T_ ## member = pn | TT_INTEGER | pr ,
+#define NL_INT64(pn, pr, member)       T_ ## member = pn | TT_INT64   | pr ,
+#define NL_BIT(pn, pr, member)         T_ ## member = pn | TT_BIT     | pr ,
+#define NL_STRING(pn, pr, member, len) T_ ## member = pn | TT_STRING  | pr ,
+#include "drbd_nl.h"
+};
+
+struct tag {
+        const char *name;
+        int type_n_flags;
+        int max_len;
+};
+
+/* declare tag names */
+#define NL_PACKET(name, number, fields) fields
+static const struct tag tag_descriptions[] = {
+#define NL_INTEGER(pn, pr, member)     [ pn ] = { #member, TT_INTEGER | pr, sizeof(int)   },
+#define NL_INT64(pn, pr, member)       [ pn ] = { #member, TT_INT64   | pr, sizeof(__u64) },
+#define NL_BIT(pn, pr, member)         [ pn ] = { #member, TT_BIT     | pr, sizeof(int)   },
+#define NL_STRING(pn, pr, member, len) [ pn ] = { #member, TT_STRING  | pr, (len)         },
+#include "drbd_nl.h"
+};
+
+#endif
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
index ec12cc74366..034072cea85 100644
--- a/include/linux/errqueue.h
+++ b/include/linux/errqueue.h
@@ -3,8 +3,7 @@
 
 #include <linux/types.h>
 
-struct sock_extended_err
-{
+struct sock_extended_err {
         __u32   ee_errno;       
         __u8    ee_origin;
         __u8    ee_type;
@@ -31,8 +30,7 @@ struct sock_extended_err
 
 #define SKB_EXT_ERR(skb) ((struct sock_exterr_skb *) ((skb)->cb))
 
-struct sock_exterr_skb
-{
+struct sock_exterr_skb {
         union {
                 struct inet_skb_parm    h4;
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 15e4eb71369..ef4a2d84d92 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -49,13 +49,14 @@ static inline __u32 ethtool_cmd_speed(struct ethtool_cmd *ep)
         return (ep->speed_hi << 16) | ep->speed;
 }
 
+#define ETHTOOL_FWVERS_LEN      32
 #define ETHTOOL_BUSINFO_LEN     32
 /* these strings are set to whatever the driver author decides... */
 struct ethtool_drvinfo {
         __u32   cmd;
         char    driver[32];     /* driver short name, "tulip", "eepro100" */
         char    version[32];    /* driver version string */
-        char    fw_version[32]; /* firmware version string, if applicable */
+        char    fw_version[ETHTOOL_FWVERS_LEN]; /* firmware version string */
         char    bus_info[ETHTOOL_BUSINFO_LEN];  /* Bus info for this IF. */
                                 /* For PCI devices, use pci_name(pci_dev). */
         char    reserved1[32];
@@ -495,13 +496,10 @@ struct ethtool_ops {
         u32     (*get_priv_flags)(struct net_device *);
         int     (*set_priv_flags)(struct net_device *, u32);
         int     (*get_sset_count)(struct net_device *, int);
-
-        /* the following hooks are obsolete */
-        int     (*self_test_count)(struct net_device *);/* use get_sset_count */
-        int     (*get_stats_count)(struct net_device *);/* use get_sset_count */
         int     (*get_rxnfc)(struct net_device *, struct ethtool_rxnfc *, void *);
         int     (*set_rxnfc)(struct net_device *, struct ethtool_rxnfc *);
         int     (*flash_device)(struct net_device *, struct ethtool_flash *);
+        int     (*reset)(struct net_device *, u32 *);
 };
 #endif /* __KERNEL__ */
 
@@ -559,6 +557,7 @@ struct ethtool_ops {
 #define ETHTOOL_SRXCLSRLDEL     0x00000031 /* Delete RX classification rule */
 #define ETHTOOL_SRXCLSRLINS     0x00000032 /* Insert RX classification rule */
 #define ETHTOOL_FLASHDEV        0x00000033 /* Flash firmware to device */
+#define ETHTOOL_RESET           0x00000034 /* Reset hardware */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
@@ -633,6 +632,8 @@ struct ethtool_ops {
 #define PORT_MII                0x02
 #define PORT_FIBRE              0x03
 #define PORT_BNC                0x04
+#define PORT_DA                 0x05
+#define PORT_NONE               0xef
 #define PORT_OTHER              0xff
 
 /* Which transceiver to use. */
@@ -676,6 +677,8 @@ struct ethtool_ops {
 #define AH_V6_FLOW      0x0b
 #define ESP_V6_FLOW     0x0c
 #define IP_USER_FLOW    0x0d
+#define IPV4_FLOW       0x10
+#define IPV6_FLOW       0x11
 
 /* L3-L4 network traffic flow hash options */
 #define RXH_L2DA        (1 << 1)
@@ -689,4 +692,34 @@ struct ethtool_ops {
 
 #define RX_CLS_FLOW_DISC        0xffffffffffffffffULL
 
+/* Reset flags */
+/* The reset() operation must clear the flags for the components which
+ * were actually reset.  On successful return, the flags indicate the
+ * components which were not reset, either because they do not exist
+ * in the hardware or because they cannot be reset independently.  The
+ * driver must never reset any components that were not requested.
+ */
+enum ethtool_reset_flags {
+        /* These flags represent components dedicated to the interface
+         * the command is addressed to.  Shift any flag left by
+         * ETH_RESET_SHARED_SHIFT to reset a shared component of the
+         * same type.
+         */
+        ETH_RESET_MGMT          = 1 << 0,       /* Management processor */
+        ETH_RESET_IRQ           = 1 << 1,       /* Interrupt requester */
+        ETH_RESET_DMA           = 1 << 2,       /* DMA engine */
+        ETH_RESET_FILTER        = 1 << 3,       /* Filtering/flow direction */
+        ETH_RESET_OFFLOAD       = 1 << 4,       /* Protocol offload */
+        ETH_RESET_MAC           = 1 << 5,       /* Media access controller */
+        ETH_RESET_PHY           = 1 << 6,       /* Transceiver/PHY */
+        ETH_RESET_RAM           = 1 << 7,       /* RAM shared between
+                                                 * multiple components */
+
+        ETH_RESET_DEDICATED     = 0x0000ffff,   /* All components dedicated to
+                                                 * this interface */
+        ETH_RESET_ALL           = 0xffffffff,   /* All components used by this
+                                                 * interface, even if shared */
+};
+#define ETH_RESET_SHARED_SHIFT  16
+
 #endif /* _LINUX_ETHTOOL_H */
diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index 87b606b63f1..51da65b68b8 100644
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -8,13 +8,14 @@
 #define FIB_RULE_PERMANENT      0x00000001
 #define FIB_RULE_INVERT         0x00000002
 #define FIB_RULE_UNRESOLVED     0x00000004
-#define FIB_RULE_DEV_DETACHED   0x00000008
+#define FIB_RULE_IIF_DETACHED   0x00000008
+#define FIB_RULE_DEV_DETACHED   FIB_RULE_IIF_DETACHED
+#define FIB_RULE_OIF_DETACHED   0x00000010
 
 /* try to find source address in routing lookups */
 #define FIB_RULE_FIND_SADDR     0x00010000
 
-struct fib_rule_hdr
-{
+struct fib_rule_hdr {
         __u8            family;
         __u8            dst_len;
         __u8            src_len;
@@ -28,12 +29,12 @@ struct fib_rule_hdr
         __u32           flags;
 };
 
-enum
-{
+enum {
         FRA_UNSPEC,
         FRA_DST,        /* destination address */
         FRA_SRC,        /* source address */
-        FRA_IFNAME,     /* interface name */
+        FRA_IIFNAME,    /* interface name */
+#define FRA_IFNAME      FRA_IIFNAME
         FRA_GOTO,       /* target to jump to (FR_ACT_GOTO) */
         FRA_UNUSED2,
         FRA_PRIORITY,   /* priority/preference */
@@ -47,13 +48,13 @@ enum
         FRA_UNUSED8,
         FRA_TABLE,      /* Extended table id */
         FRA_FWMASK,     /* mask for netfilter mark */
+        FRA_OIFNAME,
         __FRA_MAX
 };
 
 #define FRA_MAX (__FRA_MAX - 1)
 
-enum
-{
+enum {
         FR_ACT_UNSPEC,
         FR_ACT_TO_TBL,          /* Pass to fixed table */
         FR_ACT_GOTO,            /* Jump to another rule */
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 1354aaf6abb..29a0e3db9f4 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -23,16 +23,14 @@
  *      the BPF code definitions which need to match so you can share filters
  */
  
-struct sock_filter      /* Filter block */
-{
+struct sock_filter {    /* Filter block */
         __u16   code;   /* Actual filter code */
         __u8    jt;     /* Jump true */
         __u8    jf;     /* Jump false */
         __u32   k;      /* Generic multiuse field */
 };
 
-struct sock_fprog       /* Required for SO_ATTACH_FILTER. */
-{
+struct sock_fprog {     /* Required for SO_ATTACH_FILTER. */
         unsigned short          len;    /* Number of filter blocks */
         struct sock_filter __user *filter;
 };
@@ -123,7 +121,9 @@ struct sock_fprog	/* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_IFINDEX  8
 #define SKF_AD_NLATTR   12
 #define SKF_AD_NLATTR_NEST      16
-#define SKF_AD_MAX      20
+#define SKF_AD_MARK     20
+#define SKF_AD_QUEUE    24
+#define SKF_AD_MAX      28
 #define SKF_NET_OFF   (-0x100000)
 #define SKF_LL_OFF    (-0x200000)
 
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 7e1d4dec83e..9416a461b69 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -20,20 +20,6 @@
 #define fw_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, ## args)
 #define fw_error(s, args...) printk(KERN_ERR KBUILD_MODNAME ": " s, ## args)
 
-static inline void fw_memcpy_from_be32(void *_dst, void *_src, size_t size)
-{
-        u32    *dst = _dst;
-        __be32 *src = _src;
-        int i;
-
-        for (i = 0; i < size / 4; i++)
-                dst[i] = be32_to_cpu(src[i]);
-}
-
-static inline void fw_memcpy_to_be32(void *_dst, void *_src, size_t size)
-{
-        fw_memcpy_from_be32(_dst, _src, size);
-}
 #define CSR_REGISTER_BASE               0xfffff0000000ULL
 
 /* register offsets are relative to CSR_REGISTER_BASE */
@@ -131,7 +117,7 @@ struct fw_card {
 
         bool broadcast_channel_allocated;
         u32 broadcast_channel;
-        u32 topology_map[(CSR_TOPOLOGY_MAP_END - CSR_TOPOLOGY_MAP) / 4];
+        __be32 topology_map[(CSR_TOPOLOGY_MAP_END - CSR_TOPOLOGY_MAP) / 4];
 };
 
 struct fw_attribute_group {
@@ -281,6 +267,7 @@ struct fw_packet {
         void *payload;
         size_t payload_length;
         dma_addr_t payload_bus;
+        bool payload_mapped;
         u32 timestamp;
 
         /*
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 2620a8c6357..891f7d642e5 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -129,7 +129,7 @@ struct inodes_stat_t {
  * WRITE_SYNC           Like WRITE_SYNC_PLUG, but also unplugs the device
  *                      immediately after submission. The write equivalent
  *                      of READ_SYNC.
- * WRITE_ODIRECT        Special case write for O_DIRECT only.
+ * WRITE_ODIRECT_PLUG   Special case write for O_DIRECT only.
  * SWRITE_SYNC
  * SWRITE_SYNC_PLUG     Like WRITE_SYNC/WRITE_SYNC_PLUG, but locks the buffer.
  *                      See SWRITE.
@@ -151,7 +151,7 @@ struct inodes_stat_t {
 #define READ_META       (READ | (1 << BIO_RW_META))
 #define WRITE_SYNC_PLUG (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE))
 #define WRITE_SYNC      (WRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG))
-#define WRITE_ODIRECT   (WRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG))
+#define WRITE_ODIRECT_PLUG      (WRITE | (1 << BIO_RW_SYNCIO))
 #define SWRITE_SYNC_PLUG        \
                         (SWRITE | (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_NOIDLE))
 #define SWRITE_SYNC     (SWRITE_SYNC_PLUG | (1 << BIO_RW_UNPLUG))
@@ -304,6 +304,7 @@ struct inodes_stat_t {
 #define BLKIOOPT _IO(0x12,121)
 #define BLKALIGNOFF _IO(0x12,122)
 #define BLKPBSZGET _IO(0x12,123)
+#define BLKDISCARDZEROES _IO(0x12,124)
 
 #define BMAP_IOCTL 1            /* obsolete - kept for compatibility */
 #define FIBMAP     _IO(0x00,1)  /* bmap access */
diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
index 84d3532dd3e..7be0c6fbe88 100644
--- a/include/linux/fscache-cache.h
+++ b/include/linux/fscache-cache.h
@@ -91,6 +91,8 @@ struct fscache_operation {
 #define FSCACHE_OP_WAITING      4       /* cleared when op is woken */
 #define FSCACHE_OP_EXCLUSIVE    5       /* exclusive op, other ops must wait */
 #define FSCACHE_OP_DEAD         6       /* op is now dead */
+#define FSCACHE_OP_DEC_READ_CNT 7       /* decrement object->n_reads on destruction */
+#define FSCACHE_OP_KEEP_FLAGS   0xc0    /* flags to keep when repurposing an op */
 
         atomic_t                usage;
         unsigned                debug_id;       /* debugging ID */
@@ -102,6 +104,16 @@ struct fscache_operation {
 
         /* operation releaser */
         fscache_operation_release_t release;
+
+#ifdef CONFIG_SLOW_WORK_PROC
+        const char *name;               /* operation name */
+        const char *state;              /* operation state */
+#define fscache_set_op_name(OP, N)      do { (OP)->name  = (N); } while(0)
+#define fscache_set_op_state(OP, S)     do { (OP)->state = (S); } while(0)
+#else
+#define fscache_set_op_name(OP, N)      do { } while(0)
+#define fscache_set_op_state(OP, S)     do { } while(0)
+#endif
 };
 
 extern atomic_t fscache_op_debug_id;
@@ -125,6 +137,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
         op->debug_id = atomic_inc_return(&fscache_op_debug_id);
         op->release = release;
         INIT_LIST_HEAD(&op->pend_link);
+        fscache_set_op_state(op, "Init");
 }
 
 /**
@@ -221,8 +234,10 @@ struct fscache_cache_ops {
         struct fscache_object *(*alloc_object)(struct fscache_cache *cache,
                                                struct fscache_cookie *cookie);
 
-        /* look up the object for a cookie */
-        void (*lookup_object)(struct fscache_object *object);
+        /* look up the object for a cookie
+         * - return -ETIMEDOUT to be requeued
+         */
+        int (*lookup_object)(struct fscache_object *object);
 
         /* finished looking up */
         void (*lookup_complete)(struct fscache_object *object);
@@ -297,12 +312,14 @@ struct fscache_cookie {
         atomic_t                        usage;          /* number of users of this cookie */
         atomic_t                        n_children;     /* number of children of this cookie */
         spinlock_t                      lock;
+        spinlock_t                      stores_lock;    /* lock on page store tree */
         struct hlist_head               backing_objects; /* object(s) backing this file/index */
         const struct fscache_cookie_def *def;           /* definition */
         struct fscache_cookie           *parent;        /* parent of this entry */
         void                            *netfs_data;    /* back pointer to netfs */
         struct radix_tree_root          stores;         /* pages to be stored on this cookie */
 #define FSCACHE_COOKIE_PENDING_TAG      0               /* pages tag: pending write to cache */
+#define FSCACHE_COOKIE_STORING_TAG      1               /* pages tag: writing to cache */
 
         unsigned long                   flags;
 #define FSCACHE_COOKIE_LOOKING_UP       0       /* T if non-index cookie being looked up still */
@@ -337,6 +354,7 @@ struct fscache_object {
                 FSCACHE_OBJECT_RECYCLING,       /* retiring object */
                 FSCACHE_OBJECT_WITHDRAWING,     /* withdrawing object */
                 FSCACHE_OBJECT_DEAD,            /* object is now dead */
+                FSCACHE_OBJECT__NSTATES
         } state;
 
         int                     debug_id;       /* debugging ID */
@@ -345,6 +363,7 @@ struct fscache_object {
         int                     n_obj_ops;      /* number of object ops outstanding on object */
         int                     n_in_progress;  /* number of ops in progress */
         int                     n_exclusive;    /* number of exclusive ops queued */
+        atomic_t                n_reads;        /* number of read ops in progress */
         spinlock_t              lock;           /* state and operations lock */
 
         unsigned long           lookup_jif;     /* time at which lookup started */
@@ -358,6 +377,7 @@ struct fscache_object {
 #define FSCACHE_OBJECT_EV_RELEASE       4       /* T if netfs requested object release */
 #define FSCACHE_OBJECT_EV_RETIRE        5       /* T if netfs requested object retirement */
 #define FSCACHE_OBJECT_EV_WITHDRAW      6       /* T if cache requested object withdrawal */
+#define FSCACHE_OBJECT_EVENTS_MASK      0x7f    /* mask of all events*/
 
         unsigned long           flags;
 #define FSCACHE_OBJECT_LOCK             0       /* T if object is busy being processed */
@@ -373,7 +393,11 @@ struct fscache_object {
         struct list_head        dependents;     /* FIFO of dependent objects */
         struct list_head        dep_link;       /* link in parent's dependents list */
         struct list_head        pending_ops;    /* unstarted operations on this object */
+#ifdef CONFIG_FSCACHE_OBJECT_LIST
+        struct rb_node          objlist_link;   /* link in global object list */
+#endif
         pgoff_t                 store_limit;    /* current storage limit */
+        loff_t                  store_limit_l;  /* current storage limit */
 };
 
 extern const char *fscache_object_states[];
@@ -383,6 +407,10 @@ extern const char *fscache_object_states[];
          (obj)->state >= FSCACHE_OBJECT_AVAILABLE &&          \
          (obj)->state < FSCACHE_OBJECT_DYING)
 
+#define fscache_object_is_dead(obj)                             \
+        (test_bit(FSCACHE_IOERROR, &(obj)->cache->flags) &&     \
+         (obj)->state >= FSCACHE_OBJECT_DYING)
+
 extern const struct slow_work_ops fscache_object_slow_work_ops;
 
 /**
@@ -414,6 +442,7 @@ void fscache_object_init(struct fscache_object *object,
         object->events = object->event_mask = 0;
         object->flags = 0;
         object->store_limit = 0;
+        object->store_limit_l = 0;
         object->cache = cache;
         object->cookie = cookie;
         object->parent = NULL;
@@ -422,6 +451,12 @@ void fscache_object_init(struct fscache_object *object,
 extern void fscache_object_lookup_negative(struct fscache_object *object);
 extern void fscache_obtained_object(struct fscache_object *object);
 
+#ifdef CONFIG_FSCACHE_OBJECT_LIST
+extern void fscache_object_destroy(struct fscache_object *object);
+#else
+#define fscache_object_destroy(object) do {} while(0)
+#endif
+
 /**
  * fscache_object_destroyed - Note destruction of an object in a cache
  * @cache: The cache from which the object came
@@ -460,6 +495,7 @@ static inline void fscache_object_lookup_error(struct fscache_object *object)
 static inline
 void fscache_set_store_limit(struct fscache_object *object, loff_t i_size)
 {
+        object->store_limit_l = i_size;
         object->store_limit = i_size >> PAGE_SHIFT;
         if (i_size & ~PAGE_MASK)
                 object->store_limit++;
diff --git a/include/linux/fscache.h b/include/linux/fscache.h
index 6d8ee466e0a..595ce49288b 100644
--- a/include/linux/fscache.h
+++ b/include/linux/fscache.h
@@ -202,6 +202,8 @@ extern int __fscache_write_page(struct fscache_cookie *, struct page *, gfp_t);
 extern void __fscache_uncache_page(struct fscache_cookie *, struct page *);
 extern bool __fscache_check_page_write(struct fscache_cookie *, struct page *);
 extern void __fscache_wait_on_page_write(struct fscache_cookie *, struct page *);
+extern bool __fscache_maybe_release_page(struct fscache_cookie *, struct page *,
+                                         gfp_t);
 
 /**
  * fscache_register_netfs - Register a filesystem as desiring caching services
@@ -615,4 +617,29 @@ void fscache_wait_on_page_write(struct fscache_cookie *cookie,
                 __fscache_wait_on_page_write(cookie, page);
 }
 
+/**
+ * fscache_maybe_release_page - Consider releasing a page, cancelling a store
+ * @cookie: The cookie representing the cache object
+ * @page: The netfs page that is being cached.
+ * @gfp: The gfp flags passed to releasepage()
+ *
+ * Consider releasing a page for the vmscan algorithm, on behalf of the netfs's
+ * releasepage() call.  A storage request on the page may cancelled if it is
+ * not currently being processed.
+ *
+ * The function returns true if the page no longer has a storage request on it,
+ * and false if a storage request is left in place.  If true is returned, the
+ * page will have been passed to fscache_uncache_page().  If false is returned
+ * the page cannot be freed yet.
+ */
+static inline
+bool fscache_maybe_release_page(struct fscache_cookie *cookie,
+                                struct page *page,
+                                gfp_t gfp)
+{
+        if (fscache_cookie_valid(cookie) && PageFsCache(page))
+                return __fscache_maybe_release_page(cookie, page, gfp);
+        return false;
+}
+
 #endif /* _LINUX_FSCACHE_H */
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 4ec5e67e18c..47bbdf9c38d 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -117,12 +117,12 @@ struct ftrace_event_call {
         struct dentry           *dir;
         struct trace_event      *event;
         int                     enabled;
-        int                     (*regfunc)(void *);
-        void                    (*unregfunc)(void *);
+        int                     (*regfunc)(struct ftrace_event_call *);
+        void                    (*unregfunc)(struct ftrace_event_call *);
         int                     id;
-        int                     (*raw_init)(void);
-        int                     (*show_format)(struct ftrace_event_call *call,
-                                               struct trace_seq *s);
+        int                     (*raw_init)(struct ftrace_event_call *);
+        int                     (*show_format)(struct ftrace_event_call *,
+                                               struct trace_seq *);
         int                     (*define_fields)(struct ftrace_event_call *);
         struct list_head        fields;
         int                     filter_active;
@@ -131,20 +131,20 @@ struct ftrace_event_call {
         void                    *data;
 
         atomic_t                profile_count;
-        int                     (*profile_enable)(void);
-        void                    (*profile_disable)(void);
+        int                     (*profile_enable)(struct ftrace_event_call *);
+        void                    (*profile_disable)(struct ftrace_event_call *);
 };
 
 #define FTRACE_MAX_PROFILE_SIZE 2048
 
-extern char                     *trace_profile_buf;
-extern char                     *trace_profile_buf_nmi;
+extern char *perf_trace_buf;
+extern char *perf_trace_buf_nmi;
 
 #define MAX_FILTER_PRED         32
 #define MAX_FILTER_STR_VAL      256     /* Should handle KSYM_SYMBOL_LEN */
 
 extern void destroy_preds(struct ftrace_event_call *call);
-extern int filter_match_preds(struct ftrace_event_call *call, void *rec);
+extern int filter_match_preds(struct event_filter *filter, void *rec);
 extern int filter_current_check_discard(struct ring_buffer *buffer,
                                         struct ftrace_event_call *call,
                                         void *rec,
@@ -157,11 +157,12 @@ enum {
         FILTER_PTR_STRING,
 };
 
-extern int trace_define_field(struct ftrace_event_call *call,
-                              const char *type, const char *name,
-                              int offset, int size, int is_signed,
-                              int filter_type);
 extern int trace_define_common_fields(struct ftrace_event_call *call);
+extern int trace_define_field(struct ftrace_event_call *call, const char *type,
+                              const char *name, int offset, int size,
+                              int is_signed, int filter_type);
+extern int trace_add_event_call(struct ftrace_event_call *call);
+extern void trace_remove_event_call(struct ftrace_event_call *call);
 
 #define is_signed_type(type)    (((type)(-1)) < 0)
 
@@ -186,4 +187,13 @@ do {									\
                 __trace_printk(ip, fmt, ##args);                        \
 } while (0)
 
+#ifdef CONFIG_EVENT_PROFILE
+struct perf_event;
+extern int ftrace_profile_enable(int event_id);
+extern void ftrace_profile_disable(int event_id);
+extern int ftrace_profile_set_filter(struct perf_event *event, int event_id,
+                                     char *filter_str);
+extern void ftrace_profile_free_filter(struct perf_event *event);
+#endif
+
 #endif /* _LINUX_FTRACE_EVENT_H */
diff --git a/include/linux/gen_stats.h b/include/linux/gen_stats.h
index 710e901085d..552c8a0a12d 100644
--- a/include/linux/gen_stats.h
+++ b/include/linux/gen_stats.h
@@ -18,13 +18,11 @@ enum {
  * @bytes: number of seen bytes
  * @packets: number of seen packets
  */
-struct gnet_stats_basic
-{
+struct gnet_stats_basic {
         __u64   bytes;
         __u32   packets;
 };
-struct gnet_stats_basic_packed
-{
+struct gnet_stats_basic_packed {
         __u64   bytes;
         __u32   packets;
 } __attribute__ ((packed));
@@ -34,8 +32,7 @@ struct gnet_stats_basic_packed
  * @bps: current byte rate
  * @pps: current packet rate
  */
-struct gnet_stats_rate_est
-{
+struct gnet_stats_rate_est {
         __u32   bps;
         __u32   pps;
 };
@@ -48,8 +45,7 @@ struct gnet_stats_rate_est
  * @requeues: number of requeues
  * @overlimits: number of enqueues over the limit
  */
-struct gnet_stats_queue
-{
+struct gnet_stats_queue {
         __u32   qlen;
         __u32   backlog;
         __u32   drops;
@@ -62,8 +58,7 @@ struct gnet_stats_queue
  * @interval: sampling period
  * @ewma_log: the log of measurement window weight
  */
-struct gnet_estimator
-{
+struct gnet_estimator {
         signed char     interval;
         unsigned char   ewma_log;
 };
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 297df45ffd0..c6c0c41af35 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -91,6 +91,7 @@ struct hd_struct {
         sector_t start_sect;
         sector_t nr_sects;
         sector_t alignment_offset;
+        unsigned int discard_alignment;
         struct device __dev;
         struct kobject *holder_dir;
         int policy, partno;
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index b80c88dedbb..81f90a59cda 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -81,7 +81,11 @@ struct gfs2_meta_header {
         __be32 mh_type;
         __be64 __pad0;          /* Was generation number in gfs1 */
         __be32 mh_format;
-        __be32 __pad1;          /* Was incarnation number in gfs1 */
+        /* This union is to keep userspace happy */
+        union {
+                __be32 mh_jid;          /* Was incarnation number in gfs1 */
+                __be32 __pad1;
+        };
 };
 
 /*
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 6d527ee82b2..d5b387669da 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -139,10 +139,34 @@ static inline void account_system_vtime(struct task_struct *tsk)
 #endif
 
 #if defined(CONFIG_NO_HZ)
+#if defined(CONFIG_TINY_RCU)
+extern void rcu_enter_nohz(void);
+extern void rcu_exit_nohz(void);
+
+static inline void rcu_irq_enter(void)
+{
+        rcu_exit_nohz();
+}
+
+static inline void rcu_irq_exit(void)
+{
+        rcu_enter_nohz();
+}
+
+static inline void rcu_nmi_enter(void)
+{
+}
+
+static inline void rcu_nmi_exit(void)
+{
+}
+
+#else
 extern void rcu_irq_enter(void);
 extern void rcu_irq_exit(void);
 extern void rcu_nmi_enter(void);
 extern void rcu_nmi_exit(void);
+#endif
 #else
 # define rcu_irq_enter() do { } while (0)
 # define rcu_irq_exit() do { } while (0)
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 10f62841674..87093652dda 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -312,6 +312,7 @@ struct hid_item {
 #define HID_QUIRK_MULTI_INPUT                   0x00000040
 #define HID_QUIRK_SKIP_OUTPUT_REPORTS           0x00010000
 #define HID_QUIRK_FULLSPEED_INTERVAL            0x10000000
+#define HID_QUIRK_NO_INIT_REPORTS               0x20000000
 
 /*
  * This is the global environment of the parser. This information is
diff --git a/include/linux/hpet.h b/include/linux/hpet.h
index 79f63a27bce..219ca4f6bea 100644
--- a/include/linux/hpet.h
+++ b/include/linux/hpet.h
@@ -126,4 +126,6 @@ struct hpet_info {
 #define HPET_DPI        _IO('h', 0x05)  /* disable periodic */
 #define HPET_IRQFREQ    _IOW('h', 0x6, unsigned long)   /* IRQFREQ usec */
 
+#define MAX_HPET_TBS    8               /* maximum hpet timer blocks */
+
 #endif                          /* !__HPET__ */
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index ff037f0b1b4..9bace4b9f4f 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -446,7 +446,7 @@ extern void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
 
 static inline void timer_stats_account_hrtimer(struct hrtimer *timer)
 {
-        if (likely(!timer->start_site))
+        if (likely(!timer_stats_active))
                 return;
         timer_stats_update_stats(timer, timer->start_pid, timer->start_site,
                                  timer->function, timer->start_comm, 0);
@@ -457,8 +457,6 @@ extern void __timer_stats_hrtimer_set_start_info(struct hrtimer *timer,
 
 static inline void timer_stats_hrtimer_set_start_info(struct hrtimer *timer)
 {
-        if (likely(!timer_stats_active))
-                return;
         __timer_stats_hrtimer_set_start_info(timer, __builtin_return_address(0));
 }
 
diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h
new file mode 100644
index 00000000000..a03daed08c5
--- /dev/null
+++ b/include/linux/hw_breakpoint.h
@@ -0,0 +1,131 @@
+#ifndef _LINUX_HW_BREAKPOINT_H
+#define _LINUX_HW_BREAKPOINT_H
+
+enum {
+        HW_BREAKPOINT_LEN_1 = 1,
+        HW_BREAKPOINT_LEN_2 = 2,
+        HW_BREAKPOINT_LEN_4 = 4,
+        HW_BREAKPOINT_LEN_8 = 8,
+};
+
+enum {
+        HW_BREAKPOINT_R = 1,
+        HW_BREAKPOINT_W = 2,
+        HW_BREAKPOINT_X = 4,
+};
+
+#ifdef __KERNEL__
+
+#include <linux/perf_event.h>
+
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+
+/* As it's for in-kernel or ptrace use, we want it to be pinned */
+#define DEFINE_BREAKPOINT_ATTR(name)    \
+struct perf_event_attr name = {         \
+        .type = PERF_TYPE_BREAKPOINT,   \
+        .size = sizeof(name),           \
+        .pinned = 1,                    \
+};
+
+static inline void hw_breakpoint_init(struct perf_event_attr *attr)
+{
+        attr->type = PERF_TYPE_BREAKPOINT;
+        attr->size = sizeof(*attr);
+        attr->pinned = 1;
+}
+
+static inline unsigned long hw_breakpoint_addr(struct perf_event *bp)
+{
+        return bp->attr.bp_addr;
+}
+
+static inline int hw_breakpoint_type(struct perf_event *bp)
+{
+        return bp->attr.bp_type;
+}
+
+static inline int hw_breakpoint_len(struct perf_event *bp)
+{
+        return bp->attr.bp_len;
+}
+
+extern struct perf_event *
+register_user_hw_breakpoint(struct perf_event_attr *attr,
+                            perf_callback_t triggered,
+                            struct task_struct *tsk);
+
+/* FIXME: only change from the attr, and don't unregister */
+extern struct perf_event *
+modify_user_hw_breakpoint(struct perf_event *bp,
+                          struct perf_event_attr *attr,
+                          perf_callback_t triggered,
+                          struct task_struct *tsk);
+
+/*
+ * Kernel breakpoints are not associated with any particular thread.
+ */
+extern struct perf_event *
+register_wide_hw_breakpoint_cpu(struct perf_event_attr *attr,
+                                perf_callback_t triggered,
+                                int cpu);
+
+extern struct perf_event **
+register_wide_hw_breakpoint(struct perf_event_attr *attr,
+                            perf_callback_t triggered);
+
+extern int register_perf_hw_breakpoint(struct perf_event *bp);
+extern int __register_perf_hw_breakpoint(struct perf_event *bp);
+extern void unregister_hw_breakpoint(struct perf_event *bp);
+extern void unregister_wide_hw_breakpoint(struct perf_event **cpu_events);
+
+extern int reserve_bp_slot(struct perf_event *bp);
+extern void release_bp_slot(struct perf_event *bp);
+
+extern void flush_ptrace_hw_breakpoint(struct task_struct *tsk);
+
+static inline struct arch_hw_breakpoint *counter_arch_bp(struct perf_event *bp)
+{
+        return &bp->hw.info;
+}
+
+#else /* !CONFIG_HAVE_HW_BREAKPOINT */
+
+static inline struct perf_event *
+register_user_hw_breakpoint(struct perf_event_attr *attr,
+                            perf_callback_t triggered,
+                            struct task_struct *tsk)    { return NULL; }
+static inline struct perf_event *
+modify_user_hw_breakpoint(struct perf_event *bp,
+                          struct perf_event_attr *attr,
+                          perf_callback_t triggered,
+                          struct task_struct *tsk)      { return NULL; }
+static inline struct perf_event *
+register_wide_hw_breakpoint_cpu(struct perf_event_attr *attr,
+                                perf_callback_t triggered,
+                                int cpu)                { return NULL; }
+static inline struct perf_event **
+register_wide_hw_breakpoint(struct perf_event_attr *attr,
+                            perf_callback_t triggered)  { return NULL; }
+static inline int
+register_perf_hw_breakpoint(struct perf_event *bp)      { return -ENOSYS; }
+static inline int
+__register_perf_hw_breakpoint(struct perf_event *bp)    { return -ENOSYS; }
+static inline void unregister_hw_breakpoint(struct perf_event *bp)      { }
+static inline void
+unregister_wide_hw_breakpoint(struct perf_event **cpu_events)           { }
+static inline int
+reserve_bp_slot(struct perf_event *bp)                  {return -ENOSYS; }
+static inline void release_bp_slot(struct perf_event *bp)               { }
+
+static inline void flush_ptrace_hw_breakpoint(struct task_struct *tsk)  { }
+
+static inline struct arch_hw_breakpoint *counter_arch_bp(struct perf_event *bp)
+{
+        return NULL;
+}
+
+#endif /* CONFIG_HAVE_HW_BREAKPOINT */
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_HW_BREAKPOINT_H */
diff --git a/include/linux/hw_random.h b/include/linux/hw_random.h
index 7244456e7e6..9bede7633f7 100644
--- a/include/linux/hw_random.h
+++ b/include/linux/hw_random.h
@@ -22,10 +22,12 @@
  * @cleanup:            Cleanup callback (can be NULL).
  * @data_present:       Callback to determine if data is available
  *                      on the RNG. If NULL, it is assumed that
- *                      there is always data available.
+ *                      there is always data available.  *OBSOLETE*
  * @data_read:          Read data from the RNG device.
  *                      Returns the number of lower random bytes in "data".
- *                      Must not be NULL.
+ *                      Must not be NULL.    *OSOLETE*
+ * @read:               New API. drivers can fill up to max bytes of data
+ *                      into the buffer. The buffer is aligned for any type.
  * @priv:               Private data, for use by the RNG driver.
  */
 struct hwrng {
@@ -34,6 +36,7 @@ struct hwrng {
         void (*cleanup)(struct hwrng *rng);
         int (*data_present)(struct hwrng *rng, int wait);
         int (*data_read)(struct hwrng *rng, u32 *data);
+        int (*read)(struct hwrng *rng, void *data, size_t max, bool wait);
         unsigned long priv;
 
         /* internal. */
diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h
index f13255e0640..9eb07bbc652 100644
--- a/include/linux/i2c-pnx.h
+++ b/include/linux/i2c-pnx.h
@@ -21,7 +21,7 @@ struct i2c_pnx_mif {
         int                     mode;           /* Interface mode */
         struct completion       complete;       /* I/O completion */
         struct timer_list       timer;          /* Timeout */
-        char *                  buf;            /* Data buffer */
+        u8 *                    buf;            /* Data buffer */
         int                     len;            /* Length of data buffer */
 };
 
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 7b40cda57a7..419ab546b26 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -110,7 +110,7 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client,
  * @driver: Device driver model driver
  * @id_table: List of I2C devices supported by this driver
  * @detect: Callback for device detection
- * @address_data: The I2C addresses to probe, ignore or force (for detect)
+ * @address_data: The I2C addresses to probe (for detect)
  * @clients: List of detected clients we created (for i2c-core use only)
  *
  * The driver.owner field should be set to the module owner of this driver.
@@ -338,8 +338,7 @@ struct i2c_adapter {
         void *algo_data;
 
         /* data fields that are valid for all devices   */
-        u8 level;                       /* nesting level for lockdep */
-        struct mutex bus_lock;
+        struct rt_mutex bus_lock;
 
         int timeout;                    /* in jiffies */
         int retries;
@@ -367,7 +366,7 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
  */
 static inline void i2c_lock_adapter(struct i2c_adapter *adapter)
 {
-        mutex_lock(&adapter->bus_lock);
+        rt_mutex_lock(&adapter->bus_lock);
 }
 
 /**
@@ -376,7 +375,7 @@ static inline void i2c_lock_adapter(struct i2c_adapter *adapter)
  */
 static inline void i2c_unlock_adapter(struct i2c_adapter *adapter)
 {
-        mutex_unlock(&adapter->bus_lock);
+        rt_mutex_unlock(&adapter->bus_lock);
 }
 
 /*flags for the client struct: */
@@ -398,9 +397,6 @@ static inline void i2c_unlock_adapter(struct i2c_adapter *adapter)
  */
 struct i2c_client_address_data {
         const unsigned short *normal_i2c;
-        const unsigned short *probe;
-        const unsigned short *ignore;
-        const unsigned short * const *forces;
 };
 
 /* Internal numbers to terminate lists */
@@ -614,134 +610,48 @@ union i2c_smbus_data {
   module_param_array(var, short, &var##_num, 0); \
   MODULE_PARM_DESC(var, desc)
 
-#define I2C_CLIENT_MODULE_PARM_FORCE(name)                              \
-I2C_CLIENT_MODULE_PARM(force_##name,                                    \
-                       "List of adapter,address pairs which are "       \
-                       "unquestionably assumed to contain a `"          \
-                       # name "' chip")
-
-
 #define I2C_CLIENT_INSMOD_COMMON                                        \
-I2C_CLIENT_MODULE_PARM(probe, "List of adapter,address pairs to scan "  \
-                       "additionally");                                 \
-I2C_CLIENT_MODULE_PARM(ignore, "List of adapter,address pairs not to "  \
-                       "scan");                                         \
 static const struct i2c_client_address_data addr_data = {               \
         .normal_i2c     = normal_i2c,                                   \
-        .probe          = probe,                                        \
-        .ignore         = ignore,                                       \
-        .forces         = forces,                                       \
 }
 
-#define I2C_CLIENT_FORCE_TEXT \
-        "List of adapter,address pairs to boldly assume to be present"
-
 /* These are the ones you want to use in your own drivers. Pick the one
    which matches the number of devices the driver differenciates between. */
 #define I2C_CLIENT_INSMOD                                               \
-I2C_CLIENT_MODULE_PARM(force, I2C_CLIENT_FORCE_TEXT);                   \
-static const unsigned short * const forces[] = { force, NULL };         \
 I2C_CLIENT_INSMOD_COMMON
 
 #define I2C_CLIENT_INSMOD_1(chip1)                                      \
 enum chips { any_chip, chip1 };                                         \
-I2C_CLIENT_MODULE_PARM(force, I2C_CLIENT_FORCE_TEXT);                   \
-I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
-static const unsigned short * const forces[] =  { force,                \
-        force_##chip1, NULL };                                          \
 I2C_CLIENT_INSMOD_COMMON
 
 #define I2C_CLIENT_INSMOD_2(chip1, chip2)                               \
 enum chips { any_chip, chip1, chip2 };                                  \
-I2C_CLIENT_MODULE_PARM(force, I2C_CLIENT_FORCE_TEXT);                   \
-I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
-static const unsigned short * const forces[] =  { force,                \
-        force_##chip1, force_##chip2, NULL };                           \
 I2C_CLIENT_INSMOD_COMMON
 
 #define I2C_CLIENT_INSMOD_3(chip1, chip2, chip3)                        \
 enum chips { any_chip, chip1, chip2, chip3 };                           \
-I2C_CLIENT_MODULE_PARM(force, I2C_CLIENT_FORCE_TEXT);                   \
-I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
-static const unsigned short * const forces[] =  { force,                \
-        force_##chip1, force_##chip2, force_##chip3, NULL };            \
 I2C_CLIENT_INSMOD_COMMON
 
 #define I2C_CLIENT_INSMOD_4(chip1, chip2, chip3, chip4)                 \
 enum chips { any_chip, chip1, chip2, chip3, chip4 };                    \
-I2C_CLIENT_MODULE_PARM(force, I2C_CLIENT_FORCE_TEXT);                   \
-I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip4);                                    \
-static const unsigned short * const forces[] =  { force,                \
-        force_##chip1, force_##chip2, force_##chip3,                    \
-        force_##chip4, NULL};                                           \
 I2C_CLIENT_INSMOD_COMMON
 
 #define I2C_CLIENT_INSMOD_5(chip1, chip2, chip3, chip4, chip5)          \
 enum chips { any_chip, chip1, chip2, chip3, chip4, chip5 };             \
-I2C_CLIENT_MODULE_PARM(force, I2C_CLIENT_FORCE_TEXT);                   \
-I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip4);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip5);                                    \
-static const unsigned short * const forces[] = { force,                 \
-        force_##chip1, force_##chip2, force_##chip3,                    \
-        force_##chip4, force_##chip5, NULL };                           \
 I2C_CLIENT_INSMOD_COMMON
 
 #define I2C_CLIENT_INSMOD_6(chip1, chip2, chip3, chip4, chip5, chip6)   \
 enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6 };      \
-I2C_CLIENT_MODULE_PARM(force, I2C_CLIENT_FORCE_TEXT);                   \
-I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip4);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip5);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip6);                                    \
-static const unsigned short * const forces[] = { force,                 \
-        force_##chip1, force_##chip2, force_##chip3,                    \
-        force_##chip4, force_##chip5, force_##chip6, NULL };            \
 I2C_CLIENT_INSMOD_COMMON
 
 #define I2C_CLIENT_INSMOD_7(chip1, chip2, chip3, chip4, chip5, chip6, chip7) \
 enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6,        \
              chip7 };                                                   \
-I2C_CLIENT_MODULE_PARM(force, I2C_CLIENT_FORCE_TEXT);                   \
-I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip4);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip5);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip6);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip7);                                    \
-static const unsigned short * const forces[] = { force,                 \
-        force_##chip1, force_##chip2, force_##chip3,                    \
-        force_##chip4, force_##chip5, force_##chip6,                    \
-        force_##chip7, NULL };                                          \
 I2C_CLIENT_INSMOD_COMMON
 
 #define I2C_CLIENT_INSMOD_8(chip1, chip2, chip3, chip4, chip5, chip6, chip7, chip8) \
 enum chips { any_chip, chip1, chip2, chip3, chip4, chip5, chip6,        \
              chip7, chip8 };                                            \
-I2C_CLIENT_MODULE_PARM(force, I2C_CLIENT_FORCE_TEXT);                   \
-I2C_CLIENT_MODULE_PARM_FORCE(chip1);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip2);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip3);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip4);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip5);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip6);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip7);                                    \
-I2C_CLIENT_MODULE_PARM_FORCE(chip8);                                    \
-static const unsigned short * const forces[] = { force,                 \
-        force_##chip1, force_##chip2, force_##chip3,                    \
-        force_##chip4, force_##chip5, force_##chip6,                    \
-        force_##chip7, force_##chip8, NULL };                           \
 I2C_CLIENT_INSMOD_COMMON
 #endif /* __KERNEL__ */
 #endif /* _LINUX_I2C_H */
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
index 508824ee35e..5306a759cbd 100644
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -401,6 +401,24 @@ struct twl4030_power_data {
 
 extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
 
+struct twl4030_codec_audio_data {
+        unsigned int    audio_mclk;
+        unsigned int ramp_delay_value;
+        unsigned int hs_extmute:1;
+        void (*set_hs_extmute)(int mute);
+};
+
+struct twl4030_codec_vibra_data {
+        unsigned int    audio_mclk;
+        unsigned int    coexist;
+};
+
+struct twl4030_codec_data {
+        unsigned int    audio_mclk;
+        struct twl4030_codec_audio_data         *audio;
+        struct twl4030_codec_vibra_data         *vibra;
+};
+
 struct twl4030_platform_data {
         unsigned                                irq_base, irq_end;
         struct twl4030_bci_platform_data        *bci;
@@ -409,6 +427,7 @@ struct twl4030_platform_data {
         struct twl4030_keypad_data              *keypad;
         struct twl4030_usb_data                 *usb;
         struct twl4030_power_data               *power;
+        struct twl4030_codec_data               *codec;
 
         /* LDO regulators */
         struct regulator_init_data              *vdac;
diff --git a/include/linux/i82593.h b/include/linux/i82593.h
new file mode 100644
index 00000000000..afac5c7a323
--- /dev/null
+++ b/include/linux/i82593.h
@@ -0,0 +1,229 @@
+/*
+ * Definitions for Intel 82593 CSMA/CD Core LAN Controller
+ * The definitions are taken from the 1992 users manual with Intel
+ * order number 297125-001.
+ *
+ * /usr/src/pc/RCS/i82593.h,v 1.1 1996/07/17 15:23:12 root Exp
+ *
+ * Copyright 1994, Anders Klemets <klemets@it.kth.se>
+ *
+ * HISTORY
+ * i82593.h,v
+ * Revision 1.4  2005/11/4  09:15:00  baroniunas
+ * Modified copyright with permission of author as follows:
+ *
+ *   "If I82539.H is the only file with my copyright statement
+ *    that is included in the Source Forge project, then you have
+ *    my approval to change the copyright statement to be a GPL
+ *    license, in the way you proposed on October 10."
+ *
+ * Revision 1.1  1996/07/17 15:23:12  root
+ * Initial revision
+ *
+ * Revision 1.3  1995/04/05  15:13:58  adj
+ * Initial alpha release
+ *
+ * Revision 1.2  1994/06/16  23:57:31  klemets
+ * Mirrored all the fields in the configuration block.
+ *
+ * Revision 1.1  1994/06/02  20:25:34  klemets
+ * Initial revision
+ *
+ *
+ */
+#ifndef _I82593_H
+#define _I82593_H
+
+/* Intel 82593 CSMA/CD Core LAN Controller */
+
+/* Port 0 Command Register definitions */
+
+/* Execution operations */
+#define OP0_NOP                 0       /* CHNL = 0 */
+#define OP0_SWIT_TO_PORT_1      0       /* CHNL = 1 */
+#define OP0_IA_SETUP            1
+#define OP0_CONFIGURE           2
+#define OP0_MC_SETUP            3
+#define OP0_TRANSMIT            4
+#define OP0_TDR                 5
+#define OP0_DUMP                6
+#define OP0_DIAGNOSE            7
+#define OP0_TRANSMIT_NO_CRC     9
+#define OP0_RETRANSMIT          12
+#define OP0_ABORT               13
+/* Reception operations */
+#define OP0_RCV_ENABLE          8
+#define OP0_RCV_DISABLE         10
+#define OP0_STOP_RCV            11
+/* Status pointer control operations */
+#define OP0_FIX_PTR             15      /* CHNL = 1 */
+#define OP0_RLS_PTR             15      /* CHNL = 0 */
+#define OP0_RESET               14
+
+#define CR0_CHNL                (1 << 4)        /* 0=Channel 0, 1=Channel 1 */
+#define CR0_STATUS_0            0x00
+#define CR0_STATUS_1            0x20
+#define CR0_STATUS_2            0x40
+#define CR0_STATUS_3            0x60
+#define CR0_INT_ACK             (1 << 7)        /* 0=No ack, 1=acknowledge */
+
+/* Port 0 Status Register definitions */
+
+#define SR0_NO_RESULT           0               /* dummy */
+#define SR0_EVENT_MASK          0x0f
+#define SR0_IA_SETUP_DONE       1
+#define SR0_CONFIGURE_DONE      2
+#define SR0_MC_SETUP_DONE       3
+#define SR0_TRANSMIT_DONE       4
+#define SR0_TDR_DONE            5
+#define SR0_DUMP_DONE           6
+#define SR0_DIAGNOSE_PASSED     7
+#define SR0_TRANSMIT_NO_CRC_DONE 9
+#define SR0_RETRANSMIT_DONE     12
+#define SR0_EXECUTION_ABORTED   13
+#define SR0_END_OF_FRAME        8
+#define SR0_RECEPTION_ABORTED   10
+#define SR0_DIAGNOSE_FAILED     15
+#define SR0_STOP_REG_HIT        11
+
+#define SR0_CHNL                (1 << 4)
+#define SR0_EXECUTION           (1 << 5)
+#define SR0_RECEPTION           (1 << 6)
+#define SR0_INTERRUPT           (1 << 7)
+#define SR0_BOTH_RX_TX          (SR0_EXECUTION | SR0_RECEPTION)
+
+#define SR3_EXEC_STATE_MASK     0x03
+#define SR3_EXEC_IDLE           0
+#define SR3_TX_ABORT_IN_PROGRESS 1
+#define SR3_EXEC_ACTIVE         2
+#define SR3_ABORT_IN_PROGRESS   3
+#define SR3_EXEC_CHNL           (1 << 2)
+#define SR3_STP_ON_NO_RSRC      (1 << 3)
+#define SR3_RCVING_NO_RSRC      (1 << 4)
+#define SR3_RCV_STATE_MASK      0x60
+#define SR3_RCV_IDLE            0x00
+#define SR3_RCV_READY           0x20
+#define SR3_RCV_ACTIVE          0x40
+#define SR3_RCV_STOP_IN_PROG    0x60
+#define SR3_RCV_CHNL            (1 << 7)
+
+/* Port 1 Command Register definitions */
+
+#define OP1_NOP                 0
+#define OP1_SWIT_TO_PORT_0      1
+#define OP1_INT_DISABLE         2
+#define OP1_INT_ENABLE          3
+#define OP1_SET_TS              5
+#define OP1_RST_TS              7
+#define OP1_POWER_DOWN          8
+#define OP1_RESET_RING_MNGMT    11
+#define OP1_RESET               14
+#define OP1_SEL_RST             15
+
+#define CR1_STATUS_4            0x00
+#define CR1_STATUS_5            0x20
+#define CR1_STATUS_6            0x40
+#define CR1_STOP_REG_UPDATE     (1 << 7)
+
+/* Receive frame status bits */
+
+#define RX_RCLD                 (1 << 0)
+#define RX_IA_MATCH             (1 << 1)
+#define RX_NO_AD_MATCH          (1 << 2)
+#define RX_NO_SFD               (1 << 3)
+#define RX_SRT_FRM              (1 << 7)
+#define RX_OVRRUN               (1 << 8)
+#define RX_ALG_ERR              (1 << 10)
+#define RX_CRC_ERR              (1 << 11)
+#define RX_LEN_ERR              (1 << 12)
+#define RX_RCV_OK               (1 << 13)
+#define RX_TYP_LEN              (1 << 15)
+
+/* Transmit status bits */
+
+#define TX_NCOL_MASK            0x0f
+#define TX_FRTL                 (1 << 4)
+#define TX_MAX_COL              (1 << 5)
+#define TX_HRT_BEAT             (1 << 6)
+#define TX_DEFER                (1 << 7)
+#define TX_UND_RUN              (1 << 8)
+#define TX_LOST_CTS             (1 << 9)
+#define TX_LOST_CRS             (1 << 10)
+#define TX_LTCOL                (1 << 11)
+#define TX_OK                   (1 << 13)
+#define TX_COLL                 (1 << 15)
+
+struct i82593_conf_block {
+  u_char fifo_limit : 4,
+         forgnesi   : 1,
+         fifo_32    : 1,
+         d6mod      : 1,
+         throttle_enb : 1;
+  u_char throttle   : 6,
+         cntrxint   : 1,
+         contin     : 1;
+  u_char addr_len   : 3,
+         acloc      : 1,
+         preamb_len : 2,
+         loopback   : 2;
+  u_char lin_prio   : 3,
+         tbofstop   : 1,
+         exp_prio   : 3,
+         bof_met    : 1;
+  u_char            : 4,
+         ifrm_spc   : 4;
+  u_char            : 5,
+         slottim_low : 3;
+  u_char slottim_hi : 3,
+                    : 1,
+         max_retr   : 4;
+  u_char prmisc     : 1,
+         bc_dis     : 1,
+                    : 1,
+         crs_1      : 1,
+         nocrc_ins  : 1,
+         crc_1632   : 1,
+                    : 1,
+         crs_cdt    : 1;
+  u_char cs_filter  : 3,
+         crs_src    : 1,
+         cd_filter  : 3,
+                    : 1;
+  u_char            : 2,
+         min_fr_len : 6;
+  u_char lng_typ    : 1,
+         lng_fld    : 1,
+         rxcrc_xf   : 1,
+         artx       : 1,
+         sarec      : 1,
+         tx_jabber  : 1,        /* why is this called max_len in the manual? */
+         hash_1     : 1,
+         lbpkpol    : 1;
+  u_char            : 6,
+         fdx        : 1,
+                    : 1;
+  u_char dummy_6    : 6,        /* supposed to be ones */
+         mult_ia    : 1,
+         dis_bof    : 1;
+  u_char dummy_1    : 1,        /* supposed to be one */
+         tx_ifs_retrig : 2,
+         mc_all     : 1,
+         rcv_mon    : 2,
+         frag_acpt  : 1,
+         tstrttrs   : 1;
+  u_char fretx      : 1,
+         runt_eop   : 1,
+         hw_sw_pin  : 1,
+         big_endn   : 1,
+         syncrqs    : 1,
+         sttlen     : 1,
+         tx_eop     : 1,
+         rx_eop     : 1;
+  u_char rbuf_size  : 5,
+         rcvstop    : 1,
+                    : 2;
+};
+
+#define I82593_MAX_MULTICAST_ADDRESSES  128     /* Hardware hashed filter */
+
+#endif /* _I82593_H */
diff --git a/include/linux/ide.h b/include/linux/ide.h
index e4135d6e055..0ec61295904 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -125,8 +125,8 @@ struct ide_io_ports {
  * Timeouts for various operations:
  */
 enum {
-        /* spec allows up to 20ms */
-        WAIT_DRQ        = HZ / 10,      /* 100ms */
+        /* spec allows up to 20ms, but CF cards and SSD drives need more */
+        WAIT_DRQ        = 1 * HZ,       /* 1s */
         /* some laptops are very slow */
         WAIT_READY      = 5 * HZ,       /* 5s */
         /* should be less than 3ms (?), if all ATAPI CD is closed at boot */
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 52e15e079c6..d9724a28c0c 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -115,7 +115,6 @@
 #define IEEE80211_MAX_SSID_LEN          32
 
 #define IEEE80211_MAX_MESH_ID_LEN       32
-#define IEEE80211_MESH_CONFIG_LEN       24
 
 #define IEEE80211_QOS_CTL_LEN           2
 #define IEEE80211_QOS_CTL_TID_MASK      0x000F
@@ -472,7 +471,7 @@ static inline int ieee80211_is_cfendack(__le16 fc)
 }
 
 /**
- * ieee80211_is_nullfunc - check if FTYPE=IEEE80211_FTYPE_DATA and STYPE=IEEE80211_STYPE_NULLFUNC
+ * ieee80211_is_nullfunc - check if frame is a regular (non-QoS) nullfunc frame
  * @fc: frame control bytes in little-endian byteorder
  */
 static inline int ieee80211_is_nullfunc(__le16 fc)
@@ -481,6 +480,16 @@ static inline int ieee80211_is_nullfunc(__le16 fc)
                cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC);
 }
 
+/**
+ * ieee80211_is_qos_nullfunc - check if frame is a QoS nullfunc frame
+ * @fc: frame control bytes in little-endian byteorder
+ */
+static inline int ieee80211_is_qos_nullfunc(__le16 fc)
+{
+        return (fc & cpu_to_le16(IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)) ==
+               cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_NULLFUNC);
+}
+
 struct ieee80211s_hdr {
         u8 flags;
         u8 ttl;
@@ -544,6 +553,35 @@ struct ieee80211_tim_ie {
         u8 virtual_map[1];
 } __attribute__ ((packed));
 
+/**
+ * struct ieee80211_meshconf_ie
+ *
+ * This structure refers to "Mesh Configuration information element"
+ */
+struct ieee80211_meshconf_ie {
+        u8 meshconf_psel;
+        u8 meshconf_pmetric;
+        u8 meshconf_congest;
+        u8 meshconf_synch;
+        u8 meshconf_auth;
+        u8 meshconf_form;
+        u8 meshconf_cap;
+} __attribute__ ((packed));
+
+/**
+ * struct ieee80211_rann_ie
+ *
+ * This structure refers to "Root Announcement information element"
+ */
+struct ieee80211_rann_ie {
+        u8 rann_flags;
+        u8 rann_hopcount;
+        u8 rann_ttl;
+        u8 rann_addr[6];
+        u32 rann_seq;
+        u32 rann_metric;
+} __attribute__ ((packed));
+
 #define WLAN_SA_QUERY_TR_ID_LEN 2
 
 struct ieee80211_mgmt {
@@ -1060,6 +1098,7 @@ enum ieee80211_eid {
         WLAN_EID_PREQ = 68,
         WLAN_EID_PREP = 69,
         WLAN_EID_PERR = 70,
+        WLAN_EID_RANN = 49,     /* compatible with FreeBSD */
         /* 802.11h */
         WLAN_EID_PWR_CONSTRAINT = 32,
         WLAN_EID_PWR_CAPABILITY = 33,
@@ -1227,6 +1266,8 @@ enum ieee80211_sa_query_action {
 
 #define WLAN_MAX_KEY_LEN                32
 
+#define WLAN_PMKID_LEN                  16
+
 /**
  * ieee80211_get_qos_ctl - get pointer to qos control bytes
  * @hdr: the frame
diff --git a/include/linux/if.h b/include/linux/if.h
index b9a6229f3be..3a9f410a296 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -70,6 +70,7 @@
 #define IFF_XMIT_DST_RELEASE 0x400      /* dev_hard_start_xmit() is allowed to
                                          * release skb->dst
                                          */
+#define IFF_DONT_BRIDGE 0x800           /* disallow bridging this ether dev */
 
 #define IF_GET_IFACE    0x0001          /* for querying only */
 #define IF_GET_PROTO    0x0002
@@ -125,8 +126,7 @@ enum {
  *      being very small might be worth keeping for clean configuration.
  */
 
-struct ifmap 
-{
+struct ifmap {
         unsigned long mem_start;
         unsigned long mem_end;
         unsigned short base_addr; 
@@ -136,8 +136,7 @@ struct ifmap
         /* 3 bytes spare */
 };
 
-struct if_settings
-{
+struct if_settings {
         unsigned int type;      /* Type of physical device or protocol */
         unsigned int size;      /* Size of the data allocated by the caller */
         union {
@@ -161,8 +160,7 @@ struct if_settings
  * remainder may be interface specific.
  */
 
-struct ifreq 
-{
+struct ifreq {
 #define IFHWADDRLEN     6
         union
         {
@@ -211,11 +209,9 @@ struct ifreq
  * must know all networks accessible).
  */
 
-struct ifconf 
-{
+struct ifconf  {
         int     ifc_len;                        /* size of buffer       */
-        union 
-        {
+        union {
                 char __user *ifcu_buf;
                 struct ifreq __user *ifcu_req;
         } ifc_ifcu;
diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
index fd974046675..23357ab81a7 100644
--- a/include/linux/if_addr.h
+++ b/include/linux/if_addr.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
 
-struct ifaddrmsg
-{
+struct ifaddrmsg {
         __u8            ifa_family;
         __u8            ifa_prefixlen;  /* The prefix length            */
         __u8            ifa_flags;      /* Flags                        */
@@ -20,8 +19,7 @@ struct ifaddrmsg
  * but for point-to-point IFA_ADDRESS is DESTINATION address,
  * local address is supplied in IFA_LOCAL attribute.
  */
-enum
-{
+enum {
         IFA_UNSPEC,
         IFA_ADDRESS,
         IFA_LOCAL,
@@ -47,8 +45,7 @@ enum
 #define IFA_F_TENTATIVE         0x40
 #define IFA_F_PERMANENT         0x80
 
-struct ifa_cacheinfo
-{
+struct ifa_cacheinfo {
         __u32   ifa_prefered;
         __u32   ifa_valid;
         __u32   cstamp; /* created timestamp, hundredths of seconds */
diff --git a/include/linux/if_addrlabel.h b/include/linux/if_addrlabel.h
index 89571f65d6d..54580c29818 100644
--- a/include/linux/if_addrlabel.h
+++ b/include/linux/if_addrlabel.h
@@ -12,8 +12,7 @@
 
 #include <linux/types.h>
 
-struct ifaddrlblmsg
-{
+struct ifaddrlblmsg {
         __u8            ifal_family;            /* Address family */
         __u8            __ifal_reserved;        /* Reserved */
         __u8            ifal_prefixlen;         /* Prefix length */
@@ -22,8 +21,7 @@ struct ifaddrlblmsg
         __u32           ifal_seq;               /* sequence number */
 };
 
-enum
-{
+enum {
         IFAL_ADDRESS = 1,
         IFAL_LABEL = 2,
         __IFAL_MAX
diff --git a/include/linux/if_arcnet.h b/include/linux/if_arcnet.h
index 0835debab11..46e34bd0e78 100644
--- a/include/linux/if_arcnet.h
+++ b/include/linux/if_arcnet.h
@@ -56,8 +56,7 @@
 /*
  * The RFC1201-specific components of an arcnet packet header.
  */
-struct arc_rfc1201
-{
+struct arc_rfc1201 {
     __u8  proto;                /* protocol ID field - varies           */
     __u8  split_flag;   /* for use with split packets           */
     __be16   sequence;          /* sequence number                      */
@@ -69,8 +68,7 @@ struct arc_rfc1201
 /*
  * The RFC1051-specific components.
  */
-struct arc_rfc1051
-{
+struct arc_rfc1051 {
     __u8 proto;         /* ARC_P_RFC1051_ARP/RFC1051_IP */
     __u8 payload[0];            /* 507 bytes                    */
 };
@@ -81,8 +79,7 @@ struct arc_rfc1051
  * The ethernet-encap-specific components.  We have a real ethernet header
  * and some data.
  */
-struct arc_eth_encap
-{
+struct arc_eth_encap {
     __u8 proto;         /* Always ARC_P_ETHER                   */
     struct ethhdr eth;          /* standard ethernet header (yuck!)     */
     __u8 payload[0];            /* 493 bytes                            */
@@ -90,8 +87,7 @@ struct arc_eth_encap
 #define ETH_ENCAP_HDR_SIZE 14
 
 
-struct arc_cap
-{
+struct arc_cap {
         __u8 proto;
         __u8 cookie[sizeof(int)];   /* Actually NOT sent over the network */
         union {
@@ -108,8 +104,7 @@ struct arc_cap
  * the _end_ of the 512-byte buffer.  We hide this complexity inside the
  * driver.
  */
-struct arc_hardware
-{
+struct arc_hardware {
     __u8  source,               /* source ARCnet - filled in automagically */
              dest,              /* destination ARCnet - 0 for broadcast    */
              offset[2];         /* offset bytes (some weird semantics)     */
@@ -120,8 +115,7 @@ struct arc_hardware
  * This is an ARCnet frame header, as seen by the kernel (and userspace,
  * when you do a raw packet capture).
  */
-struct archdr
-{
+struct archdr {
     /* hardware requirements */
     struct arc_hardware hard;
      
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 282eb37e2de..e80b7f88f7c 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -133,8 +133,7 @@ struct arpreq_old {
  *      This structure defines an ethernet arp header.
  */
 
-struct arphdr
-{
+struct arphdr {
         __be16          ar_hrd;         /* format of hardware address   */
         __be16          ar_pro;         /* format of protocol address   */
         unsigned char   ar_hln;         /* length of hardware address   */
diff --git a/include/linux/if_bonding.h b/include/linux/if_bonding.h
index 65c2d247068..cd525fae3c9 100644
--- a/include/linux/if_bonding.h
+++ b/include/linux/if_bonding.h
@@ -94,8 +94,7 @@ typedef struct ifbond {
         __s32 miimon;
 } ifbond;
 
-typedef struct ifslave
-{
+typedef struct ifslave {
         __s32 slave_id; /* Used as an IN param to the BOND_SLAVE_INFO_QUERY ioctl */
         char slave_name[IFNAMSIZ];
         __s8 link;
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 6badb3e2c4e..938b7e81df9 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -49,8 +49,7 @@
 #define BR_STATE_FORWARDING 3
 #define BR_STATE_BLOCKING 4
 
-struct __bridge_info
-{
+struct __bridge_info {
         __u64 designated_root;
         __u64 bridge_id;
         __u32 root_path_cost;
@@ -72,8 +71,7 @@ struct __bridge_info
         __u32 gc_timer_value;
 };
 
-struct __port_info
-{
+struct __port_info {
         __u64 designated_root;
         __u64 designated_bridge;
         __u16 port_id;
@@ -89,8 +87,7 @@ struct __port_info
         __u32 hold_timer_value;
 };
 
-struct __fdb_entry
-{
+struct __fdb_entry {
         __u8 mac_addr[6];
         __u8 port_no;
         __u8 is_local;
diff --git a/include/linux/if_ec.h b/include/linux/if_ec.h
index e7499aa7978..d85f9f48129 100644
--- a/include/linux/if_ec.h
+++ b/include/linux/if_ec.h
@@ -5,14 +5,12 @@
 
 /* User visible stuff. Glibc provides its own but libc5 folk will use these */
 
-struct ec_addr
-{
+struct ec_addr {
   unsigned char station;                /* Station number.  */
   unsigned char net;                    /* Network number.  */
 };
 
-struct sockaddr_ec
-{
+struct sockaddr_ec {
   unsigned short sec_family;
   unsigned char port;                   /* Port number.  */
   unsigned char cb;                     /* Control/flag byte.  */
@@ -37,8 +35,7 @@ struct sockaddr_ec
 #define EC_HLEN                         6
 
 /* This is what an Econet frame looks like on the wire. */
-struct ec_framehdr 
-{
+struct ec_framehdr {
   unsigned char dst_stn;
   unsigned char dst_net;
   unsigned char src_stn;
@@ -62,8 +59,7 @@ static inline struct econet_sock *ec_sk(const struct sock *sk)
         return (struct econet_sock *)sk;
 }
 
-struct ec_device
-{
+struct ec_device {
   unsigned char station, net;           /* Econet protocol address */
 };
 
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 580b6004d00..005e1525ab8 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -136,10 +136,6 @@ extern struct ctl_table ether_table[];
 
 extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);
 
-/*
- *      Display a 6 byte device address (MAC) in a readable format.
- */
-extern char *print_mac(char *buf, const unsigned char *addr) __deprecated;
 #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
 #define MAC_BUF_SIZE    18
 #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE]
diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h
index 45de1046dbb..5459c5c0993 100644
--- a/include/linux/if_fddi.h
+++ b/include/linux/if_fddi.h
@@ -63,36 +63,32 @@
 #define FDDI_UI_CMD                     0x03
 
 /* Define 802.2 Type 1 header */
-struct fddi_8022_1_hdr
-        {
+struct fddi_8022_1_hdr {
         __u8    dsap;                                   /* destination service access point */
         __u8    ssap;                                   /* source service access point */
         __u8    ctrl;                                   /* control byte #1 */
-        } __attribute__ ((packed));
+} __attribute__ ((packed));
 
 /* Define 802.2 Type 2 header */
-struct fddi_8022_2_hdr
-        {
+struct fddi_8022_2_hdr {
         __u8    dsap;                                   /* destination service access point */
         __u8    ssap;                                   /* source service access point */
         __u8    ctrl_1;                                 /* control byte #1 */
         __u8    ctrl_2;                                 /* control byte #2 */
-        } __attribute__ ((packed));
+} __attribute__ ((packed));
 
 /* Define 802.2 SNAP header */
 #define FDDI_K_OUI_LEN  3
-struct fddi_snap_hdr
-        {
+struct fddi_snap_hdr {
         __u8    dsap;                                   /* always 0xAA */
         __u8    ssap;                                   /* always 0xAA */
         __u8    ctrl;                                   /* always 0x03 */
         __u8    oui[FDDI_K_OUI_LEN];    /* organizational universal id */
         __be16  ethertype;                              /* packet type ID field */
-        } __attribute__ ((packed));
+} __attribute__ ((packed));
 
 /* Define FDDI LLC frame header */
-struct fddihdr
-        {
+struct fddihdr {
         __u8    fc;                                             /* frame control */
         __u8    daddr[FDDI_K_ALEN];             /* destination address */
         __u8    saddr[FDDI_K_ALEN];             /* source address */
@@ -102,7 +98,7 @@ struct fddihdr
                 struct fddi_8022_2_hdr          llc_8022_2;
                 struct fddi_snap_hdr            llc_snap;
                 } hdr;
-        } __attribute__ ((packed));
+} __attribute__ ((packed));
 
 #ifdef __KERNEL__
 #include <linux/netdevice.h>
@@ -197,7 +193,7 @@ struct fddi_statistics {
         __u32   port_pc_withhold[2];
         __u32   port_ler_flag[2];
         __u32   port_hardware_present[2];
-        };
+};
 #endif /* __KERNEL__ */
 
 #endif  /* _LINUX_IF_FDDI_H */
diff --git a/include/linux/if_hippi.h b/include/linux/if_hippi.h
index 4a7c9940b08..8d038eb8db5 100644
--- a/include/linux/if_hippi.h
+++ b/include/linux/if_hippi.h
@@ -51,8 +51,7 @@
  *      HIPPI statistics collection data. 
  */
  
-struct hipnet_statistics
-{
+struct hipnet_statistics {
         int     rx_packets;             /* total packets received       */
         int     tx_packets;             /* total packets transmitted    */
         int     rx_errors;              /* bad packets received         */
@@ -77,8 +76,7 @@ struct hipnet_statistics
 };
 
 
-struct hippi_fp_hdr
-{
+struct hippi_fp_hdr {
 #if 0
         __u8            ulp;                            /* must contain 4 */
 #if defined (__BIG_ENDIAN_BITFIELD)
@@ -108,8 +106,7 @@ struct hippi_fp_hdr
         __be32          d2_size;
 } __attribute__ ((packed));
 
-struct hippi_le_hdr
-{
+struct hippi_le_hdr {
 #if defined (__BIG_ENDIAN_BITFIELD)
         __u8            fc:3;
         __u8            double_wide:1;
@@ -139,8 +136,7 @@ struct hippi_le_hdr
  * Looks like the dsap and ssap fields have been swapped by mistake in
  * RFC 2067 "IP over HIPPI".
  */
-struct hippi_snap_hdr
-{
+struct hippi_snap_hdr {
         __u8    dsap;                   /* always 0xAA */
         __u8    ssap;                   /* always 0xAA */
         __u8    ctrl;                   /* always 0x03 */
@@ -148,8 +144,7 @@ struct hippi_snap_hdr
         __be16  ethertype;              /* packet type ID field */
 } __attribute__ ((packed));
 
-struct hippi_hdr
-{
+struct hippi_hdr {
         struct hippi_fp_hdr     fp;
         struct hippi_le_hdr     le;
         struct hippi_snap_hdr   snap;
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 176c5182c51..6674791622c 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -5,8 +5,7 @@
 #include <linux/netlink.h>
 
 /* The struct should be in sync with struct net_device_stats */
-struct rtnl_link_stats
-{
+struct rtnl_link_stats {
         __u32   rx_packets;             /* total packets received       */
         __u32   tx_packets;             /* total packets transmitted    */
         __u32   rx_bytes;               /* total bytes received         */
@@ -39,8 +38,7 @@ struct rtnl_link_stats
 };
 
 /* The struct should be in sync with struct ifmap */
-struct rtnl_link_ifmap
-{
+struct rtnl_link_ifmap {
         __u64   mem_start;
         __u64   mem_end;
         __u64   base_addr;
@@ -49,8 +47,7 @@ struct rtnl_link_ifmap
         __u8    port;
 };
 
-enum
-{
+enum {
         IFLA_UNSPEC,
         IFLA_ADDRESS,
         IFLA_BROADCAST,
@@ -123,8 +120,7 @@ enum
  */
 
 /* Subtype attributes for IFLA_PROTINFO */
-enum
-{
+enum {
         IFLA_INET6_UNSPEC,
         IFLA_INET6_FLAGS,       /* link flags                   */
         IFLA_INET6_CONF,        /* sysctl parameters            */
@@ -137,16 +133,14 @@ enum
 
 #define IFLA_INET6_MAX  (__IFLA_INET6_MAX - 1)
 
-struct ifla_cacheinfo
-{
+struct ifla_cacheinfo {
         __u32   max_reasm_len;
         __u32   tstamp;         /* ipv6InterfaceTable updated timestamp */
         __u32   reachable_time;
         __u32   retrans_time;
 };
 
-enum
-{
+enum {
         IFLA_INFO_UNSPEC,
         IFLA_INFO_KIND,
         IFLA_INFO_DATA,
@@ -158,8 +152,7 @@ enum
 
 /* VLAN section */
 
-enum
-{
+enum {
         IFLA_VLAN_UNSPEC,
         IFLA_VLAN_ID,
         IFLA_VLAN_FLAGS,
@@ -175,8 +168,7 @@ struct ifla_vlan_flags {
         __u32   mask;
 };
 
-enum
-{
+enum {
         IFLA_VLAN_QOS_UNSPEC,
         IFLA_VLAN_QOS_MAPPING,
         __IFLA_VLAN_QOS_MAX
@@ -184,10 +176,24 @@ enum
 
 #define IFLA_VLAN_QOS_MAX       (__IFLA_VLAN_QOS_MAX - 1)
 
-struct ifla_vlan_qos_mapping
-{
+struct ifla_vlan_qos_mapping {
         __u32 from;
         __u32 to;
 };
 
+/* MACVLAN section */
+enum {
+        IFLA_MACVLAN_UNSPEC,
+        IFLA_MACVLAN_MODE,
+        __IFLA_MACVLAN_MAX,
+};
+
+#define IFLA_MACVLAN_MAX (__IFLA_MACVLAN_MAX - 1)
+
+enum macvlan_mode {
+        MACVLAN_MODE_PRIVATE = 1, /* don't talk to other macvlans */
+        MACVLAN_MODE_VEPA    = 2, /* talk to other ports through ext bridge */
+        MACVLAN_MODE_BRIDGE  = 4, /* talk to bridge ports directly */
+};
+
 #endif /* _LINUX_IF_LINK_H */
diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h
index dea7d6b7cf9..4021d47cc43 100644
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -3,15 +3,13 @@
 
 #include <linux/types.h>
 
-struct sockaddr_pkt
-{
+struct sockaddr_pkt {
         unsigned short spkt_family;
         unsigned char spkt_device[14];
         __be16 spkt_protocol;
 };
 
-struct sockaddr_ll
-{
+struct sockaddr_ll {
         unsigned short  sll_family;
         __be16          sll_protocol;
         int             sll_ifindex;
@@ -49,14 +47,12 @@ struct sockaddr_ll
 #define PACKET_TX_RING                  13
 #define PACKET_LOSS                     14
 
-struct tpacket_stats
-{
+struct tpacket_stats {
         unsigned int    tp_packets;
         unsigned int    tp_drops;
 };
 
-struct tpacket_auxdata
-{
+struct tpacket_auxdata {
         __u32           tp_status;
         __u32           tp_len;
         __u32           tp_snaplen;
@@ -78,8 +74,7 @@ struct tpacket_auxdata
 #define TP_STATUS_SENDING       0x2
 #define TP_STATUS_WRONG_FORMAT  0x4
 
-struct tpacket_hdr
-{
+struct tpacket_hdr {
         unsigned long   tp_status;
         unsigned int    tp_len;
         unsigned int    tp_snaplen;
@@ -93,8 +88,7 @@ struct tpacket_hdr
 #define TPACKET_ALIGN(x)        (((x)+TPACKET_ALIGNMENT-1)&~(TPACKET_ALIGNMENT-1))
 #define TPACKET_HDRLEN          (TPACKET_ALIGN(sizeof(struct tpacket_hdr)) + sizeof(struct sockaddr_ll))
 
-struct tpacket2_hdr
-{
+struct tpacket2_hdr {
         __u32           tp_status;
         __u32           tp_len;
         __u32           tp_snaplen;
@@ -107,8 +101,7 @@ struct tpacket2_hdr
 
 #define TPACKET2_HDRLEN         (TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + sizeof(struct sockaddr_ll))
 
-enum tpacket_versions
-{
+enum tpacket_versions {
         TPACKET_V1,
         TPACKET_V2,
 };
@@ -126,16 +119,14 @@ enum tpacket_versions
    - Pad to align to TPACKET_ALIGNMENT=16
  */
 
-struct tpacket_req
-{
+struct tpacket_req {
         unsigned int    tp_block_size;  /* Minimal size of contiguous block */
         unsigned int    tp_block_nr;    /* Number of blocks */
         unsigned int    tp_frame_size;  /* Size of frame */
         unsigned int    tp_frame_nr;    /* Total number of frames */
 };
 
-struct packet_mreq
-{
+struct packet_mreq {
         int             mr_ifindex;
         unsigned short  mr_type;
         unsigned short  mr_alen;
diff --git a/include/linux/if_plip.h b/include/linux/if_plip.h
index 153a649915a..6298c7e88b2 100644
--- a/include/linux/if_plip.h
+++ b/include/linux/if_plip.h
@@ -15,8 +15,7 @@
 
 #define SIOCDEVPLIP     SIOCDEVPRIVATE
 
-struct plipconf
-{
+struct plipconf {
         unsigned short pcmd;
         unsigned long  nibble;
         unsigned long  trigger;
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
index 3a14b088c8e..c58baea4a25 100644
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -24,8 +24,7 @@
 /* Structure used to connect() the socket to a particular tunnel UDP
  * socket.
  */
-struct pppol2tp_addr
-{
+struct pppol2tp_addr {
         __kernel_pid_t  pid;            /* pid that owns the fd.
                                          * 0 => current */
         int     fd;                     /* FD of UDP socket to use */
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 5a9aae4adb4..1822d635be6 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -5,6 +5,7 @@
 
 #ifdef __KERNEL__
 #include <linux/ip.h>
+#include <linux/in6.h>
 #endif
 
 #define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
@@ -15,6 +16,10 @@
 #define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
 #define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
 #define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
+#define SIOCGET6RD      (SIOCDEVPRIVATE + 8)
+#define SIOCADD6RD      (SIOCDEVPRIVATE + 9)
+#define SIOCDEL6RD      (SIOCDEVPRIVATE + 10)
+#define SIOCCHG6RD      (SIOCDEVPRIVATE + 11)
 
 #define GRE_CSUM        __cpu_to_be16(0x8000)
 #define GRE_ROUTING     __cpu_to_be16(0x4000)
@@ -25,8 +30,7 @@
 #define GRE_FLAGS       __cpu_to_be16(0x00F8)
 #define GRE_VERSION     __cpu_to_be16(0x0007)
 
-struct ip_tunnel_parm
-{
+struct ip_tunnel_parm {
         char                    name[IFNAMSIZ];
         int                     link;
         __be16                  i_flags;
@@ -51,8 +55,14 @@ struct ip_tunnel_prl {
 /* PRL flags */
 #define PRL_DEFAULT             0x0001
 
-enum
-{
+struct ip_tunnel_6rd {
+        struct in6_addr         prefix;
+        __be32                  relay_prefix;
+        __u16                   prefixlen;
+        __u16                   relay_prefixlen;
+};
+
+enum {
         IFLA_GRE_UNSPEC,
         IFLA_GRE_LINK,
         IFLA_GRE_IFLAGS,
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 7ff9af1d0f0..3d870fda8c4 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -63,7 +63,11 @@ static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb)
         return (struct vlan_ethhdr *)skb_mac_header(skb);
 }
 
-#define VLAN_VID_MASK   0xfff
+#define VLAN_PRIO_MASK          0xe000 /* Priority Code Point */
+#define VLAN_PRIO_SHIFT         13
+#define VLAN_CFI_MASK           0x1000 /* Canonical Format Indicator */
+#define VLAN_TAG_PRESENT        VLAN_CFI_MASK
+#define VLAN_VID_MASK           0x0fff /* VLAN Identifier */
 
 /* found in socket.c */
 extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *));
@@ -81,6 +85,7 @@ struct vlan_group {
                                             * the vlan is attached to.
                                             */
         unsigned int            nr_vlans;
+        int                     killall;
         struct hlist_node       hlist;  /* linked list */
         struct net_device **vlan_devices_arrays[VLAN_GROUP_ARRAY_SPLIT_PARTS];
         struct rcu_head         rcu;
@@ -105,8 +110,8 @@ static inline void vlan_group_set_device(struct vlan_group *vg,
         array[vlan_id % VLAN_GROUP_ARRAY_PART_LEN] = dev;
 }
 
-#define vlan_tx_tag_present(__skb)      ((__skb)->vlan_tci)
-#define vlan_tx_tag_get(__skb)          ((__skb)->vlan_tci)
+#define vlan_tx_tag_present(__skb)      ((__skb)->vlan_tci & VLAN_TAG_PRESENT)
+#define vlan_tx_tag_get(__skb)          ((__skb)->vlan_tci & ~VLAN_TAG_PRESENT)
 
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 extern struct net_device *vlan_dev_real_dev(const struct net_device *dev);
@@ -115,10 +120,12 @@ extern u16 vlan_dev_vlan_id(const struct net_device *dev);
 extern int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
                              u16 vlan_tci, int polling);
 extern int vlan_hwaccel_do_receive(struct sk_buff *skb);
-extern int vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
-                            unsigned int vlan_tci, struct sk_buff *skb);
-extern int vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
-                          unsigned int vlan_tci);
+extern gro_result_t
+vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
+                 unsigned int vlan_tci, struct sk_buff *skb);
+extern gro_result_t
+vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
+               unsigned int vlan_tci);
 
 #else
 static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev)
@@ -145,17 +152,18 @@ static inline int vlan_hwaccel_do_receive(struct sk_buff *skb)
         return 0;
 }
 
-static inline int vlan_gro_receive(struct napi_struct *napi,
-                                   struct vlan_group *grp,
-                                   unsigned int vlan_tci, struct sk_buff *skb)
+static inline gro_result_t
+vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
+                 unsigned int vlan_tci, struct sk_buff *skb)
 {
-        return NET_RX_DROP;
+        return GRO_DROP;
 }
 
-static inline int vlan_gro_frags(struct napi_struct *napi,
-                                 struct vlan_group *grp, unsigned int vlan_tci)
+static inline gro_result_t
+vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
+               unsigned int vlan_tci)
 {
-        return NET_RX_DROP;
+        return GRO_DROP;
 }
 #endif
 
@@ -231,7 +239,7 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
 static inline struct sk_buff *__vlan_hwaccel_put_tag(struct sk_buff *skb,
                                                      u16 vlan_tci)
 {
-        skb->vlan_tci = vlan_tci;
+        skb->vlan_tci = VLAN_TAG_PRESENT | vlan_tci;
         return skb;
 }
 
@@ -284,7 +292,7 @@ static inline int __vlan_hwaccel_get_tag(const struct sk_buff *skb,
                                          u16 *vlan_tci)
 {
         if (vlan_tx_tag_present(skb)) {
-                *vlan_tci = skb->vlan_tci;
+                *vlan_tci = vlan_tx_tag_get(skb);
                 return 0;
         } else {
                 *vlan_tci = 0;
@@ -331,6 +339,7 @@ enum vlan_ioctl_cmds {
 enum vlan_flags {
         VLAN_FLAG_REORDER_HDR   = 0x1,
         VLAN_FLAG_GVRP          = 0x2,
+        VLAN_FLAG_LOOSE_BINDING = 0x4,
 };
 
 enum vlan_name_types {
diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index fe158e0e20e..724c27e5d17 100644
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -27,8 +27,7 @@
  *      Header in on cable format
  */
 
-struct igmphdr
-{
+struct igmphdr {
         __u8 type;
         __u8 code;              /* For newer IGMP */
         __sum16 csum;
@@ -151,8 +150,7 @@ static inline struct igmpv3_query *
 extern int sysctl_igmp_max_memberships;
 extern int sysctl_igmp_max_msf;
 
-struct ip_sf_socklist
-{
+struct ip_sf_socklist {
         unsigned int            sl_max;
         unsigned int            sl_count;
         __be32                  sl_addr[0];
@@ -167,16 +165,14 @@ struct ip_sf_socklist
    this list never used in fast path code
  */
 
-struct ip_mc_socklist
-{
+struct ip_mc_socklist {
         struct ip_mc_socklist   *next;
         struct ip_mreqn         multi;
         unsigned int            sfmode;         /* MCAST_{INCLUDE,EXCLUDE} */
         struct ip_sf_socklist   *sflist;
 };
 
-struct ip_sf_list
-{
+struct ip_sf_list {
         struct ip_sf_list       *sf_next;
         __be32                  sf_inaddr;
         unsigned long           sf_count[2];    /* include/exclude counts */
@@ -185,8 +181,7 @@ struct ip_sf_list
         unsigned char           sf_crcount;     /* retrans. left to send */
 };
 
-struct ip_mc_list
-{
+struct ip_mc_list {
         struct in_device        *interface;
         __be32                  multiaddr;
         struct ip_sf_list       *sources;
diff --git a/include/linux/in.h b/include/linux/in.h
index cf196da04ec..b615649db12 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -118,14 +118,12 @@ struct in_addr {
 
 /* Request struct for multicast socket ops */
 
-struct ip_mreq 
-{
+struct ip_mreq  {
         struct in_addr imr_multiaddr;   /* IP multicast address of group */
         struct in_addr imr_interface;   /* local IP address of interface */
 };
 
-struct ip_mreqn
-{
+struct ip_mreqn {
         struct in_addr  imr_multiaddr;          /* IP multicast address of group */
         struct in_addr  imr_address;            /* local IP address of interface */
         int             imr_ifindex;            /* Interface index */
@@ -149,21 +147,18 @@ struct ip_msfilter {
         (sizeof(struct ip_msfilter) - sizeof(__u32) \
         + (numsrc) * sizeof(__u32))
 
-struct group_req
-{
+struct group_req {
         __u32                            gr_interface;  /* interface index */
         struct __kernel_sockaddr_storage gr_group;      /* group address */
 };
 
-struct group_source_req
-{
+struct group_source_req {
         __u32                            gsr_interface; /* interface index */
         struct __kernel_sockaddr_storage gsr_group;     /* group address */
         struct __kernel_sockaddr_storage gsr_source;    /* source address */
 };
 
-struct group_filter
-{
+struct group_filter {
         __u32                            gf_interface;  /* interface index */
         struct __kernel_sockaddr_storage gf_group;      /* multicast address */
         __u32                            gf_fmode;      /* filter mode */
@@ -175,8 +170,7 @@ struct group_filter
         (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \
         + (numsrc) * sizeof(struct __kernel_sockaddr_storage))
 
-struct in_pktinfo
-{
+struct in_pktinfo {
         int             ipi_ifindex;
         struct in_addr  ipi_spec_dst;
         struct in_addr  ipi_addr;
diff --git a/include/linux/in6.h b/include/linux/in6.h
index 718bf21c575..bd55c6e46b2 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -27,10 +27,8 @@
  *      IPv6 address structure
  */
 
-struct in6_addr
-{
-        union 
-        {
+struct in6_addr {
+        union {
                 __u8            u6_addr8[16];
                 __be16          u6_addr16[8];
                 __be32          u6_addr32[4];
@@ -75,8 +73,7 @@ struct ipv6_mreq {
 
 #define ipv6mr_acaddr   ipv6mr_multiaddr
 
-struct in6_flowlabel_req
-{
+struct in6_flowlabel_req {
         struct in6_addr flr_dst;
         __be32  flr_label;
         __u8    flr_action;
@@ -113,7 +110,7 @@ struct in6_flowlabel_req
 #define IPV6_FLOWINFO_FLOWLABEL         0x000fffff
 #define IPV6_FLOWINFO_PRIORITY          0x0ff00000
 
-/* These defintions are obsolete */
+/* These definitions are obsolete */
 #define IPV6_PRIORITY_UNCHARACTERIZED   0x0000
 #define IPV6_PRIORITY_FILLER            0x0100
 #define IPV6_PRIORITY_UNATTENDED        0x0200
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index ad27c7da879..699e85c01a4 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -10,15 +10,13 @@
 #include <linux/timer.h>
 #include <linux/sysctl.h>
 
-struct ipv4_devconf
-{
+struct ipv4_devconf {
         void    *sysctl;
         int     data[__NET_IPV4_CONF_MAX - 1];
         DECLARE_BITMAP(state, __NET_IPV4_CONF_MAX - 1);
 };
 
-struct in_device
-{
+struct in_device {
         struct net_device       *dev;
         atomic_t                refcnt;
         int                     dead;
@@ -85,6 +83,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
 #define IN_DEV_RPFILTER(in_dev)         IN_DEV_MAXCONF((in_dev), RP_FILTER)
 #define IN_DEV_SOURCE_ROUTE(in_dev)     IN_DEV_ANDCONF((in_dev), \
                                                        ACCEPT_SOURCE_ROUTE)
+#define IN_DEV_ACCEPT_LOCAL(in_dev)     IN_DEV_ORCONF((in_dev), ACCEPT_LOCAL)
 #define IN_DEV_BOOTP_RELAY(in_dev)      IN_DEV_ANDCONF((in_dev), BOOTP_RELAY)
 
 #define IN_DEV_LOG_MARTIANS(in_dev)     IN_DEV_ORCONF((in_dev), LOG_MARTIANS)
@@ -110,8 +109,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
 #define IN_DEV_ARP_IGNORE(in_dev)       IN_DEV_MAXCONF((in_dev), ARP_IGNORE)
 #define IN_DEV_ARP_NOTIFY(in_dev)       IN_DEV_MAXCONF((in_dev), ARP_NOTIFY)
 
-struct in_ifaddr
-{
+struct in_ifaddr {
         struct in_ifaddr        *ifa_next;
         struct in_device        *ifa_dev;
         struct rcu_head         rcu_head;
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 21a6f5d9af2..8d10aa7fd4c 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -83,16 +83,12 @@ extern struct group_info init_groups;
 #define INIT_IDS
 #endif
 
-#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
 /*
  * Because of the reduced scope of CAP_SETPCAP when filesystem
  * capabilities are in effect, it is safe to allow CAP_SETPCAP to
  * be available in the default configuration.
  */
 # define CAP_INIT_BSET  CAP_FULL_SET
-#else
-# define CAP_INIT_BSET  CAP_INIT_EFF_SET
-#endif
 
 #ifdef CONFIG_TREE_PREEMPT_RCU
 #define INIT_TASK_RCU_PREEMPT(tsk)                                      \
diff --git a/include/linux/input-polldev.h b/include/linux/input-polldev.h
index 597a0077b3c..5e3dddf8f56 100644
--- a/include/linux/input-polldev.h
+++ b/include/linux/input-polldev.h
@@ -14,12 +14,19 @@
 
 /**
  * struct input_polled_dev - simple polled input device
- * @private: private driver data
- * @flush: driver-supplied method that flushes device's state upon
- *      opening (optional)
+ * @private: private driver data.
+ * @open: driver-supplied method that prepares device for polling
+ *      (enabled the device and maybe flushes device state).
+ * @close: driver-supplied method that is called when device is no
+ *      longer being polled. Used to put device into low power mode.
  * @poll: driver-supplied method that polls the device and posts
  *      input events (mandatory).
- * @poll_interval: specifies how often the poll() method shoudl be called.
+ * @poll_interval: specifies how often the poll() method should be called.
+ *      Defaults to 500 msec unless overriden when registering the device.
+ * @poll_interval_max: specifies upper bound for the poll interval.
+ *      Defaults to the initial value of @poll_interval.
+ * @poll_interval_min: specifies lower bound for the poll interval.
+ *      Defaults to 0.
  * @input: input device structire associated with the polled device.
  *      Must be properly initialized by the driver (id, name, phys, bits).
  *
@@ -30,11 +37,16 @@
 struct input_polled_dev {
         void *private;
 
-        void (*flush)(struct input_polled_dev *dev);
+        void (*open)(struct input_polled_dev *dev);
+        void (*close)(struct input_polled_dev *dev);
         void (*poll)(struct input_polled_dev *dev);
         unsigned int poll_interval; /* msec */
+        unsigned int poll_interval_max; /* msec */
+        unsigned int poll_interval_min; /* msec */
 
         struct input_dev *input;
+
+/* private: */
         struct delayed_work work;
 };
 
diff --git a/include/linux/input.h b/include/linux/input.h
index 0ccfc30cd40..7be8a6537b5 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -595,6 +595,8 @@ struct input_absinfo {
 #define KEY_NUMERIC_STAR        0x20a
 #define KEY_NUMERIC_POUND       0x20b
 
+#define KEY_CAMERA_FOCUS        0x210
+
 /* We avoid low common keys in module aliases so they don't get huge. */
 #define KEY_MIN_INTERESTING     KEY_MUTE
 #define KEY_MAX                 0x2ff
@@ -677,6 +679,9 @@ struct input_absinfo {
 #define SW_LINEOUT_INSERT       0x06  /* set = inserted */
 #define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
 #define SW_VIDEOOUT_INSERT      0x08  /* set = inserted */
+#define SW_CAMERA_LENS_COVER    0x09  /* set = lens covered */
+#define SW_KEYPAD_SLIDE         0x0a  /* set = keypad slide out */
+#define SW_FRONT_PROXIMITY      0x0b  /* set = front proximity sensor active */
 #define SW_MAX                  0x0f
 #define SW_CNT                  (SW_MAX+1)
 
@@ -890,7 +895,7 @@ struct ff_periodic_effect {
         struct ff_envelope envelope;
 
         __u32 custom_len;
-        __s16 *custom_data;
+        __s16 __user *custom_data;
 };
 
 /**
@@ -1016,9 +1021,12 @@ struct ff_effect {
  * @keycodesize: size of elements in keycode table
  * @keycode: map of scancodes to keycodes for this device
  * @setkeycode: optional method to alter current keymap, used to implement
- *      sparse keymaps. If not supplied default mechanism will be used
+ *      sparse keymaps. If not supplied default mechanism will be used.
+ *      The method is being called while holding event_lock and thus must
+ *      not sleep
  * @getkeycode: optional method to retrieve current keymap. If not supplied
- *      default mechanism will be used
+ *      default mechanism will be used. The method is being called while
+ *      holding event_lock and thus must not sleep
  * @ff: force feedback structure associated with the device if device
  *      supports force feedback effects
  * @repeat_key: stores key code of the last key pressed; used to implement
@@ -1035,6 +1043,7 @@ struct ff_effect {
  * @absmin: minimum values for events coming from absolute axes
  * @absfuzz: describes noisiness for axes
  * @absflat: size of the center flat position (used by joydev)
+ * @absres: resolution used for events coming form absolute axes
  * @open: this method is called when the very first user calls
  *      input_open_device(). The driver must prepare the device
  *      to start generating events (start polling thread,
@@ -1289,6 +1298,9 @@ void input_unregister_device(struct input_dev *);
 int __must_check input_register_handler(struct input_handler *);
 void input_unregister_handler(struct input_handler *);
 
+int input_handler_for_each_handle(struct input_handler *, void *data,
+                                  int (*fn)(struct input_handle *, void *));
+
 int input_register_handle(struct input_handle *);
 void input_unregister_handle(struct input_handle *);
 
@@ -1377,6 +1389,10 @@ extern struct class input_class;
  * methods; erase() is optional. set_gain() and set_autocenter() need
  * only be implemented if driver sets up FF_GAIN and FF_AUTOCENTER
  * bits.
+ *
+ * Note that playback(), set_gain() and set_autocenter() are called with
+ * dev->event_lock spinlock held and interrupts off and thus may not
+ * sleep.
  */
 struct ff_device {
         int (*upload)(struct input_dev *dev, struct ff_effect *effect,
diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h
index b3cd42d50e1..3bd018baae2 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
+ * @active_low: gpio polarity
+ * @wakeup: controls whether the device should be set up as wakeup
+ *      source
  *
  * This structure represents platform-specific data that use used by
  * matrix_keypad driver to perform proper initialization.
diff --git a/include/linux/input/sh_keysc.h b/include/linux/input/sh_keysc.h
new file mode 100644
index 00000000000..c211b5cf08e
--- /dev/null
+++ b/include/linux/input/sh_keysc.h
@@ -0,0 +1,14 @@
+#ifndef __SH_KEYSC_H__
+#define __SH_KEYSC_H__
+
+#define SH_KEYSC_MAXKEYS 30
+
+struct sh_keysc_info {
+        enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3 } mode;
+        int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */
+        int delay;
+        int kycr2_delay;
+        int keycodes[SH_KEYSC_MAXKEYS];
+};
+
+#endif /* __SH_KEYSC_H__ */
diff --git a/include/linux/input/sparse-keymap.h b/include/linux/input/sparse-keymap.h
new file mode 100644
index 00000000000..52db62064c6
--- /dev/null
+++ b/include/linux/input/sparse-keymap.h
@@ -0,0 +1,62 @@
+#ifndef _SPARSE_KEYMAP_H
+#define _SPARSE_KEYMAP_H
+
+/*
+ * Copyright (c) 2009 Dmitry Torokhov
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#define KE_END          0       /* Indicates end of keymap */
+#define KE_KEY          1       /* Ordinary key/button */
+#define KE_SW           2       /* Switch (predetermined value) */
+#define KE_VSW          3       /* Switch (value supplied at runtime) */
+#define KE_IGNORE       4       /* Known entry that should be ignored */
+#define KE_LAST         KE_IGNORE
+
+/**
+ * struct key_entry - keymap entry for use in sparse keymap
+ * @type: Type of the key entry (KE_KEY, KE_SW, KE_VSW, KE_END);
+ *      drivers are allowed to extend the list with their own
+ *      private definitions.
+ * @code: Device-specific data identifying the button/switch
+ * @keycode: KEY_* code assigned to a key/button
+ * @sw.code: SW_* code assigned to a switch
+ * @sw.value: Value that should be sent in an input even when KE_SW
+ *      switch is toggled. KE_VSW switches ignore this field and
+ *      expect driver to supply value for the event.
+ *
+ * This structure defines an entry in a sparse keymap used by some
+ * input devices for which traditional table-based approach is not
+ * suitable.
+ */
+struct key_entry {
+        int type;               /* See KE_* above */
+        u32 code;
+        union {
+                u16 keycode;            /* For KE_KEY */
+                struct {                /* For KE_SW, KE_VSW */
+                        u8 code;
+                        u8 value;       /* For KE_SW, ignored by KE_VSW */
+                } sw;
+        };
+};
+
+struct key_entry *sparse_keymap_entry_from_scancode(struct input_dev *dev,
+                                                    unsigned int code);
+struct key_entry *sparse_keymap_entry_from_keycode(struct input_dev *dev,
+                                                   unsigned int code);
+int sparse_keymap_setup(struct input_dev *dev,
+                        const struct key_entry *keymap,
+                        int (*setup)(struct input_dev *, struct key_entry *));
+void sparse_keymap_free(struct input_dev *dev);
+
+void sparse_keymap_report_entry(struct input_dev *dev, const struct key_entry *ke,
+                                unsigned int value, bool autorelease);
+
+bool sparse_keymap_report_event(struct input_dev *dev, unsigned int code,
+                                unsigned int value, bool autorelease);
+
+#endif /* _SPARSE_KEYMAP_H */
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 7ca72b74eec..75f3f00ac1e 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -603,12 +603,6 @@ static inline void init_irq_proc(void)
 }
 #endif
 
-#if defined(CONFIG_GENERIC_HARDIRQS) && defined(CONFIG_DEBUG_SHIRQ)
-extern void debug_poll_all_shared_irqs(void);
-#else
-static inline void debug_poll_all_shared_irqs(void) { }
-#endif
-
 struct seq_file;
 int show_interrupts(struct seq_file *p, void *v);
 
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 4da4a75c3f1..a6323599630 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -40,16 +40,11 @@ struct cfq_io_context {
         struct io_context *ioc;
 
         unsigned long last_end_request;
-        sector_t last_request_pos;
 
         unsigned long ttime_total;
         unsigned long ttime_samples;
         unsigned long ttime_mean;
 
-        unsigned int seek_samples;
-        u64 seek_total;
-        sector_t seek_mean;
-
         struct list_head queue_list;
         struct hlist_node cic_list;
 
@@ -73,6 +68,10 @@ struct io_context {
         unsigned short ioprio;
         unsigned short ioprio_changed;
 
+#ifdef CONFIG_BLK_CGROUP
+        unsigned short cgroup_changed;
+#endif
+
         /*
          * For request batching
          */
@@ -99,14 +98,15 @@ static inline struct io_context *ioc_task_link(struct io_context *ioc)
         return NULL;
 }
 
+struct task_struct;
 #ifdef CONFIG_BLOCK
 int put_io_context(struct io_context *ioc);
-void exit_io_context(void);
+void exit_io_context(struct task_struct *task);
 struct io_context *get_io_context(gfp_t gfp_flags, int node);
 struct io_context *alloc_io_context(gfp_t gfp_flags, int node);
 void copy_io_context(struct io_context **pdst, struct io_context **psrc);
 #else
-static inline void exit_io_context(void)
+static inline void exit_io_context(struct task_struct *task)
 {
 }
 
diff --git a/include/linux/ip_vs.h b/include/linux/ip_vs.h
index 148265e63e8..dfc17036284 100644
--- a/include/linux/ip_vs.h
+++ b/include/linux/ip_vs.h
@@ -127,8 +127,7 @@ struct ip_vs_dest_user {
 /*
  *      IPVS statistics object (for user space)
  */
-struct ip_vs_stats_user
-{
+struct ip_vs_stats_user {
         __u32                   conns;          /* connections scheduled */
         __u32                   inpkts;         /* incoming packets */
         __u32                   outpkts;        /* outgoing packets */
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index c662efa6828..e0cc9a7db2b 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -167,6 +167,7 @@ struct ipv6_devconf {
 #endif
         __s32           disable_ipv6;
         __s32           accept_dad;
+        __s32           force_tllao;
         void            *sysctl;
 };
 
@@ -207,6 +208,7 @@ enum {
         DEVCONF_MC_FORWARDING,
         DEVCONF_DISABLE_IPV6,
         DEVCONF_ACCEPT_DAD,
+        DEVCONF_FORCE_TLLAO,
         DEVCONF_MAX
 };
 
@@ -503,7 +505,7 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk)
 
 #define INET6_MATCH(__sk, __net, __hash, __saddr, __daddr, __ports, __dif)\
         (((__sk)->sk_hash == (__hash)) && sock_net((__sk)) == (__net)   && \
-         ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))      && \
+         ((*((__portpair *)&(inet_sk(__sk)->inet_dport))) == (__ports)) && \
          ((__sk)->sk_family             == AF_INET6)            && \
          ipv6_addr_equal(&inet6_sk(__sk)->daddr, (__saddr))     && \
          ipv6_addr_equal(&inet6_sk(__sk)->rcv_saddr, (__daddr)) && \
diff --git a/include/linux/irq.h b/include/linux/irq.h
index ae9653dbcd7..a287cfc0b1a 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -282,7 +282,7 @@ extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action);
 
 /*
  * Built-in IRQ handlers for various IRQ types,
- * callable via desc->chip->handle_irq()
+ * callable via desc->handle_irq()
  */
 extern void handle_level_irq(unsigned int irq, struct irq_desc *desc);
 extern void handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc);
diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index b02a3f1d46a..006bf45eae3 100644
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -124,6 +124,6 @@
         typecheck(unsigned long, flags);        \
         raw_irqs_disabled_flags(flags);         \
 })
-#endif          /* CONFIG_X86 */
+#endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */
 
 #endif
diff --git a/include/linux/isdn_ppp.h b/include/linux/isdn_ppp.h
index 4c218ee7587..8687a7dc063 100644
--- a/include/linux/isdn_ppp.h
+++ b/include/linux/isdn_ppp.h
@@ -157,7 +157,7 @@ typedef struct {
 
 typedef struct {
   int mp_mrru;                        /* unused                             */
-  struct sk_buff_head frags;    /* fragments sl list */
+  struct sk_buff * frags;       /* fragments sl list -- use skb->next */
   long frames;                  /* number of frames in the frame list */
   unsigned int seq;             /* last processed packet seq #: any packets
                                  * with smaller seq # will be dropped
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index 1a9cf78bfce..6811f4bfc6e 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -307,6 +307,7 @@ extern clock_t jiffies_to_clock_t(long x);
 extern unsigned long clock_t_to_jiffies(unsigned long x);
 extern u64 jiffies_64_to_clock_t(u64 x);
 extern u64 nsec_to_clock_t(u64 x);
+extern unsigned long nsecs_to_jiffies(u64 n);
 
 #define TIMESTAMP_SIZE  30
 
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index f4e3184fa05..3fa4c590cf1 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -15,7 +15,6 @@
 #include <linux/bitops.h>
 #include <linux/log2.h>
 #include <linux/typecheck.h>
-#include <linux/ratelimit.h>
 #include <linux/dynamic_debug.h>
 #include <asm/byteorder.h>
 #include <asm/bug.h>
@@ -241,8 +240,8 @@ asmlinkage int vprintk(const char *fmt, va_list args)
 asmlinkage int printk(const char * fmt, ...)
         __attribute__ ((format (printf, 1, 2))) __cold;
 
-extern struct ratelimit_state printk_ratelimit_state;
-extern int printk_ratelimit(void);
+extern int __printk_ratelimit(const char *func);
+#define printk_ratelimit() __printk_ratelimit(__func__)
 extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
                                    unsigned int interval_msec);
 
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index 348fa8874b5..c059044bc6d 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -25,6 +25,7 @@ struct cpu_usage_stat {
         cputime64_t iowait;
         cputime64_t steal;
         cputime64_t guest;
+        cputime64_t guest_nice;
 };
 
 struct kernel_stat {
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 3a46b7b7abb..1b672f74a32 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -296,6 +296,8 @@ void recycle_rp_inst(struct kretprobe_instance *ri, struct hlist_head *head);
 int disable_kprobe(struct kprobe *kp);
 int enable_kprobe(struct kprobe *kp);
 
+void dump_kprobe(struct kprobe *kp);
+
 #else /* !CONFIG_KPROBES: */
 
 static inline int kprobes_built_in(void)
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index f8f8900fc5e..2d241da0723 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -14,12 +14,76 @@
 
 #define KVM_API_VERSION 12
 
-/* for KVM_TRACE_ENABLE, deprecated */
+/* *** Deprecated interfaces *** */
+
+#define KVM_TRC_SHIFT           16
+
+#define KVM_TRC_ENTRYEXIT       (1 << KVM_TRC_SHIFT)
+#define KVM_TRC_HANDLER         (1 << (KVM_TRC_SHIFT + 1))
+
+#define KVM_TRC_VMENTRY         (KVM_TRC_ENTRYEXIT + 0x01)
+#define KVM_TRC_VMEXIT          (KVM_TRC_ENTRYEXIT + 0x02)
+#define KVM_TRC_PAGE_FAULT      (KVM_TRC_HANDLER + 0x01)
+
+#define KVM_TRC_HEAD_SIZE       12
+#define KVM_TRC_CYCLE_SIZE      8
+#define KVM_TRC_EXTRA_MAX       7
+
+#define KVM_TRC_INJ_VIRQ         (KVM_TRC_HANDLER + 0x02)
+#define KVM_TRC_REDELIVER_EVT    (KVM_TRC_HANDLER + 0x03)
+#define KVM_TRC_PEND_INTR        (KVM_TRC_HANDLER + 0x04)
+#define KVM_TRC_IO_READ          (KVM_TRC_HANDLER + 0x05)
+#define KVM_TRC_IO_WRITE         (KVM_TRC_HANDLER + 0x06)
+#define KVM_TRC_CR_READ          (KVM_TRC_HANDLER + 0x07)
+#define KVM_TRC_CR_WRITE         (KVM_TRC_HANDLER + 0x08)
+#define KVM_TRC_DR_READ          (KVM_TRC_HANDLER + 0x09)
+#define KVM_TRC_DR_WRITE         (KVM_TRC_HANDLER + 0x0A)
+#define KVM_TRC_MSR_READ         (KVM_TRC_HANDLER + 0x0B)
+#define KVM_TRC_MSR_WRITE        (KVM_TRC_HANDLER + 0x0C)
+#define KVM_TRC_CPUID            (KVM_TRC_HANDLER + 0x0D)
+#define KVM_TRC_INTR             (KVM_TRC_HANDLER + 0x0E)
+#define KVM_TRC_NMI              (KVM_TRC_HANDLER + 0x0F)
+#define KVM_TRC_VMMCALL          (KVM_TRC_HANDLER + 0x10)
+#define KVM_TRC_HLT              (KVM_TRC_HANDLER + 0x11)
+#define KVM_TRC_CLTS             (KVM_TRC_HANDLER + 0x12)
+#define KVM_TRC_LMSW             (KVM_TRC_HANDLER + 0x13)
+#define KVM_TRC_APIC_ACCESS      (KVM_TRC_HANDLER + 0x14)
+#define KVM_TRC_TDP_FAULT        (KVM_TRC_HANDLER + 0x15)
+#define KVM_TRC_GTLB_WRITE       (KVM_TRC_HANDLER + 0x16)
+#define KVM_TRC_STLB_WRITE       (KVM_TRC_HANDLER + 0x17)
+#define KVM_TRC_STLB_INVAL       (KVM_TRC_HANDLER + 0x18)
+#define KVM_TRC_PPC_INSTR        (KVM_TRC_HANDLER + 0x19)
+
 struct kvm_user_trace_setup {
-        __u32 buf_size; /* sub_buffer size of each per-cpu */
-        __u32 buf_nr; /* the number of sub_buffers of each per-cpu */
+        __u32 buf_size;
+        __u32 buf_nr;
+};
+
+#define __KVM_DEPRECATED_MAIN_W_0x06 \
+        _IOW(KVMIO, 0x06, struct kvm_user_trace_setup)
+#define __KVM_DEPRECATED_MAIN_0x07 _IO(KVMIO, 0x07)
+#define __KVM_DEPRECATED_MAIN_0x08 _IO(KVMIO, 0x08)
+
+#define __KVM_DEPRECATED_VM_R_0x70 _IOR(KVMIO, 0x70, struct kvm_assigned_irq)
+
+struct kvm_breakpoint {
+        __u32 enabled;
+        __u32 padding;
+        __u64 address;
+};
+
+struct kvm_debug_guest {
+        __u32 enabled;
+        __u32 pad;
+        struct kvm_breakpoint breakpoints[4];
+        __u32 singlestep;
 };
 
+#define __KVM_DEPRECATED_VCPU_W_0x87 _IOW(KVMIO, 0x87, struct kvm_debug_guest)
+
+/* *** End of deprecated interfaces *** */
+
+
 /* for KVM_CREATE_MEMORY_REGION */
 struct kvm_memory_region {
         __u32 slot;
@@ -99,6 +163,7 @@ struct kvm_pit_config {
 
 /* For KVM_EXIT_INTERNAL_ERROR */
 #define KVM_INTERNAL_ERROR_EMULATION 1
+#define KVM_INTERNAL_ERROR_SIMUL_EX 2
 
 /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */
 struct kvm_run {
@@ -116,6 +181,11 @@ struct kvm_run {
         __u64 cr8;
         __u64 apic_base;
 
+#ifdef __KVM_S390
+        /* the processor status word for s390 */
+        __u64 psw_mask; /* psw upper half */
+        __u64 psw_addr; /* psw lower half */
+#endif
         union {
                 /* KVM_EXIT_UNKNOWN */
                 struct {
@@ -167,8 +237,6 @@ struct kvm_run {
                 /* KVM_EXIT_S390_SIEIC */
                 struct {
                         __u8 icptcode;
-                        __u64 mask; /* psw upper half */
-                        __u64 addr; /* psw lower half */
                         __u16 ipa;
                         __u32 ipb;
                 } s390_sieic;
@@ -187,6 +255,9 @@ struct kvm_run {
                 } dcr;
                 struct {
                         __u32 suberror;
+                        /* Available with KVM_CAP_INTERNAL_ERROR_DATA: */
+                        __u32 ndata;
+                        __u64 data[16];
                 } internal;
                 /* Fix the size of the union. */
                 char padding[256];
@@ -329,24 +400,6 @@ struct kvm_ioeventfd {
         __u8  pad[36];
 };
 
-#define KVM_TRC_SHIFT           16
-/*
- * kvm trace categories
- */
-#define KVM_TRC_ENTRYEXIT       (1 << KVM_TRC_SHIFT)
-#define KVM_TRC_HANDLER         (1 << (KVM_TRC_SHIFT + 1)) /* only 12 bits */
-
-/*
- * kvm trace action
- */
-#define KVM_TRC_VMENTRY         (KVM_TRC_ENTRYEXIT + 0x01)
-#define KVM_TRC_VMEXIT          (KVM_TRC_ENTRYEXIT + 0x02)
-#define KVM_TRC_PAGE_FAULT      (KVM_TRC_HANDLER + 0x01)
-
-#define KVM_TRC_HEAD_SIZE       12
-#define KVM_TRC_CYCLE_SIZE      8
-#define KVM_TRC_EXTRA_MAX       7
-
 #define KVMIO 0xAE
 
 /*
@@ -367,12 +420,10 @@ struct kvm_ioeventfd {
  */
 #define KVM_GET_VCPU_MMAP_SIZE    _IO(KVMIO,   0x04) /* in bytes */
 #define KVM_GET_SUPPORTED_CPUID   _IOWR(KVMIO, 0x05, struct kvm_cpuid2)
-/*
- * ioctls for kvm trace
- */
-#define KVM_TRACE_ENABLE          _IOW(KVMIO, 0x06, struct kvm_user_trace_setup)
-#define KVM_TRACE_PAUSE           _IO(KVMIO,  0x07)
-#define KVM_TRACE_DISABLE         _IO(KVMIO,  0x08)
+#define KVM_TRACE_ENABLE          __KVM_DEPRECATED_MAIN_W_0x06
+#define KVM_TRACE_PAUSE           __KVM_DEPRECATED_MAIN_0x07
+#define KVM_TRACE_DISABLE         __KVM_DEPRECATED_MAIN_0x08
+
 /*
  * Extension capability list.
  */
@@ -436,6 +487,15 @@ struct kvm_ioeventfd {
 #endif
 #define KVM_CAP_IOEVENTFD 36
 #define KVM_CAP_SET_IDENTITY_MAP_ADDR 37
+#ifdef __KVM_HAVE_XEN_HVM
+#define KVM_CAP_XEN_HVM 38
+#endif
+#define KVM_CAP_ADJUST_CLOCK 39
+#define KVM_CAP_INTERNAL_ERROR_DATA 40
+#ifdef __KVM_HAVE_VCPU_EVENTS
+#define KVM_CAP_VCPU_EVENTS 41
+#endif
+#define KVM_CAP_S390_PSW 42
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
@@ -488,6 +548,18 @@ struct kvm_x86_mce {
 };
 #endif
 
+#ifdef KVM_CAP_XEN_HVM
+struct kvm_xen_hvm_config {
+        __u32 flags;
+        __u32 msr;
+        __u64 blob_addr_32;
+        __u64 blob_addr_64;
+        __u8 blob_size_32;
+        __u8 blob_size_64;
+        __u8 pad2[30];
+};
+#endif
+
 #define KVM_IRQFD_FLAG_DEASSIGN (1 << 0)
 
 struct kvm_irqfd {
@@ -497,55 +569,66 @@ struct kvm_irqfd {
         __u8  pad[20];
 };
 
+struct kvm_clock_data {
+        __u64 clock;
+        __u32 flags;
+        __u32 pad[9];
+};
+
 /*
  * ioctls for VM fds
  */
-#define KVM_SET_MEMORY_REGION     _IOW(KVMIO, 0x40, struct kvm_memory_region)
+#define KVM_SET_MEMORY_REGION     _IOW(KVMIO,  0x40, struct kvm_memory_region)
 /*
  * KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns
  * a vcpu fd.
  */
-#define KVM_CREATE_VCPU           _IO(KVMIO,  0x41)
-#define KVM_GET_DIRTY_LOG         _IOW(KVMIO, 0x42, struct kvm_dirty_log)
-#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)
-#define KVM_SET_USER_MEMORY_REGION _IOW(KVMIO, 0x46,\
+#define KVM_CREATE_VCPU           _IO(KVMIO,   0x41)
+#define KVM_GET_DIRTY_LOG         _IOW(KVMIO,  0x42, struct kvm_dirty_log)
+#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)
+#define KVM_SET_USER_MEMORY_REGION _IOW(KVMIO, 0x46, \
                                         struct kvm_userspace_memory_region)
-#define KVM_SET_TSS_ADDR          _IO(KVMIO, 0x47)
-#define KVM_SET_IDENTITY_MAP_ADDR _IOW(KVMIO, 0x48, __u64)
+#define KVM_SET_TSS_ADDR          _IO(KVMIO,   0x47)
+#define KVM_SET_IDENTITY_MAP_ADDR _IOW(KVMIO,  0x48, __u64)
 /* Device model IOC */
-#define KVM_CREATE_IRQCHIP        _IO(KVMIO,  0x60)
-#define KVM_IRQ_LINE              _IOW(KVMIO, 0x61, struct kvm_irq_level)
-#define KVM_GET_IRQCHIP           _IOWR(KVMIO, 0x62, struct kvm_irqchip)
-#define KVM_SET_IRQCHIP           _IOR(KVMIO,  0x63, struct kvm_irqchip)
-#define KVM_CREATE_PIT            _IO(KVMIO,  0x64)
-#define KVM_GET_PIT               _IOWR(KVMIO, 0x65, struct kvm_pit_state)
-#define KVM_SET_PIT               _IOR(KVMIO,  0x66, struct kvm_pit_state)
-#define KVM_IRQ_LINE_STATUS       _IOWR(KVMIO, 0x67, struct kvm_irq_level)
+#define KVM_CREATE_IRQCHIP        _IO(KVMIO,   0x60)
+#define KVM_IRQ_LINE              _IOW(KVMIO,  0x61, struct kvm_irq_level)
+#define KVM_GET_IRQCHIP           _IOWR(KVMIO, 0x62, struct kvm_irqchip)
+#define KVM_SET_IRQCHIP           _IOR(KVMIO,  0x63, struct kvm_irqchip)
+#define KVM_CREATE_PIT            _IO(KVMIO,   0x64)
+#define KVM_GET_PIT               _IOWR(KVMIO, 0x65, struct kvm_pit_state)
+#define KVM_SET_PIT               _IOR(KVMIO,  0x66, struct kvm_pit_state)
+#define KVM_IRQ_LINE_STATUS       _IOWR(KVMIO, 0x67, struct kvm_irq_level)
 #define KVM_REGISTER_COALESCED_MMIO \
                         _IOW(KVMIO,  0x67, struct kvm_coalesced_mmio_zone)
 #define KVM_UNREGISTER_COALESCED_MMIO \
                         _IOW(KVMIO,  0x68, struct kvm_coalesced_mmio_zone)
-#define KVM_ASSIGN_PCI_DEVICE _IOR(KVMIO, 0x69, \
-                                   struct kvm_assigned_pci_dev)
-#define KVM_SET_GSI_ROUTING       _IOW(KVMIO, 0x6a, struct kvm_irq_routing)
+#define KVM_ASSIGN_PCI_DEVICE     _IOR(KVMIO,  0x69, \
+                                       struct kvm_assigned_pci_dev)
+#define KVM_SET_GSI_ROUTING       _IOW(KVMIO,  0x6a, struct kvm_irq_routing)
 /* deprecated, replaced by KVM_ASSIGN_DEV_IRQ */
-#define KVM_ASSIGN_IRQ _IOR(KVMIO, 0x70, \
-                            struct kvm_assigned_irq)
-#define KVM_ASSIGN_DEV_IRQ        _IOW(KVMIO, 0x70, struct kvm_assigned_irq)
-#define KVM_REINJECT_CONTROL      _IO(KVMIO, 0x71)
-#define KVM_DEASSIGN_PCI_DEVICE _IOW(KVMIO, 0x72, \
-                                     struct kvm_assigned_pci_dev)
-#define KVM_ASSIGN_SET_MSIX_NR \
-                        _IOW(KVMIO, 0x73, struct kvm_assigned_msix_nr)
-#define KVM_ASSIGN_SET_MSIX_ENTRY \
-                        _IOW(KVMIO, 0x74, struct kvm_assigned_msix_entry)
-#define KVM_DEASSIGN_DEV_IRQ       _IOW(KVMIO, 0x75, struct kvm_assigned_irq)
-#define KVM_IRQFD                  _IOW(KVMIO, 0x76, struct kvm_irqfd)
-#define KVM_CREATE_PIT2            _IOW(KVMIO, 0x77, struct kvm_pit_config)
-#define KVM_SET_BOOT_CPU_ID        _IO(KVMIO, 0x78)
-#define KVM_IOEVENTFD             _IOW(KVMIO, 0x79, struct kvm_ioeventfd)
+#define KVM_ASSIGN_IRQ            __KVM_DEPRECATED_VM_R_0x70
+#define KVM_ASSIGN_DEV_IRQ        _IOW(KVMIO,  0x70, struct kvm_assigned_irq)
+#define KVM_REINJECT_CONTROL      _IO(KVMIO,   0x71)
+#define KVM_DEASSIGN_PCI_DEVICE   _IOW(KVMIO,  0x72, \
+                                       struct kvm_assigned_pci_dev)
+#define KVM_ASSIGN_SET_MSIX_NR    _IOW(KVMIO,  0x73, \
+                                       struct kvm_assigned_msix_nr)
+#define KVM_ASSIGN_SET_MSIX_ENTRY _IOW(KVMIO,  0x74, \
+                                       struct kvm_assigned_msix_entry)
+#define KVM_DEASSIGN_DEV_IRQ      _IOW(KVMIO,  0x75, struct kvm_assigned_irq)
+#define KVM_IRQFD                 _IOW(KVMIO,  0x76, struct kvm_irqfd)
+#define KVM_CREATE_PIT2           _IOW(KVMIO,  0x77, struct kvm_pit_config)
+#define KVM_SET_BOOT_CPU_ID       _IO(KVMIO,   0x78)
+#define KVM_IOEVENTFD             _IOW(KVMIO,  0x79, struct kvm_ioeventfd)
+#define KVM_XEN_HVM_CONFIG        _IOW(KVMIO,  0x7a, struct kvm_xen_hvm_config)
+#define KVM_SET_CLOCK             _IOW(KVMIO,  0x7b, struct kvm_clock_data)
+#define KVM_GET_CLOCK             _IOR(KVMIO,  0x7c, struct kvm_clock_data)
+/* Available with KVM_CAP_PIT_STATE2 */
+#define KVM_GET_PIT2              _IOR(KVMIO,  0x9f, struct kvm_pit_state2)
+#define KVM_SET_PIT2              _IOW(KVMIO,  0xa0, struct kvm_pit_state2)
 
 /*
  * ioctls for vcpu fds
@@ -558,7 +641,7 @@ struct kvm_irqfd {
 #define KVM_TRANSLATE             _IOWR(KVMIO, 0x85, struct kvm_translation)
 #define KVM_INTERRUPT             _IOW(KVMIO,  0x86, struct kvm_interrupt)
 /* KVM_DEBUG_GUEST is no longer supported, use KVM_SET_GUEST_DEBUG instead */
-#define KVM_DEBUG_GUEST           __KVM_DEPRECATED_DEBUG_GUEST
+#define KVM_DEBUG_GUEST           __KVM_DEPRECATED_VCPU_W_0x87
 #define KVM_GET_MSRS              _IOWR(KVMIO, 0x88, struct kvm_msrs)
 #define KVM_SET_MSRS              _IOW(KVMIO,  0x89, struct kvm_msrs)
 #define KVM_SET_CPUID             _IOW(KVMIO,  0x8a, struct kvm_cpuid)
@@ -570,7 +653,7 @@ struct kvm_irqfd {
 #define KVM_SET_CPUID2            _IOW(KVMIO,  0x90, struct kvm_cpuid2)
 #define KVM_GET_CPUID2            _IOWR(KVMIO, 0x91, struct kvm_cpuid2)
 /* Available with KVM_CAP_VAPIC */
-#define KVM_TPR_ACCESS_REPORTING  _IOWR(KVMIO,  0x92, struct kvm_tpr_access_ctl)
+#define KVM_TPR_ACCESS_REPORTING  _IOWR(KVMIO, 0x92, struct kvm_tpr_access_ctl)
 /* Available with KVM_CAP_VAPIC */
 #define KVM_SET_VAPIC_ADDR        _IOW(KVMIO,  0x93, struct kvm_vapic_addr)
 /* valid for virtual machine (for floating interrupt)_and_ vcpu */
@@ -582,66 +665,23 @@ struct kvm_irqfd {
 /* initial ipl psw for s390 */
 #define KVM_S390_SET_INITIAL_PSW  _IOW(KVMIO,  0x96, struct kvm_s390_psw)
 /* initial reset for s390 */
-#define KVM_S390_INITIAL_RESET    _IO(KVMIO,  0x97)
+#define KVM_S390_INITIAL_RESET    _IO(KVMIO,   0x97)
 #define KVM_GET_MP_STATE          _IOR(KVMIO,  0x98, struct kvm_mp_state)
 #define KVM_SET_MP_STATE          _IOW(KVMIO,  0x99, struct kvm_mp_state)
 /* Available with KVM_CAP_NMI */
-#define KVM_NMI                   _IO(KVMIO,  0x9a)
+#define KVM_NMI                   _IO(KVMIO,   0x9a)
 /* Available with KVM_CAP_SET_GUEST_DEBUG */
 #define KVM_SET_GUEST_DEBUG       _IOW(KVMIO,  0x9b, struct kvm_guest_debug)
 /* MCE for x86 */
 #define KVM_X86_SETUP_MCE         _IOW(KVMIO,  0x9c, __u64)
 #define KVM_X86_GET_MCE_CAP_SUPPORTED _IOR(KVMIO,  0x9d, __u64)
 #define KVM_X86_SET_MCE           _IOW(KVMIO,  0x9e, struct kvm_x86_mce)
-
-/*
- * Deprecated interfaces
- */
-struct kvm_breakpoint {
-        __u32 enabled;
-        __u32 padding;
-        __u64 address;
-};
-
-struct kvm_debug_guest {
-        __u32 enabled;
-        __u32 pad;
-        struct kvm_breakpoint breakpoints[4];
-        __u32 singlestep;
-};
-
-#define __KVM_DEPRECATED_DEBUG_GUEST _IOW(KVMIO,  0x87, struct kvm_debug_guest)
-
+/* IA64 stack access */
 #define KVM_IA64_VCPU_GET_STACK   _IOR(KVMIO,  0x9a, void *)
 #define KVM_IA64_VCPU_SET_STACK   _IOW(KVMIO,  0x9b, void *)
-
-#define KVM_GET_PIT2   _IOR(KVMIO,   0x9f, struct kvm_pit_state2)
-#define KVM_SET_PIT2   _IOW(KVMIO,   0xa0, struct kvm_pit_state2)
-
-#define KVM_TRC_INJ_VIRQ         (KVM_TRC_HANDLER + 0x02)
-#define KVM_TRC_REDELIVER_EVT    (KVM_TRC_HANDLER + 0x03)
-#define KVM_TRC_PEND_INTR        (KVM_TRC_HANDLER + 0x04)
-#define KVM_TRC_IO_READ          (KVM_TRC_HANDLER + 0x05)
-#define KVM_TRC_IO_WRITE         (KVM_TRC_HANDLER + 0x06)
-#define KVM_TRC_CR_READ          (KVM_TRC_HANDLER + 0x07)
-#define KVM_TRC_CR_WRITE         (KVM_TRC_HANDLER + 0x08)
-#define KVM_TRC_DR_READ          (KVM_TRC_HANDLER + 0x09)
-#define KVM_TRC_DR_WRITE         (KVM_TRC_HANDLER + 0x0A)
-#define KVM_TRC_MSR_READ         (KVM_TRC_HANDLER + 0x0B)
-#define KVM_TRC_MSR_WRITE        (KVM_TRC_HANDLER + 0x0C)
-#define KVM_TRC_CPUID            (KVM_TRC_HANDLER + 0x0D)
-#define KVM_TRC_INTR             (KVM_TRC_HANDLER + 0x0E)
-#define KVM_TRC_NMI              (KVM_TRC_HANDLER + 0x0F)
-#define KVM_TRC_VMMCALL          (KVM_TRC_HANDLER + 0x10)
-#define KVM_TRC_HLT              (KVM_TRC_HANDLER + 0x11)
-#define KVM_TRC_CLTS             (KVM_TRC_HANDLER + 0x12)
-#define KVM_TRC_LMSW             (KVM_TRC_HANDLER + 0x13)
-#define KVM_TRC_APIC_ACCESS      (KVM_TRC_HANDLER + 0x14)
-#define KVM_TRC_TDP_FAULT        (KVM_TRC_HANDLER + 0x15)
-#define KVM_TRC_GTLB_WRITE       (KVM_TRC_HANDLER + 0x16)
-#define KVM_TRC_STLB_WRITE       (KVM_TRC_HANDLER + 0x17)
-#define KVM_TRC_STLB_INVAL       (KVM_TRC_HANDLER + 0x18)
-#define KVM_TRC_PPC_INSTR        (KVM_TRC_HANDLER + 0x19)
+/* Available with KVM_CAP_VCPU_EVENTS */
+#define KVM_GET_VCPU_EVENTS       _IOR(KVMIO,  0x9f, struct kvm_vcpu_events)
+#define KVM_SET_VCPU_EVENTS       _IOW(KVMIO,  0xa0, struct kvm_vcpu_events)
 
 #define KVM_DEV_ASSIGN_ENABLE_IOMMU     (1 << 0)
 
@@ -696,4 +736,4 @@ struct kvm_assigned_msix_entry {
         __u16 padding[3];
 };
 
-#endif
+#endif /* __LINUX_KVM_H */
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index b7bbb5ddd7a..bd5a616d937 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -120,7 +120,7 @@ struct kvm_kernel_irq_routing_entry {
         u32 gsi;
         u32 type;
         int (*set)(struct kvm_kernel_irq_routing_entry *e,
-                    struct kvm *kvm, int level);
+                   struct kvm *kvm, int irq_source_id, int level);
         union {
                 struct {
                         unsigned irqchip;
@@ -128,9 +128,28 @@ struct kvm_kernel_irq_routing_entry {
                 } irqchip;
                 struct msi_msg msi;
         };
-        struct list_head link;
+        struct hlist_node link;
+};
+
+#ifdef __KVM_HAVE_IOAPIC
+
+struct kvm_irq_routing_table {
+        int chip[KVM_NR_IRQCHIPS][KVM_IOAPIC_NUM_PINS];
+        struct kvm_kernel_irq_routing_entry *rt_entries;
+        u32 nr_rt_entries;
+        /*
+         * Array indexed by gsi. Each entry contains list of irq chips
+         * the gsi is connected to.
+         */
+        struct hlist_head map[0];
 };
 
+#else
+
+struct kvm_irq_routing_table {};
+
+#endif
+
 struct kvm {
         spinlock_t mmu_lock;
         spinlock_t requests_lock;
@@ -166,8 +185,9 @@ struct kvm {
 
         struct mutex irq_lock;
 #ifdef CONFIG_HAVE_KVM_IRQCHIP
-        struct list_head irq_routing; /* of kvm_kernel_irq_routing_entry */
+        struct kvm_irq_routing_table *irq_routing;
         struct hlist_head mask_notifier_list;
+        struct hlist_head irq_ack_notifier_list;
 #endif
 
 #ifdef KVM_ARCH_WANT_MMU_NOTIFIER
@@ -266,6 +286,7 @@ int kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);
 void mark_page_dirty(struct kvm *kvm, gfn_t gfn);
 
 void kvm_vcpu_block(struct kvm_vcpu *vcpu);
+void kvm_vcpu_on_spin(struct kvm_vcpu *vcpu);
 void kvm_resched(struct kvm_vcpu *vcpu);
 void kvm_load_guest_fpu(struct kvm_vcpu *vcpu);
 void kvm_put_guest_fpu(struct kvm_vcpu *vcpu);
@@ -325,7 +346,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu);
 void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu);
 
 int kvm_arch_vcpu_reset(struct kvm_vcpu *vcpu);
-void kvm_arch_hardware_enable(void *garbage);
+int kvm_arch_hardware_enable(void *garbage);
 void kvm_arch_hardware_disable(void *garbage);
 int kvm_arch_hardware_setup(void);
 void kvm_arch_hardware_unsetup(void);
@@ -390,7 +411,12 @@ 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);
 
-int kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
+#ifdef __KVM_HAVE_IOAPIC
+void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic,
+                                   union kvm_ioapic_redirect_entry *entry,
+                                   unsigned long *deliver_bitmask);
+#endif
+int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level);
 void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);
 void kvm_register_irq_ack_notifier(struct kvm *kvm,
                                    struct kvm_irq_ack_notifier *kian);
@@ -552,4 +578,21 @@ static inline bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu)
         return vcpu->kvm->bsp_vcpu_id == vcpu->vcpu_id;
 }
 #endif
+
+#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT
+
+long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
+                                  unsigned long arg);
+
+#else
+
+static inline long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl,
+                                                unsigned long arg)
+{
+        return -ENOTTY;
+}
+
 #endif
+
+#endif
+
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 87698640c09..6a9c4ddd3d9 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -365,7 +365,7 @@ enum {
         /* This should match the actual table size of
          * ata_eh_cmd_timeout_table in libata-eh.c.
          */
-        ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 5,
+        ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 6,
 
         /* Horkage types. May be set by libata or controller on drives
            (some horkage may be drive/controller pair dependant */
@@ -595,6 +595,7 @@ struct ata_device {
         unsigned int            horkage;        /* List of broken features */
         unsigned long           flags;          /* ATA_DFLAG_xxx */
         struct scsi_device      *sdev;          /* attached SCSI device */
+        void                    *private_data;
 #ifdef CONFIG_ATA_ACPI
         acpi_handle             acpi_handle;
         union acpi_object       *gtf_cache;
@@ -1023,7 +1024,7 @@ extern int ata_std_bios_param(struct scsi_device *sdev,
 extern int ata_scsi_slave_config(struct scsi_device *sdev);
 extern void ata_scsi_slave_destroy(struct scsi_device *sdev);
 extern int ata_scsi_change_queue_depth(struct scsi_device *sdev,
-                                       int queue_depth);
+                                       int queue_depth, int reason);
 extern struct ata_device *ata_dev_pair(struct ata_device *adev);
 extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev);
 
diff --git a/include/linux/lru_cache.h b/include/linux/lru_cache.h
new file mode 100644
index 00000000000..3a2b2d9b047
--- /dev/null
+++ b/include/linux/lru_cache.h
@@ -0,0 +1,294 @@
+/*
+   lru_cache.c
+
+   This file is part of DRBD by Philipp Reisner and Lars Ellenberg.
+
+   Copyright (C) 2003-2008, LINBIT Information Technologies GmbH.
+   Copyright (C) 2003-2008, Philipp Reisner <philipp.reisner@linbit.com>.
+   Copyright (C) 2003-2008, Lars Ellenberg <lars.ellenberg@linbit.com>.
+
+   drbd 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, or (at your option)
+   any later version.
+
+   drbd 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 drbd; see the file COPYING.  If not, write to
+   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ */
+
+#ifndef LRU_CACHE_H
+#define LRU_CACHE_H
+
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/bitops.h>
+#include <linux/string.h> /* for memset */
+#include <linux/seq_file.h>
+
+/*
+This header file (and its .c file; kernel-doc of functions see there)
+  define a helper framework to easily keep track of index:label associations,
+  and changes to an "active set" of objects, as well as pending transactions,
+  to persistently record those changes.
+
+  We use an LRU policy if it is necessary to "cool down" a region currently in
+  the active set before we can "heat" a previously unused region.
+
+  Because of this later property, it is called "lru_cache".
+  As it actually Tracks Objects in an Active SeT, we could also call it
+  toast (incidentally that is what may happen to the data on the
+  backend storage uppon next resync, if we don't get it right).
+
+What for?
+
+We replicate IO (more or less synchronously) to local and remote disk.
+
+For crash recovery after replication node failure,
+  we need to resync all regions that have been target of in-flight WRITE IO
+  (in use, or "hot", regions), as we don't know wether or not those WRITEs have
+  made it to stable storage.
+
+  To avoid a "full resync", we need to persistently track these regions.
+
+  This is known as "write intent log", and can be implemented as on-disk
+  (coarse or fine grained) bitmap, or other meta data.
+
+  To avoid the overhead of frequent extra writes to this meta data area,
+  usually the condition is softened to regions that _may_ have been target of
+  in-flight WRITE IO, e.g. by only lazily clearing the on-disk write-intent
+  bitmap, trading frequency of meta data transactions against amount of
+  (possibly unneccessary) resync traffic.
+
+  If we set a hard limit on the area that may be "hot" at any given time, we
+  limit the amount of resync traffic needed for crash recovery.
+
+For recovery after replication link failure,
+  we need to resync all blocks that have been changed on the other replica
+  in the mean time, or, if both replica have been changed independently [*],
+  all blocks that have been changed on either replica in the mean time.
+  [*] usually as a result of a cluster split-brain and insufficient protection.
+      but there are valid use cases to do this on purpose.
+
+  Tracking those blocks can be implemented as "dirty bitmap".
+  Having it fine-grained reduces the amount of resync traffic.
+  It should also be persistent, to allow for reboots (or crashes)
+  while the replication link is down.
+
+There are various possible implementations for persistently storing
+write intent log information, three of which are mentioned here.
+
+"Chunk dirtying"
+  The on-disk "dirty bitmap" may be re-used as "write-intent" bitmap as well.
+  To reduce the frequency of bitmap updates for write-intent log purposes,
+  one could dirty "chunks" (of some size) at a time of the (fine grained)
+  on-disk bitmap, while keeping the in-memory "dirty" bitmap as clean as
+  possible, flushing it to disk again when a previously "hot" (and on-disk
+  dirtied as full chunk) area "cools down" again (no IO in flight anymore,
+  and none expected in the near future either).
+
+"Explicit (coarse) write intent bitmap"
+  An other implementation could chose a (probably coarse) explicit bitmap,
+  for write-intent log purposes, additionally to the fine grained dirty bitmap.
+
+"Activity log"
+  Yet an other implementation may keep track of the hot regions, by starting
+  with an empty set, and writing down a journal of region numbers that have
+  become "hot", or have "cooled down" again.
+
+  To be able to use a ring buffer for this journal of changes to the active
+  set, we not only record the actual changes to that set, but also record the
+  not changing members of the set in a round robin fashion. To do so, we use a
+  fixed (but configurable) number of slots which we can identify by index, and
+  associate region numbers (labels) with these indices.
+  For each transaction recording a change to the active set, we record the
+  change itself (index: -old_label, +new_label), and which index is associated
+  with which label (index: current_label) within a certain sliding window that
+  is moved further over the available indices with each such transaction.
+
+  Thus, for crash recovery, if the ringbuffer is sufficiently large, we can
+  accurately reconstruct the active set.
+
+  Sufficiently large depends only on maximum number of active objects, and the
+  size of the sliding window recording "index: current_label" associations within
+  each transaction.
+
+  This is what we call the "activity log".
+
+  Currently we need one activity log transaction per single label change, which
+  does not give much benefit over the "dirty chunks of bitmap" approach, other
+  than potentially less seeks.
+
+  We plan to change the transaction format to support multiple changes per
+  transaction, which then would reduce several (disjoint, "random") updates to
+  the bitmap into one transaction to the activity log ring buffer.
+*/
+
+/* this defines an element in a tracked set
+ * .colision is for hash table lookup.
+ * When we process a new IO request, we know its sector, thus can deduce the
+ * region number (label) easily.  To do the label -> object lookup without a
+ * full list walk, we use a simple hash table.
+ *
+ * .list is on one of three lists:
+ *  in_use: currently in use (refcnt > 0, lc_number != LC_FREE)
+ *     lru: unused but ready to be reused or recycled
+ *          (ts_refcnt == 0, lc_number != LC_FREE),
+ *    free: unused but ready to be recycled
+ *          (ts_refcnt == 0, lc_number == LC_FREE),
+ *
+ * an element is said to be "in the active set",
+ * if either on "in_use" or "lru", i.e. lc_number != LC_FREE.
+ *
+ * DRBD currently (May 2009) only uses 61 elements on the resync lru_cache
+ * (total memory usage 2 pages), and up to 3833 elements on the act_log
+ * lru_cache, totalling ~215 kB for 64bit architechture, ~53 pages.
+ *
+ * We usually do not actually free these objects again, but only "recycle"
+ * them, as the change "index: -old_label, +LC_FREE" would need a transaction
+ * as well.  Which also means that using a kmem_cache to allocate the objects
+ * from wastes some resources.
+ * But it avoids high order page allocations in kmalloc.
+ */
+struct lc_element {
+        struct hlist_node colision;
+        struct list_head list;           /* LRU list or free list */
+        unsigned refcnt;
+        /* back "pointer" into ts_cache->element[index],
+         * for paranoia, and for "ts_element_to_index" */
+        unsigned lc_index;
+        /* if we want to track a larger set of objects,
+         * it needs to become arch independend u64 */
+        unsigned lc_number;
+
+        /* special label when on free list */
+#define LC_FREE (~0U)
+};
+
+struct lru_cache {
+        /* the least recently used item is kept at lru->prev */
+        struct list_head lru;
+        struct list_head free;
+        struct list_head in_use;
+
+        /* the pre-created kmem cache to allocate the objects from */
+        struct kmem_cache *lc_cache;
+
+        /* size of tracked objects, used to memset(,0,) them in lc_reset */
+        size_t element_size;
+        /* offset of struct lc_element member in the tracked object */
+        size_t element_off;
+
+        /* number of elements (indices) */
+        unsigned int  nr_elements;
+        /* Arbitrary limit on maximum tracked objects. Practical limit is much
+         * lower due to allocation failures, probably. For typical use cases,
+         * nr_elements should be a few thousand at most.
+         * This also limits the maximum value of ts_element.ts_index, allowing the
+         * 8 high bits of .ts_index to be overloaded with flags in the future. */
+#define LC_MAX_ACTIVE   (1<<24)
+
+        /* statistics */
+        unsigned used; /* number of lelements currently on in_use list */
+        unsigned long hits, misses, starving, dirty, changed;
+
+        /* see below: flag-bits for lru_cache */
+        unsigned long flags;
+
+        /* when changing the label of an index element */
+        unsigned int  new_number;
+
+        /* for paranoia when changing the label of an index element */
+        struct lc_element *changing_element;
+
+        void  *lc_private;
+        const char *name;
+
+        /* nr_elements there */
+        struct hlist_head *lc_slot;
+        struct lc_element **lc_element;
+};
+
+
+/* flag-bits for lru_cache */
+enum {
+        /* debugging aid, to catch concurrent access early.
+         * user needs to guarantee exclusive access by proper locking! */
+        __LC_PARANOIA,
+        /* if we need to change the set, but currently there is a changing
+         * transaction pending, we are "dirty", and must deferr further
+         * changing requests */
+        __LC_DIRTY,
+        /* if we need to change the set, but currently there is no free nor
+         * unused element available, we are "starving", and must not give out
+         * further references, to guarantee that eventually some refcnt will
+         * drop to zero and we will be able to make progress again, changing
+         * the set, writing the transaction.
+         * if the statistics say we are frequently starving,
+         * nr_elements is too small. */
+        __LC_STARVING,
+};
+#define LC_PARANOIA (1<<__LC_PARANOIA)
+#define LC_DIRTY    (1<<__LC_DIRTY)
+#define LC_STARVING (1<<__LC_STARVING)
+
+extern struct lru_cache *lc_create(const char *name, struct kmem_cache *cache,
+                unsigned e_count, size_t e_size, size_t e_off);
+extern void lc_reset(struct lru_cache *lc);
+extern void lc_destroy(struct lru_cache *lc);
+extern void lc_set(struct lru_cache *lc, unsigned int enr, int index);
+extern void lc_del(struct lru_cache *lc, struct lc_element *element);
+
+extern struct lc_element *lc_try_get(struct lru_cache *lc, unsigned int enr);
+extern struct lc_element *lc_find(struct lru_cache *lc, unsigned int enr);
+extern struct lc_element *lc_get(struct lru_cache *lc, unsigned int enr);
+extern unsigned int lc_put(struct lru_cache *lc, struct lc_element *e);
+extern void lc_changed(struct lru_cache *lc, struct lc_element *e);
+
+struct seq_file;
+extern size_t lc_seq_printf_stats(struct seq_file *seq, struct lru_cache *lc);
+
+extern void lc_seq_dump_details(struct seq_file *seq, struct lru_cache *lc, char *utext,
+                                void (*detail) (struct seq_file *, struct lc_element *));
+
+/**
+ * lc_try_lock - can be used to stop lc_get() from changing the tracked set
+ * @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.
+ */
+static inline int lc_try_lock(struct lru_cache *lc)
+{
+        return !test_and_set_bit(__LC_DIRTY, &lc->flags);
+}
+
+/**
+ * lc_unlock - unlock @lc, allow lc_get() to change the set again
+ * @lc: the lru cache to operate on
+ */
+static inline void lc_unlock(struct lru_cache *lc)
+{
+        clear_bit(__LC_DIRTY, &lc->flags);
+        smp_mb__after_clear_bit();
+}
+
+static inline int lc_is_used(struct lru_cache *lc, unsigned int enr)
+{
+        struct lc_element *e = lc_find(lc, enr);
+        return e && e->refcnt;
+}
+
+#define lc_entry(ptr, type, member) \
+        container_of(ptr, type, member)
+
+extern struct lc_element *lc_element_by_index(struct lru_cache *lc, unsigned i);
+extern unsigned int lc_index_of(struct lru_cache *lc, struct lc_element *e);
+
+#endif
diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
index 190c3785487..f78f83d7663 100644
--- a/include/linux/lsm_audit.h
+++ b/include/linux/lsm_audit.h
@@ -26,14 +26,15 @@
 
 /* Auxiliary data to use in generating the audit record. */
 struct common_audit_data {
-        char    type;
-#define LSM_AUDIT_DATA_FS      1
-#define LSM_AUDIT_DATA_NET     2
-#define LSM_AUDIT_DATA_CAP     3
-#define LSM_AUDIT_DATA_IPC     4
-#define LSM_AUDIT_DATA_TASK    5
-#define LSM_AUDIT_DATA_KEY     6
-#define LSM_AUDIT_NO_AUDIT     7
+        char type;
+#define LSM_AUDIT_DATA_FS       1
+#define LSM_AUDIT_DATA_NET      2
+#define LSM_AUDIT_DATA_CAP      3
+#define LSM_AUDIT_DATA_IPC      4
+#define LSM_AUDIT_DATA_TASK     5
+#define LSM_AUDIT_DATA_KEY      6
+#define LSM_AUDIT_NO_AUDIT      7
+#define LSM_AUDIT_DATA_KMOD     8
         struct task_struct *tsk;
         union   {
                 struct {
@@ -66,6 +67,7 @@ struct common_audit_data {
                         char *key_desc;
                 } key_struct;
 #endif
+                char *kmod_name;
         } u;
         /* this union contains LSM specific data */
         union {
diff --git a/include/linux/mfd/da903x.h b/include/linux/mfd/da903x.h
index c63b65c9442..0aa3a1a49ee 100644
--- a/include/linux/mfd/da903x.h
+++ b/include/linux/mfd/da903x.h
@@ -96,6 +96,10 @@ struct da9034_touch_pdata {
         int     y_inverted;
 };
 
+struct da9034_backlight_pdata {
+        int     output_current; /* output current of WLED, from 0-31 (in mA) */
+};
+
 /* DA9030 battery charger data */
 struct power_supply_info;
 
diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h
index e5124ceea76..3402042ddc3 100644
--- a/include/linux/mfd/ezx-pcap.h
+++ b/include/linux/mfd/ezx-pcap.h
@@ -45,7 +45,7 @@ void pcap_set_ts_bits(struct pcap_chip *, u32);
 #define PCAP_CLEAR_INTERRUPT_REGISTER   0x01ffffff
 #define PCAP_MASK_ALL_INTERRUPT         0x01ffffff
 
-/* registers acessible by both pcap ports */
+/* registers accessible by both pcap ports */
 #define PCAP_REG_ISR            0x0     /* Interrupt Status */
 #define PCAP_REG_MSR            0x1     /* Interrupt Mask */
 #define PCAP_REG_PSTAT          0x2     /* Processor Status */
@@ -67,7 +67,7 @@ void pcap_set_ts_bits(struct pcap_chip *, u32);
 #define PCAP_REG_VENDOR_TEST1   0x1e
 #define PCAP_REG_VENDOR_TEST2   0x1f
 
-/* registers acessible by pcap port 1 only (a1200, e2 & e6) */
+/* registers accessible by pcap port 1 only (a1200, e2 & e6) */
 #define PCAP_REG_INT_SEL        0x3     /* Interrupt Select */
 #define PCAP_REG_SWCTRL         0x4     /* Switching Regulator Control */
 #define PCAP_REG_VREG1          0x5     /* Regulator Bank 1 Control */
diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h
new file mode 100644
index 00000000000..ee496708e38
--- /dev/null
+++ b/include/linux/mfd/mcp.h
@@ -0,0 +1,69 @@
+/*
+ *  linux/drivers/mfd/mcp.h
+ *
+ *  Copyright (C) 2001 Russell King, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ */
+#ifndef MCP_H
+#define MCP_H
+
+#include <mach/dma.h>
+
+struct mcp_ops;
+
+struct mcp {
+        struct module   *owner;
+        struct mcp_ops  *ops;
+        spinlock_t      lock;
+        int             use_count;
+        unsigned int    sclk_rate;
+        unsigned int    rw_timeout;
+        dma_device_t    dma_audio_rd;
+        dma_device_t    dma_audio_wr;
+        dma_device_t    dma_telco_rd;
+        dma_device_t    dma_telco_wr;
+        struct device   attached_device;
+        int             gpio_base;
+};
+
+struct mcp_ops {
+        void            (*set_telecom_divisor)(struct mcp *, unsigned int);
+        void            (*set_audio_divisor)(struct mcp *, unsigned int);
+        void            (*reg_write)(struct mcp *, unsigned int, unsigned int);
+        unsigned int    (*reg_read)(struct mcp *, unsigned int);
+        void            (*enable)(struct mcp *);
+        void            (*disable)(struct mcp *);
+};
+
+void mcp_set_telecom_divisor(struct mcp *, unsigned int);
+void mcp_set_audio_divisor(struct mcp *, unsigned int);
+void mcp_reg_write(struct mcp *, unsigned int, unsigned int);
+unsigned int mcp_reg_read(struct mcp *, unsigned int);
+void mcp_enable(struct mcp *);
+void mcp_disable(struct mcp *);
+#define mcp_get_sclk_rate(mcp)  ((mcp)->sclk_rate)
+
+struct mcp *mcp_host_alloc(struct device *, size_t);
+int mcp_host_register(struct mcp *);
+void mcp_host_unregister(struct mcp *);
+
+struct mcp_driver {
+        struct device_driver drv;
+        int (*probe)(struct mcp *);
+        void (*remove)(struct mcp *);
+        int (*suspend)(struct mcp *, pm_message_t);
+        int (*resume)(struct mcp *);
+};
+
+int mcp_driver_register(struct mcp_driver *);
+void mcp_driver_unregister(struct mcp_driver *);
+
+#define mcp_get_drvdata(mcp)    dev_get_drvdata(&(mcp)->attached_device)
+#define mcp_set_drvdata(mcp,d)  dev_set_drvdata(&(mcp)->attached_device, d)
+
+#define mcp_priv(mcp)           ((void *)((mcp)+1))
+
+#endif
diff --git a/include/linux/mfd/sh_mobile_sdhi.h b/include/linux/mfd/sh_mobile_sdhi.h
new file mode 100644
index 00000000000..3bcd7163485
--- /dev/null
+++ b/include/linux/mfd/sh_mobile_sdhi.h
@@ -0,0 +1,8 @@
+#ifndef __SH_MOBILE_SDHI_H__
+#define __SH_MOBILE_SDHI_H__
+
+struct sh_mobile_sdhi_info {
+        void (*set_pwr)(struct platform_device *pdev, int state);
+};
+
+#endif /* __SH_MOBILE_SDHI_H__ */
diff --git a/include/linux/mfd/twl4030-codec.h b/include/linux/mfd/twl4030-codec.h
new file mode 100644
index 00000000000..2ec317c68e5
--- /dev/null
+++ b/include/linux/mfd/twl4030-codec.h
@@ -0,0 +1,272 @@
+/*
+ * MFD driver for twl4030 codec submodule
+ *
+ * Author:      Peter Ujfalusi <peter.ujfalusi@nokia.com>
+ *
+ * Copyright:   (C) 2009 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * 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 __TWL4030_CODEC_H__
+#define __TWL4030_CODEC_H__
+
+/* Codec registers */
+#define TWL4030_REG_CODEC_MODE          0x01
+#define TWL4030_REG_OPTION              0x02
+#define TWL4030_REG_UNKNOWN             0x03
+#define TWL4030_REG_MICBIAS_CTL         0x04
+#define TWL4030_REG_ANAMICL             0x05
+#define TWL4030_REG_ANAMICR             0x06
+#define TWL4030_REG_AVADC_CTL           0x07
+#define TWL4030_REG_ADCMICSEL           0x08
+#define TWL4030_REG_DIGMIXING           0x09
+#define TWL4030_REG_ATXL1PGA            0x0A
+#define TWL4030_REG_ATXR1PGA            0x0B
+#define TWL4030_REG_AVTXL2PGA           0x0C
+#define TWL4030_REG_AVTXR2PGA           0x0D
+#define TWL4030_REG_AUDIO_IF            0x0E
+#define TWL4030_REG_VOICE_IF            0x0F
+#define TWL4030_REG_ARXR1PGA            0x10
+#define TWL4030_REG_ARXL1PGA            0x11
+#define TWL4030_REG_ARXR2PGA            0x12
+#define TWL4030_REG_ARXL2PGA            0x13
+#define TWL4030_REG_VRXPGA              0x14
+#define TWL4030_REG_VSTPGA              0x15
+#define TWL4030_REG_VRX2ARXPGA          0x16
+#define TWL4030_REG_AVDAC_CTL           0x17
+#define TWL4030_REG_ARX2VTXPGA          0x18
+#define TWL4030_REG_ARXL1_APGA_CTL      0x19
+#define TWL4030_REG_ARXR1_APGA_CTL      0x1A
+#define TWL4030_REG_ARXL2_APGA_CTL      0x1B
+#define TWL4030_REG_ARXR2_APGA_CTL      0x1C
+#define TWL4030_REG_ATX2ARXPGA          0x1D
+#define TWL4030_REG_BT_IF               0x1E
+#define TWL4030_REG_BTPGA               0x1F
+#define TWL4030_REG_BTSTPGA             0x20
+#define TWL4030_REG_EAR_CTL             0x21
+#define TWL4030_REG_HS_SEL              0x22
+#define TWL4030_REG_HS_GAIN_SET         0x23
+#define TWL4030_REG_HS_POPN_SET         0x24
+#define TWL4030_REG_PREDL_CTL           0x25
+#define TWL4030_REG_PREDR_CTL           0x26
+#define TWL4030_REG_PRECKL_CTL          0x27
+#define TWL4030_REG_PRECKR_CTL          0x28
+#define TWL4030_REG_HFL_CTL             0x29
+#define TWL4030_REG_HFR_CTL             0x2A
+#define TWL4030_REG_ALC_CTL             0x2B
+#define TWL4030_REG_ALC_SET1            0x2C
+#define TWL4030_REG_ALC_SET2            0x2D
+#define TWL4030_REG_BOOST_CTL           0x2E
+#define TWL4030_REG_SOFTVOL_CTL         0x2F
+#define TWL4030_REG_DTMF_FREQSEL        0x30
+#define TWL4030_REG_DTMF_TONEXT1H       0x31
+#define TWL4030_REG_DTMF_TONEXT1L       0x32
+#define TWL4030_REG_DTMF_TONEXT2H       0x33
+#define TWL4030_REG_DTMF_TONEXT2L       0x34
+#define TWL4030_REG_DTMF_TONOFF         0x35
+#define TWL4030_REG_DTMF_WANONOFF       0x36
+#define TWL4030_REG_I2S_RX_SCRAMBLE_H   0x37
+#define TWL4030_REG_I2S_RX_SCRAMBLE_M   0x38
+#define TWL4030_REG_I2S_RX_SCRAMBLE_L   0x39
+#define TWL4030_REG_APLL_CTL            0x3A
+#define TWL4030_REG_DTMF_CTL            0x3B
+#define TWL4030_REG_DTMF_PGA_CTL2       0x3C
+#define TWL4030_REG_DTMF_PGA_CTL1       0x3D
+#define TWL4030_REG_MISC_SET_1          0x3E
+#define TWL4030_REG_PCMBTMUX            0x3F
+#define TWL4030_REG_RX_PATH_SEL         0x43
+#define TWL4030_REG_VDL_APGA_CTL        0x44
+#define TWL4030_REG_VIBRA_CTL           0x45
+#define TWL4030_REG_VIBRA_SET           0x46
+#define TWL4030_REG_VIBRA_PWM_SET       0x47
+#define TWL4030_REG_ANAMIC_GAIN         0x48
+#define TWL4030_REG_MISC_SET_2          0x49
+
+/* Bitfield Definitions */
+
+/* TWL4030_CODEC_MODE (0x01) Fields */
+#define TWL4030_APLL_RATE               0xF0
+#define TWL4030_APLL_RATE_8000          0x00
+#define TWL4030_APLL_RATE_11025         0x10
+#define TWL4030_APLL_RATE_12000         0x20
+#define TWL4030_APLL_RATE_16000         0x40
+#define TWL4030_APLL_RATE_22050         0x50
+#define TWL4030_APLL_RATE_24000         0x60
+#define TWL4030_APLL_RATE_32000         0x80
+#define TWL4030_APLL_RATE_44100         0x90
+#define TWL4030_APLL_RATE_48000         0xA0
+#define TWL4030_APLL_RATE_96000         0xE0
+#define TWL4030_SEL_16K                 0x08
+#define TWL4030_CODECPDZ                0x02
+#define TWL4030_OPT_MODE                0x01
+#define TWL4030_OPTION_1                (1 << 0)
+#define TWL4030_OPTION_2                (0 << 0)
+
+/* TWL4030_OPTION (0x02) Fields */
+#define TWL4030_ATXL1_EN                (1 << 0)
+#define TWL4030_ATXR1_EN                (1 << 1)
+#define TWL4030_ATXL2_VTXL_EN           (1 << 2)
+#define TWL4030_ATXR2_VTXR_EN           (1 << 3)
+#define TWL4030_ARXL1_VRX_EN            (1 << 4)
+#define TWL4030_ARXR1_EN                (1 << 5)
+#define TWL4030_ARXL2_EN                (1 << 6)
+#define TWL4030_ARXR2_EN                (1 << 7)
+
+/* TWL4030_REG_MICBIAS_CTL (0x04) Fields */
+#define TWL4030_MICBIAS2_CTL            0x40
+#define TWL4030_MICBIAS1_CTL            0x20
+#define TWL4030_HSMICBIAS_EN            0x04
+#define TWL4030_MICBIAS2_EN             0x02
+#define TWL4030_MICBIAS1_EN             0x01
+
+/* ANAMICL (0x05) Fields */
+#define TWL4030_CNCL_OFFSET_START       0x80
+#define TWL4030_OFFSET_CNCL_SEL         0x60
+#define TWL4030_OFFSET_CNCL_SEL_ARX1    0x00
+#define TWL4030_OFFSET_CNCL_SEL_ARX2    0x20
+#define TWL4030_OFFSET_CNCL_SEL_VRX     0x40
+#define TWL4030_OFFSET_CNCL_SEL_ALL     0x60
+#define TWL4030_MICAMPL_EN              0x10
+#define TWL4030_CKMIC_EN                0x08
+#define TWL4030_AUXL_EN                 0x04
+#define TWL4030_HSMIC_EN                0x02
+#define TWL4030_MAINMIC_EN              0x01
+
+/* ANAMICR (0x06) Fields */
+#define TWL4030_MICAMPR_EN              0x10
+#define TWL4030_AUXR_EN                 0x04
+#define TWL4030_SUBMIC_EN               0x01
+
+/* AVADC_CTL (0x07) Fields */
+#define TWL4030_ADCL_EN                 0x08
+#define TWL4030_AVADC_CLK_PRIORITY      0x04
+#define TWL4030_ADCR_EN                 0x02
+
+/* TWL4030_REG_ADCMICSEL (0x08) Fields */
+#define TWL4030_DIGMIC1_EN              0x08
+#define TWL4030_TX2IN_SEL               0x04
+#define TWL4030_DIGMIC0_EN              0x02
+#define TWL4030_TX1IN_SEL               0x01
+
+/* AUDIO_IF (0x0E) Fields */
+#define TWL4030_AIF_SLAVE_EN            0x80
+#define TWL4030_DATA_WIDTH              0x60
+#define TWL4030_DATA_WIDTH_16S_16W      0x00
+#define TWL4030_DATA_WIDTH_32S_16W      0x40
+#define TWL4030_DATA_WIDTH_32S_24W      0x60
+#define TWL4030_AIF_FORMAT              0x18
+#define TWL4030_AIF_FORMAT_CODEC        0x00
+#define TWL4030_AIF_FORMAT_LEFT         0x08
+#define TWL4030_AIF_FORMAT_RIGHT        0x10
+#define TWL4030_AIF_FORMAT_TDM          0x18
+#define TWL4030_AIF_TRI_EN              0x04
+#define TWL4030_CLK256FS_EN             0x02
+#define TWL4030_AIF_EN                  0x01
+
+/* VOICE_IF (0x0F) Fields */
+#define TWL4030_VIF_SLAVE_EN            0x80
+#define TWL4030_VIF_DIN_EN              0x40
+#define TWL4030_VIF_DOUT_EN             0x20
+#define TWL4030_VIF_SWAP                0x10
+#define TWL4030_VIF_FORMAT              0x08
+#define TWL4030_VIF_TRI_EN              0x04
+#define TWL4030_VIF_SUB_EN              0x02
+#define TWL4030_VIF_EN                  0x01
+
+/* EAR_CTL (0x21) */
+#define TWL4030_EAR_GAIN                0x30
+
+/* HS_GAIN_SET (0x23) Fields */
+#define TWL4030_HSR_GAIN                0x0C
+#define TWL4030_HSR_GAIN_PWR_DOWN       0x00
+#define TWL4030_HSR_GAIN_PLUS_6DB       0x04
+#define TWL4030_HSR_GAIN_0DB            0x08
+#define TWL4030_HSR_GAIN_MINUS_6DB      0x0C
+#define TWL4030_HSL_GAIN                0x03
+#define TWL4030_HSL_GAIN_PWR_DOWN       0x00
+#define TWL4030_HSL_GAIN_PLUS_6DB       0x01
+#define TWL4030_HSL_GAIN_0DB            0x02
+#define TWL4030_HSL_GAIN_MINUS_6DB      0x03
+
+/* HS_POPN_SET (0x24) Fields */
+#define TWL4030_VMID_EN                 0x40
+#define TWL4030_EXTMUTE                 0x20
+#define TWL4030_RAMP_DELAY              0x1C
+#define TWL4030_RAMP_DELAY_20MS         0x00
+#define TWL4030_RAMP_DELAY_40MS         0x04
+#define TWL4030_RAMP_DELAY_81MS         0x08
+#define TWL4030_RAMP_DELAY_161MS        0x0C
+#define TWL4030_RAMP_DELAY_323MS        0x10
+#define TWL4030_RAMP_DELAY_645MS        0x14
+#define TWL4030_RAMP_DELAY_1291MS       0x18
+#define TWL4030_RAMP_DELAY_2581MS       0x1C
+#define TWL4030_RAMP_EN                 0x02
+
+/* PREDL_CTL (0x25) */
+#define TWL4030_PREDL_GAIN              0x30
+
+/* PREDR_CTL (0x26) */
+#define TWL4030_PREDR_GAIN              0x30
+
+/* PRECKL_CTL (0x27) */
+#define TWL4030_PRECKL_GAIN             0x30
+
+/* PRECKR_CTL (0x28) */
+#define TWL4030_PRECKR_GAIN             0x30
+
+/* HFL_CTL (0x29, 0x2A) Fields */
+#define TWL4030_HF_CTL_HB_EN            0x04
+#define TWL4030_HF_CTL_LOOP_EN          0x08
+#define TWL4030_HF_CTL_RAMP_EN          0x10
+#define TWL4030_HF_CTL_REF_EN           0x20
+
+/* APLL_CTL (0x3A) Fields */
+#define TWL4030_APLL_EN                 0x10
+#define TWL4030_APLL_INFREQ             0x0F
+#define TWL4030_APLL_INFREQ_19200KHZ    0x05
+#define TWL4030_APLL_INFREQ_26000KHZ    0x06
+#define TWL4030_APLL_INFREQ_38400KHZ    0x0F
+
+/* REG_MISC_SET_1 (0x3E) Fields */
+#define TWL4030_CLK64_EN                0x80
+#define TWL4030_SCRAMBLE_EN             0x40
+#define TWL4030_FMLOOP_EN               0x20
+#define TWL4030_SMOOTH_ANAVOL_EN        0x02
+#define TWL4030_DIGMIC_LR_SWAP_EN       0x01
+
+/* VIBRA_CTL (0x45) */
+#define TWL4030_VIBRA_EN                0x01
+#define TWL4030_VIBRA_DIR               0x02
+#define TWL4030_VIBRA_AUDIO_SEL_L1      (0x00 << 2)
+#define TWL4030_VIBRA_AUDIO_SEL_R1      (0x01 << 2)
+#define TWL4030_VIBRA_AUDIO_SEL_L2      (0x02 << 2)
+#define TWL4030_VIBRA_AUDIO_SEL_R2      (0x03 << 2)
+#define TWL4030_VIBRA_SEL               0x10
+#define TWL4030_VIBRA_DIR_SEL           0x20
+
+/* TWL4030 codec resource IDs */
+enum twl4030_codec_res {
+        TWL4030_CODEC_RES_POWER = 0,
+        TWL4030_CODEC_RES_APLL,
+        TWL4030_CODEC_RES_MAX,
+};
+
+int twl4030_codec_disable_resource(enum twl4030_codec_res id);
+int twl4030_codec_enable_resource(enum twl4030_codec_res id);
+unsigned int twl4030_codec_get_mclk(void);
+
+#endif  /* End of __TWL4030_CODEC_H__ */
diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h
new file mode 100644
index 00000000000..aa9c3789bed
--- /dev/null
+++ b/include/linux/mfd/ucb1x00.h
@@ -0,0 +1,258 @@
+/*
+ *  linux/include/mfd/ucb1x00.h
+ *
+ *  Copyright (C) 2001 Russell King, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License.
+ */
+#ifndef UCB1200_H
+#define UCB1200_H
+
+#include <linux/mfd/mcp.h>
+#include <linux/gpio.h>
+
+#define UCB_IO_DATA     0x00
+#define UCB_IO_DIR      0x01
+
+#define UCB_IO_0                (1 << 0)
+#define UCB_IO_1                (1 << 1)
+#define UCB_IO_2                (1 << 2)
+#define UCB_IO_3                (1 << 3)
+#define UCB_IO_4                (1 << 4)
+#define UCB_IO_5                (1 << 5)
+#define UCB_IO_6                (1 << 6)
+#define UCB_IO_7                (1 << 7)
+#define UCB_IO_8                (1 << 8)
+#define UCB_IO_9                (1 << 9)
+
+#define UCB_IE_RIS      0x02
+#define UCB_IE_FAL      0x03
+#define UCB_IE_STATUS   0x04
+#define UCB_IE_CLEAR    0x04
+#define UCB_IE_ADC              (1 << 11)
+#define UCB_IE_TSPX             (1 << 12)
+#define UCB_IE_TSMX             (1 << 13)
+#define UCB_IE_TCLIP            (1 << 14)
+#define UCB_IE_ACLIP            (1 << 15)
+
+#define UCB_IRQ_TSPX            12
+
+#define UCB_TC_A        0x05
+#define UCB_TC_A_LOOP           (1 << 7)        /* UCB1200 */
+#define UCB_TC_A_AMPL           (1 << 7)        /* UCB1300 */
+
+#define UCB_TC_B        0x06
+#define UCB_TC_B_VOICE_ENA      (1 << 3)
+#define UCB_TC_B_CLIP           (1 << 4)
+#define UCB_TC_B_ATT            (1 << 6)
+#define UCB_TC_B_SIDE_ENA       (1 << 11)
+#define UCB_TC_B_MUTE           (1 << 13)
+#define UCB_TC_B_IN_ENA         (1 << 14)
+#define UCB_TC_B_OUT_ENA        (1 << 15)
+
+#define UCB_AC_A        0x07
+#define UCB_AC_B        0x08
+#define UCB_AC_B_LOOP           (1 << 8)
+#define UCB_AC_B_MUTE           (1 << 13)
+#define UCB_AC_B_IN_ENA         (1 << 14)
+#define UCB_AC_B_OUT_ENA        (1 << 15)
+
+#define UCB_TS_CR       0x09
+#define UCB_TS_CR_TSMX_POW      (1 << 0)
+#define UCB_TS_CR_TSPX_POW      (1 << 1)
+#define UCB_TS_CR_TSMY_POW      (1 << 2)
+#define UCB_TS_CR_TSPY_POW      (1 << 3)
+#define UCB_TS_CR_TSMX_GND      (1 << 4)
+#define UCB_TS_CR_TSPX_GND      (1 << 5)
+#define UCB_TS_CR_TSMY_GND      (1 << 6)
+#define UCB_TS_CR_TSPY_GND      (1 << 7)
+#define UCB_TS_CR_MODE_INT      (0 << 8)
+#define UCB_TS_CR_MODE_PRES     (1 << 8)
+#define UCB_TS_CR_MODE_POS      (2 << 8)
+#define UCB_TS_CR_BIAS_ENA      (1 << 11)
+#define UCB_TS_CR_TSPX_LOW      (1 << 12)
+#define UCB_TS_CR_TSMX_LOW      (1 << 13)
+
+#define UCB_ADC_CR      0x0a
+#define UCB_ADC_SYNC_ENA        (1 << 0)
+#define UCB_ADC_VREFBYP_CON     (1 << 1)
+#define UCB_ADC_INP_TSPX        (0 << 2)
+#define UCB_ADC_INP_TSMX        (1 << 2)
+#define UCB_ADC_INP_TSPY        (2 << 2)
+#define UCB_ADC_INP_TSMY        (3 << 2)
+#define UCB_ADC_INP_AD0         (4 << 2)
+#define UCB_ADC_INP_AD1         (5 << 2)
+#define UCB_ADC_INP_AD2         (6 << 2)
+#define UCB_ADC_INP_AD3         (7 << 2)
+#define UCB_ADC_EXT_REF         (1 << 5)
+#define UCB_ADC_START           (1 << 7)
+#define UCB_ADC_ENA             (1 << 15)
+
+#define UCB_ADC_DATA    0x0b
+#define UCB_ADC_DAT_VAL         (1 << 15)
+#define UCB_ADC_DAT(x)          (((x) & 0x7fe0) >> 5)
+
+#define UCB_ID          0x0c
+#define UCB_ID_1200             0x1004
+#define UCB_ID_1300             0x1005
+#define UCB_ID_TC35143          0x9712
+
+#define UCB_MODE        0x0d
+#define UCB_MODE_DYN_VFLAG_ENA  (1 << 12)
+#define UCB_MODE_AUD_OFF_CAN    (1 << 13)
+
+
+struct ucb1x00_irq {
+        void *devid;
+        void (*fn)(int, void *);
+};
+
+struct ucb1x00 {
+        spinlock_t              lock;
+        struct mcp              *mcp;
+        unsigned int            irq;
+        struct semaphore        adc_sem;
+        spinlock_t              io_lock;
+        u16                     id;
+        u16                     io_dir;
+        u16                     io_out;
+        u16                     adc_cr;
+        u16                     irq_fal_enbl;
+        u16                     irq_ris_enbl;
+        struct ucb1x00_irq      irq_handler[16];
+        struct device           dev;
+        struct list_head        node;
+        struct list_head        devs;
+        struct gpio_chip        gpio;
+};
+
+struct ucb1x00_driver;
+
+struct ucb1x00_dev {
+        struct list_head        dev_node;
+        struct list_head        drv_node;
+        struct ucb1x00          *ucb;
+        struct ucb1x00_driver   *drv;
+        void                    *priv;
+};
+
+struct ucb1x00_driver {
+        struct list_head        node;
+        struct list_head        devs;
+        int     (*add)(struct ucb1x00_dev *dev);
+        void    (*remove)(struct ucb1x00_dev *dev);
+        int     (*suspend)(struct ucb1x00_dev *dev, pm_message_t state);
+        int     (*resume)(struct ucb1x00_dev *dev);
+};
+
+#define classdev_to_ucb1x00(cd) container_of(cd, struct ucb1x00, dev)
+
+int ucb1x00_register_driver(struct ucb1x00_driver *);
+void ucb1x00_unregister_driver(struct ucb1x00_driver *);
+
+/**
+ *      ucb1x00_clkrate - return the UCB1x00 SIB clock rate
+ *      @ucb: UCB1x00 structure describing chip
+ *
+ *      Return the SIB clock rate in Hz.
+ */
+static inline unsigned int ucb1x00_clkrate(struct ucb1x00 *ucb)
+{
+        return mcp_get_sclk_rate(ucb->mcp);
+}
+
+/**
+ *      ucb1x00_enable - enable the UCB1x00 SIB clock
+ *      @ucb: UCB1x00 structure describing chip
+ *
+ *      Enable the SIB clock.  This can be called multiple times.
+ */
+static inline void ucb1x00_enable(struct ucb1x00 *ucb)
+{
+        mcp_enable(ucb->mcp);
+}
+
+/**
+ *      ucb1x00_disable - disable the UCB1x00 SIB clock
+ *      @ucb: UCB1x00 structure describing chip
+ *
+ *      Disable the SIB clock.  The SIB clock will only be disabled
+ *      when the number of ucb1x00_enable calls match the number of
+ *      ucb1x00_disable calls.
+ */
+static inline void ucb1x00_disable(struct ucb1x00 *ucb)
+{
+        mcp_disable(ucb->mcp);
+}
+
+/**
+ *      ucb1x00_reg_write - write a UCB1x00 register
+ *      @ucb: UCB1x00 structure describing chip
+ *      @reg: UCB1x00 4-bit register index to write
+ *      @val: UCB1x00 16-bit value to write
+ *
+ *      Write the UCB1x00 register @reg with value @val.  The SIB
+ *      clock must be running for this function to return.
+ */
+static inline void ucb1x00_reg_write(struct ucb1x00 *ucb, unsigned int reg, unsigned int val)
+{
+        mcp_reg_write(ucb->mcp, reg, val);
+}
+
+/**
+ *      ucb1x00_reg_read - read a UCB1x00 register
+ *      @ucb: UCB1x00 structure describing chip
+ *      @reg: UCB1x00 4-bit register index to write
+ *
+ *      Read the UCB1x00 register @reg and return its value.  The SIB
+ *      clock must be running for this function to return.
+ */
+static inline unsigned int ucb1x00_reg_read(struct ucb1x00 *ucb, unsigned int reg)
+{
+        return mcp_reg_read(ucb->mcp, reg);
+}
+/**
+ *      ucb1x00_set_audio_divisor - 
+ *      @ucb: UCB1x00 structure describing chip
+ *      @div: SIB clock divisor
+ */
+static inline void ucb1x00_set_audio_divisor(struct ucb1x00 *ucb, unsigned int div)
+{
+        mcp_set_audio_divisor(ucb->mcp, div);
+}
+
+/**
+ *      ucb1x00_set_telecom_divisor -
+ *      @ucb: UCB1x00 structure describing chip
+ *      @div: SIB clock divisor
+ */
+static inline void ucb1x00_set_telecom_divisor(struct ucb1x00 *ucb, unsigned int div)
+{
+        mcp_set_telecom_divisor(ucb->mcp, div);
+}
+
+void ucb1x00_io_set_dir(struct ucb1x00 *ucb, unsigned int, unsigned int);
+void ucb1x00_io_write(struct ucb1x00 *ucb, unsigned int, unsigned int);
+unsigned int ucb1x00_io_read(struct ucb1x00 *ucb);
+
+#define UCB_NOSYNC      (0)
+#define UCB_SYNC        (1)
+
+unsigned int ucb1x00_adc_read(struct ucb1x00 *ucb, int adc_channel, int sync);
+void ucb1x00_adc_enable(struct ucb1x00 *ucb);
+void ucb1x00_adc_disable(struct ucb1x00 *ucb);
+
+/*
+ * Which edges of the IRQ do you want to control today?
+ */
+#define UCB_RISING      (1 << 0)
+#define UCB_FALLING     (1 << 1)
+
+int ucb1x00_hook_irq(struct ucb1x00 *ucb, unsigned int idx, void (*fn)(int, void *), void *devid);
+void ucb1x00_enable_irq(struct ucb1x00 *ucb, unsigned int idx, int edges);
+void ucb1x00_disable_irq(struct ucb1x00 *ucb, unsigned int idx, int edges);
+int ucb1x00_free_irq(struct ucb1x00 *ucb, unsigned int idx, void *devid);
+
+#endif
diff --git a/include/linux/mfd/wm831x/regulator.h b/include/linux/mfd/wm831x/regulator.h
index f95466343fb..955d30fc6a2 100644
--- a/include/linux/mfd/wm831x/regulator.h
+++ b/include/linux/mfd/wm831x/regulator.h
@@ -1212,7 +1212,7 @@
 #define WM831X_LDO1_OK_SHIFT                         0  /* LDO1_OK */
 #define WM831X_LDO1_OK_WIDTH                         1  /* LDO1_OK */
 
-#define WM831X_ISINK_MAX_ISEL 56
-extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL];
+#define WM831X_ISINK_MAX_ISEL 55
+extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL + 1];
 
 #endif
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 2dbfb5a0599..33b2ea09a4a 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -28,6 +28,7 @@
 #define SDIO_DEVICE_ID_INTEL_IWMC3200TOP        0x1404
 #define SDIO_DEVICE_ID_INTEL_IWMC3200GPS        0x1405
 #define SDIO_DEVICE_ID_INTEL_IWMC3200BT         0x1406
+#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX_2G5  0x1407
 
 #define SDIO_VENDOR_ID_MARVELL                  0x02df
 #define SDIO_DEVICE_ID_MARVELL_LIBERTAS         0x9103
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index 08bc776d05e..c5f3d53548e 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -59,20 +59,24 @@ struct vifctl {
         unsigned char vifc_flags;       /* VIFF_ flags */
         unsigned char vifc_threshold;   /* ttl limit */
         unsigned int vifc_rate_limit;   /* Rate limiter values (NI) */
-        struct in_addr vifc_lcl_addr;   /* Our address */
+        union {
+                struct in_addr vifc_lcl_addr;     /* Local interface address */
+                int            vifc_lcl_ifindex;  /* Local interface index   */
+        };
         struct in_addr vifc_rmt_addr;   /* IPIP tunnel addr */
 };
 
-#define VIFF_TUNNEL     0x1     /* IPIP tunnel */
-#define VIFF_SRCRT      0x2     /* NI */
-#define VIFF_REGISTER   0x4     /* register vif */
+#define VIFF_TUNNEL             0x1     /* IPIP tunnel */
+#define VIFF_SRCRT              0x2     /* NI */
+#define VIFF_REGISTER           0x4     /* register vif */
+#define VIFF_USE_IFINDEX        0x8     /* use vifc_lcl_ifindex instead of
+                                           vifc_lcl_addr to find an interface */
 
 /*
  *      Cache manipulation structures for mrouted and PIMd
  */
  
-struct mfcctl
-{
+struct mfcctl {
         struct in_addr mfcc_origin;             /* Origin of mcast      */
         struct in_addr mfcc_mcastgrp;           /* Group in question    */
         vifi_t  mfcc_parent;                    /* Where it arrived     */
@@ -87,8 +91,7 @@ struct mfcctl
  *      Group count retrieval for mrouted
  */
  
-struct sioc_sg_req
-{
+struct sioc_sg_req {
         struct in_addr src;
         struct in_addr grp;
         unsigned long pktcnt;
@@ -100,8 +103,7 @@ struct sioc_sg_req
  *      To get vif packet counts
  */
 
-struct sioc_vif_req
-{
+struct sioc_vif_req {
         vifi_t  vifi;           /* Which iface */
         unsigned long icount;   /* In packets */
         unsigned long ocount;   /* Out packets */
@@ -114,8 +116,7 @@ struct sioc_vif_req
  *      data. Magically happens to be like an IP packet as per the original
  */
  
-struct igmpmsg
-{
+struct igmpmsg {
         __u32 unused1,unused2;
         unsigned char im_msgtype;               /* What is this */
         unsigned char im_mbz;                   /* Must be zero */
@@ -176,8 +177,7 @@ static inline int ip_mr_init(void)
 }
 #endif
 
-struct vif_device
-{
+struct vif_device {
         struct net_device       *dev;                   /* Device we are using */
         unsigned long   bytes_in,bytes_out;
         unsigned long   pkt_in,pkt_out;         /* Statistics                   */
@@ -190,8 +190,7 @@ struct vif_device
 
 #define VIFF_STATIC 0x8000
 
-struct mfc_cache 
-{
+struct mfc_cache {
         struct mfc_cache *next;                 /* Next entry on cache line     */
 #ifdef CONFIG_NET_NS
         struct net *mfc_net;
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index b191865a6ca..2caa1a8e525 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -75,8 +75,7 @@ struct mif6ctl {
  *      Cache manipulation structures for mrouted and PIMd
  */
 
-struct mf6cctl
-{
+struct mf6cctl {
         struct sockaddr_in6 mf6cc_origin;               /* Origin of mcast      */
         struct sockaddr_in6 mf6cc_mcastgrp;             /* Group in question    */
         mifi_t  mf6cc_parent;                   /* Where it arrived     */
@@ -87,8 +86,7 @@ struct mf6cctl
  *      Group count retrieval for pim6sd
  */
 
-struct sioc_sg_req6
-{
+struct sioc_sg_req6 {
         struct sockaddr_in6 src;
         struct sockaddr_in6 grp;
         unsigned long pktcnt;
@@ -100,8 +98,7 @@ struct sioc_sg_req6
  *      To get vif packet counts
  */
 
-struct sioc_mif_req6
-{
+struct sioc_mif_req6 {
         mifi_t  mifi;           /* Which iface */
         unsigned long icount;   /* In packets */
         unsigned long ocount;   /* Out packets */
@@ -172,8 +169,7 @@ static inline void ip6_mr_cleanup(void)
 }
 #endif
 
-struct mif_device
-{
+struct mif_device {
         struct net_device       *dev;                   /* Device we are using */
         unsigned long   bytes_in,bytes_out;
         unsigned long   pkt_in,pkt_out;         /* Statistics                   */
@@ -185,8 +181,7 @@ struct mif_device
 
 #define VIFF_STATIC 0x8000
 
-struct mfc6_cache
-{
+struct mfc6_cache {
         struct mfc6_cache *next;                /* Next entry on cache line     */
 #ifdef CONFIG_NET_NS
         struct net *mfc6_net;
diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h
index 6913b71d9ab..b31bd9e9bca 100644
--- a/include/linux/mtd/ubi.h
+++ b/include/linux/mtd/ubi.h
@@ -174,6 +174,8 @@ void ubi_get_volume_info(struct ubi_volume_desc *desc,
 struct ubi_volume_desc *ubi_open_volume(int ubi_num, int vol_id, int mode);
 struct ubi_volume_desc *ubi_open_volume_nm(int ubi_num, const char *name,
                                            int mode);
+struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode);
+
 int ubi_register_volume_notifier(struct notifier_block *nb,
                                  int ignore_existing);
 int ubi_unregister_volume_notifier(struct notifier_block *nb);
diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h
index 12c9de13845..a7003b7a695 100644
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
 
-struct ndmsg
-{
+struct ndmsg {
         __u8            ndm_family;
         __u8            ndm_pad1;
         __u16           ndm_pad2;
@@ -15,8 +14,7 @@ struct ndmsg
         __u8            ndm_type;
 };
 
-enum
-{
+enum {
         NDA_UNSPEC,
         NDA_DST,
         NDA_LLADDR,
@@ -56,8 +54,7 @@ enum
    NUD_PERMANENT is also cannot be deleted by garbage collectors.
  */
 
-struct nda_cacheinfo
-{
+struct nda_cacheinfo {
         __u32           ndm_confirmed;
         __u32           ndm_used;
         __u32           ndm_updated;
@@ -89,8 +86,7 @@ struct nda_cacheinfo
  * device.
  ****/
 
-struct ndt_stats
-{
+struct ndt_stats {
         __u64           ndts_allocs;
         __u64           ndts_destroys;
         __u64           ndts_hash_grows;
@@ -124,15 +120,13 @@ enum {
 };
 #define NDTPA_MAX (__NDTPA_MAX - 1)
 
-struct ndtmsg
-{
+struct ndtmsg {
         __u8            ndtm_family;
         __u8            ndtm_pad1;
         __u16           ndtm_pad2;
 };
 
-struct ndt_config
-{
+struct ndt_config {
         __u16           ndtc_key_len;
         __u16           ndtc_entry_size;
         __u32           ndtc_entries;
diff --git a/include/linux/net.h b/include/linux/net.h
index 529a0931711..5e8083cacc8 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -41,6 +41,7 @@
 #define SYS_SENDMSG     16              /* sys_sendmsg(2)               */
 #define SYS_RECVMSG     17              /* sys_recvmsg(2)               */
 #define SYS_ACCEPT4     18              /* sys_accept4(2)               */
+#define SYS_RECVMMSG    19              /* sys_recvmmsg(2)              */
 
 typedef enum {
         SS_FREE = 0,                    /* not allocated                */
@@ -198,9 +199,13 @@ struct proto_ops {
                                        struct pipe_inode_info *pipe, size_t len, unsigned int flags);
 };
 
+#define DECLARE_SOCKADDR(type, dst, src)        \
+        type dst = ({ __sockaddr_check_size(sizeof(*dst)); (type) src; })
+
 struct net_proto_family {
         int             family;
-        int             (*create)(struct net *net, struct socket *sock, int protocol);
+        int             (*create)(struct net *net, struct socket *sock,
+                                  int protocol, int kern);
         struct module   *owner;
 };
 
@@ -263,89 +268,6 @@ extern int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg);
 extern int kernel_sock_shutdown(struct socket *sock,
                                 enum sock_shutdown_cmd how);
 
-#ifndef CONFIG_SMP
-#define SOCKOPS_WRAPPED(name) name
-#define SOCKOPS_WRAP(name, fam)
-#else
-
-#define SOCKOPS_WRAPPED(name) __unlocked_##name
-
-#define SOCKCALL_WRAP(name, call, parms, args)          \
-static int __lock_##name##_##call  parms                \
-{                                                       \
-        int ret;                                        \
-        lock_kernel();                                  \
-        ret = __unlocked_##name##_ops.call  args ;\
-        unlock_kernel();                                \
-        return ret;                                     \
-}
-
-#define SOCKCALL_UWRAP(name, call, parms, args)         \
-static unsigned int __lock_##name##_##call  parms       \
-{                                                       \
-        int ret;                                        \
-        lock_kernel();                                  \
-        ret = __unlocked_##name##_ops.call  args ;\
-        unlock_kernel();                                \
-        return ret;                                     \
-}
-
-
-#define SOCKOPS_WRAP(name, fam)                                 \
-SOCKCALL_WRAP(name, release, (struct socket *sock), (sock))     \
-SOCKCALL_WRAP(name, bind, (struct socket *sock, struct sockaddr *uaddr, int addr_len), \
-              (sock, uaddr, addr_len))                          \
-SOCKCALL_WRAP(name, connect, (struct socket *sock, struct sockaddr * uaddr, \
-                              int addr_len, int flags),         \
-              (sock, uaddr, addr_len, flags))                   \
-SOCKCALL_WRAP(name, socketpair, (struct socket *sock1, struct socket *sock2), \
-              (sock1, sock2))                                   \
-SOCKCALL_WRAP(name, accept, (struct socket *sock, struct socket *newsock, \
-                         int flags), (sock, newsock, flags)) \
-SOCKCALL_WRAP(name, getname, (struct socket *sock, struct sockaddr *uaddr, \
-                         int *addr_len, int peer), (sock, uaddr, addr_len, peer)) \
-SOCKCALL_UWRAP(name, poll, (struct file *file, struct socket *sock, struct poll_table_struct *wait), \
-              (file, sock, wait)) \
-SOCKCALL_WRAP(name, ioctl, (struct socket *sock, unsigned int cmd, \
-                         unsigned long arg), (sock, cmd, arg)) \
-SOCKCALL_WRAP(name, compat_ioctl, (struct socket *sock, unsigned int cmd, \
-                         unsigned long arg), (sock, cmd, arg)) \
-SOCKCALL_WRAP(name, listen, (struct socket *sock, int len), (sock, len)) \
-SOCKCALL_WRAP(name, shutdown, (struct socket *sock, int flags), (sock, flags)) \
-SOCKCALL_WRAP(name, setsockopt, (struct socket *sock, int level, int optname, \
-                         char __user *optval, unsigned int optlen), (sock, level, optname, optval, optlen)) \
-SOCKCALL_WRAP(name, getsockopt, (struct socket *sock, int level, int optname, \
-                         char __user *optval, int __user *optlen), (sock, level, optname, optval, optlen)) \
-SOCKCALL_WRAP(name, sendmsg, (struct kiocb *iocb, struct socket *sock, struct msghdr *m, size_t len), \
-              (iocb, sock, m, len)) \
-SOCKCALL_WRAP(name, recvmsg, (struct kiocb *iocb, struct socket *sock, struct msghdr *m, size_t len, int flags), \
-              (iocb, sock, m, len, flags)) \
-SOCKCALL_WRAP(name, mmap, (struct file *file, struct socket *sock, struct vm_area_struct *vma), \
-              (file, sock, vma)) \
-              \
-static const struct proto_ops name##_ops = {                    \
-        .family         = fam,                          \
-        .owner          = THIS_MODULE,                  \
-        .release        = __lock_##name##_release,      \
-        .bind           = __lock_##name##_bind,         \
-        .connect        = __lock_##name##_connect,      \
-        .socketpair     = __lock_##name##_socketpair,   \
-        .accept         = __lock_##name##_accept,       \
-        .getname        = __lock_##name##_getname,      \
-        .poll           = __lock_##name##_poll,         \
-        .ioctl          = __lock_##name##_ioctl,        \
-        .compat_ioctl   = __lock_##name##_compat_ioctl, \
-        .listen         = __lock_##name##_listen,       \
-        .shutdown       = __lock_##name##_shutdown,     \
-        .setsockopt     = __lock_##name##_setsockopt,   \
-        .getsockopt     = __lock_##name##_getsockopt,   \
-        .sendmsg        = __lock_##name##_sendmsg,      \
-        .recvmsg        = __lock_##name##_recvmsg,      \
-        .mmap           = __lock_##name##_mmap,         \
-};
-
-#endif
-
 #define MODULE_ALIAS_NETPROTO(proto) \
         MODULE_ALIAS("net-pf-" __stringify(proto))
 
@@ -358,6 +280,7 @@ static const struct proto_ops name##_ops = {			\
 
 #ifdef CONFIG_SYSCTL
 #include <linux/sysctl.h>
+#include <linux/ratelimit.h>
 extern struct ratelimit_state net_ratelimit_state;
 #endif
 
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 812a5f3c2ab..a3fccc85b1a 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -63,30 +63,69 @@ struct wireless_dev;
 #define HAVE_FREE_NETDEV                /* free_netdev() */
 #define HAVE_NETDEV_PRIV                /* netdev_priv() */
 
-#define NET_XMIT_SUCCESS        0
-#define NET_XMIT_DROP           1       /* skb dropped                  */
-#define NET_XMIT_CN             2       /* congestion notification      */
-#define NET_XMIT_POLICED        3       /* skb is shot by police        */
-#define NET_XMIT_MASK           0xFFFF  /* qdisc flags in net/sch_generic.h */
-
 /* Backlog congestion levels */
-#define NET_RX_SUCCESS          0   /* keep 'em coming, baby */
-#define NET_RX_DROP             1  /* packet dropped */
+#define NET_RX_SUCCESS          0       /* keep 'em coming, baby */
+#define NET_RX_DROP             1       /* packet dropped */
+
+/*
+ * Transmit return codes: transmit return codes originate from three different
+ * namespaces:
+ *
+ * - qdisc return codes
+ * - driver transmit return codes
+ * - errno values
+ *
+ * Drivers are allowed to return any one of those in their hard_start_xmit()
+ * function. Real network devices commonly used with qdiscs should only return
+ * the driver transmit return codes though - when qdiscs are used, the actual
+ * transmission happens asynchronously, so the value is not propagated to
+ * higher layers. Virtual network devices transmit synchronously, in this case
+ * the driver transmit return codes are consumed by dev_queue_xmit(), all
+ * others are propagated to higher layers.
+ */
+
+/* qdisc ->enqueue() return codes. */
+#define NET_XMIT_SUCCESS        0x00
+#define NET_XMIT_DROP           0x01    /* skb dropped                  */
+#define NET_XMIT_CN             0x02    /* congestion notification      */
+#define NET_XMIT_POLICED        0x03    /* skb is shot by police        */
+#define NET_XMIT_MASK           0x0f    /* qdisc flags in net/sch_generic.h */
 
 /* NET_XMIT_CN is special. It does not guarantee that this packet is lost. It
  * indicates that the device will soon be dropping packets, or already drops
  * some packets of the same priority; prompting us to send less aggressively. */
-#define net_xmit_eval(e)        ((e) == NET_XMIT_CN? 0 : (e))
+#define net_xmit_eval(e)        ((e) == NET_XMIT_CN ? 0 : (e))
 #define net_xmit_errno(e)       ((e) != NET_XMIT_CN ? -ENOBUFS : 0)
 
 /* Driver transmit return codes */
+#define NETDEV_TX_MASK          0xf0
+
 enum netdev_tx {
-        NETDEV_TX_OK = 0,       /* driver took care of packet */
-        NETDEV_TX_BUSY,         /* driver tx path was busy*/
-        NETDEV_TX_LOCKED = -1,  /* driver tx lock was already taken */
+        __NETDEV_TX_MIN  = INT_MIN,     /* make sure enum is signed */
+        NETDEV_TX_OK     = 0x00,        /* driver took care of packet */
+        NETDEV_TX_BUSY   = 0x10,        /* driver tx path was busy*/
+        NETDEV_TX_LOCKED = 0x20,        /* driver tx lock was already taken */
 };
 typedef enum netdev_tx netdev_tx_t;
 
+/*
+ * Current order: NETDEV_TX_MASK > NET_XMIT_MASK >= 0 is significant;
+ * hard_start_xmit() return < NET_XMIT_MASK means skb was consumed.
+ */
+static inline bool dev_xmit_complete(int rc)
+{
+        /*
+         * Positive cases with an skb consumed by a driver:
+         * - successful transmission (rc == NETDEV_TX_OK)
+         * - error while transmitting (rc < 0)
+         * - error while queueing to a different device (rc & NET_XMIT_MASK)
+         */
+        if (likely(rc < NET_XMIT_MASK))
+                return true;
+
+        return false;
+}
+
 #endif
 
 #define MAX_ADDR_LEN    32              /* Largest hardware address length */
@@ -125,8 +164,7 @@ typedef enum netdev_tx netdev_tx_t;
  *      with byte counters.
  */
 
-struct net_device_stats
-{
+struct net_device_stats {
         unsigned long   rx_packets;             /* total packets received       */
         unsigned long   tx_packets;             /* total packets transmitted    */
         unsigned long   rx_bytes;               /* total bytes received         */
@@ -179,8 +217,7 @@ struct neighbour;
 struct neigh_parms;
 struct sk_buff;
 
-struct netif_rx_stats
-{
+struct netif_rx_stats {
         unsigned total;
         unsigned dropped;
         unsigned time_squeeze;
@@ -189,8 +226,7 @@ struct netif_rx_stats
 
 DECLARE_PER_CPU(struct netif_rx_stats, netdev_rx_stat);
 
-struct dev_addr_list
-{
+struct dev_addr_list {
         struct dev_addr_list    *next;
         u8                      da_addr[MAX_ADDR_LEN];
         u8                      da_addrlen;
@@ -227,8 +263,7 @@ struct netdev_hw_addr_list {
         int                     count;
 };
 
-struct hh_cache
-{
+struct hh_cache {
         struct hh_cache *hh_next;       /* Next entry                        */
         atomic_t        hh_refcnt;      /* number of users                   */
 /*
@@ -291,8 +326,7 @@ struct header_ops {
  * code.
  */
 
-enum netdev_state_t
-{
+enum netdev_state_t {
         __LINK_STATE_START,
         __LINK_STATE_PRESENT,
         __LINK_STATE_NOCARRIER,
@@ -341,20 +375,20 @@ struct napi_struct {
         struct sk_buff          *skb;
 };
 
-enum
-{
+enum {
         NAPI_STATE_SCHED,       /* Poll is scheduled */
         NAPI_STATE_DISABLE,     /* Disable pending */
         NAPI_STATE_NPSVC,       /* Netpoll - don't dequeue from poll_list */
 };
 
-enum {
+enum gro_result {
         GRO_MERGED,
         GRO_MERGED_FREE,
         GRO_HELD,
         GRO_NORMAL,
         GRO_DROP,
 };
+typedef enum gro_result gro_result_t;
 
 extern void __napi_schedule(struct napi_struct *n);
 
@@ -457,8 +491,7 @@ static inline void napi_synchronize(const struct napi_struct *n)
 # define napi_synchronize(n)    barrier()
 #endif
 
-enum netdev_queue_state_t
-{
+enum netdev_queue_state_t {
         __QUEUE_STATE_XOFF,
         __QUEUE_STATE_FROZEN,
 };
@@ -635,6 +668,10 @@ struct net_device_ops {
                                                       unsigned int sgc);
         int                     (*ndo_fcoe_ddp_done)(struct net_device *dev,
                                                      u16 xid);
+#define NETDEV_FCOE_WWNN 0
+#define NETDEV_FCOE_WWPN 1
+        int                     (*ndo_fcoe_get_wwn)(struct net_device *dev,
+                                                    u64 *wwn, int type);
 #endif
 };
 
@@ -648,8 +685,7 @@ struct net_device_ops {
  *      moves out.
  */
 
-struct net_device
-{
+struct net_device {
 
         /*
          * This is the first field of the "visible" part of this structure
@@ -683,6 +719,7 @@ struct net_device
 
         struct list_head        dev_list;
         struct list_head        napi_list;
+        struct list_head        unreg_list;
 
         /* Net device features */
         unsigned long           features;
@@ -859,7 +896,7 @@ struct net_device
         /* device index hash chain */
         struct hlist_node       index_hlist;
 
-        struct net_device       *link_watch_next;
+        struct list_head        link_watch_list;
 
         /* register/unregister state machine */
         enum { NETREG_UNINITIALIZED=0,
@@ -894,8 +931,8 @@ struct net_device
 
         /* class/net/name entry */
         struct device           dev;
-        /* space for optional statistics and wireless sysfs groups */
-        const struct attribute_group *sysfs_groups[3];
+        /* space for optional device, statistics, and wireless sysfs groups */
+        const struct attribute_group *sysfs_groups[4];
 
         /* rtnetlink link ops */
         const struct rtnl_link_ops *rtnl_link_ops;
@@ -909,7 +946,7 @@ struct net_device
 
 #ifdef CONFIG_DCB
         /* Data Center Bridging netlink ops */
-        struct dcbnl_rtnl_ops *dcbnl_ops;
+        const struct dcbnl_rtnl_ops *dcbnl_ops;
 #endif
 
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
@@ -1075,10 +1112,16 @@ extern rwlock_t				dev_base_lock;		/* Device list lock */
 
 #define for_each_netdev(net, d)         \
                 list_for_each_entry(d, &(net)->dev_base_head, dev_list)
+#define for_each_netdev_reverse(net, d) \
+                list_for_each_entry_reverse(d, &(net)->dev_base_head, dev_list)
+#define for_each_netdev_rcu(net, d)             \
+                list_for_each_entry_rcu(d, &(net)->dev_base_head, dev_list)
 #define for_each_netdev_safe(net, d, n) \
                 list_for_each_entry_safe(d, n, &(net)->dev_base_head, dev_list)
 #define for_each_netdev_continue(net, d)                \
                 list_for_each_entry_continue(d, &(net)->dev_base_head, dev_list)
+#define for_each_netdev_continue_rcu(net, d)            \
+        list_for_each_entry_continue_rcu(d, &(net)->dev_base_head, dev_list)
 #define net_device_entry(lh)    list_entry(lh, struct net_device, dev_list)
 
 static inline struct net_device *next_net_device(struct net_device *dev)
@@ -1091,6 +1134,16 @@ static inline struct net_device *next_net_device(struct net_device *dev)
         return lh == &net->dev_base_head ? NULL : net_device_entry(lh);
 }
 
+static inline struct net_device *next_net_device_rcu(struct net_device *dev)
+{
+        struct list_head *lh;
+        struct net *net;
+
+        net = dev_net(dev);
+        lh = rcu_dereference(dev->dev_list.next);
+        return lh == &net->dev_base_head ? NULL : net_device_entry(lh);
+}
+
 static inline struct net_device *first_net_device(struct net *net)
 {
         return list_empty(&net->dev_base_head) ? NULL :
@@ -1109,6 +1162,7 @@ extern void		__dev_remove_pack(struct packet_type *pt);
 extern struct net_device        *dev_get_by_flags(struct net *net, unsigned short flags,
                                                   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);
 extern int              dev_alloc_name(struct net_device *dev, const char *name);
 extern int              dev_open(struct net_device *dev);
@@ -1116,7 +1170,14 @@ extern int		dev_close(struct net_device *dev);
 extern void             dev_disable_lro(struct net_device *dev);
 extern int              dev_queue_xmit(struct sk_buff *skb);
 extern int              register_netdevice(struct net_device *dev);
-extern void             unregister_netdevice(struct net_device *dev);
+extern void             unregister_netdevice_queue(struct net_device *dev,
+                                                   struct list_head *head);
+extern void             unregister_netdevice_many(struct list_head *head);
+static inline void unregister_netdevice(struct net_device *dev)
+{
+        unregister_netdevice_queue(dev, NULL);
+}
+
 extern void             free_netdev(struct net_device *dev);
 extern void             synchronize_net(void);
 extern int              register_netdevice_notifier(struct notifier_block *nb);
@@ -1127,6 +1188,7 @@ extern void		netdev_resync_ops(struct net_device *dev);
 extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
 extern struct net_device        *dev_get_by_index(struct net *net, int ifindex);
 extern struct net_device        *__dev_get_by_index(struct net *net, int ifindex);
+extern struct net_device        *dev_get_by_index_rcu(struct net *net, int ifindex);
 extern int              dev_restart(struct net_device *dev);
 #ifdef CONFIG_NETPOLL_TRAP
 extern int              netpoll_trap(void);
@@ -1212,8 +1274,7 @@ static inline int unregister_gifconf(unsigned int family)
  * Incoming packets are placed on per-cpu queues so that
  * no locking is needed.
  */
-struct softnet_data
-{
+struct softnet_data {
         struct Qdisc            *output_queue;
         struct sk_buff_head     input_pkt_queue;
         struct list_head        poll_list;
@@ -1467,18 +1528,19 @@ extern int		netif_rx_ni(struct sk_buff *skb);
 #define HAVE_NETIF_RECEIVE_SKB 1
 extern int              netif_receive_skb(struct sk_buff *skb);
 extern void             napi_gro_flush(struct napi_struct *napi);
-extern int              dev_gro_receive(struct napi_struct *napi,
+extern gro_result_t     dev_gro_receive(struct napi_struct *napi,
                                         struct sk_buff *skb);
-extern int              napi_skb_finish(int ret, struct sk_buff *skb);
-extern int              napi_gro_receive(struct napi_struct *napi,
+extern gro_result_t     napi_skb_finish(gro_result_t ret, struct sk_buff *skb);
+extern gro_result_t     napi_gro_receive(struct napi_struct *napi,
                                          struct sk_buff *skb);
 extern void             napi_reuse_skb(struct napi_struct *napi,
                                        struct sk_buff *skb);
 extern struct sk_buff * napi_get_frags(struct napi_struct *napi);
-extern int              napi_frags_finish(struct napi_struct *napi,
-                                          struct sk_buff *skb, int ret);
+extern gro_result_t     napi_frags_finish(struct napi_struct *napi,
+                                          struct sk_buff *skb,
+                                          gro_result_t ret);
 extern struct sk_buff * napi_frags_skb(struct napi_struct *napi);
-extern int              napi_gro_frags(struct napi_struct *napi);
+extern gro_result_t     napi_gro_frags(struct napi_struct *napi);
 
 static inline void napi_free_frags(struct napi_struct *napi)
 {
@@ -1502,6 +1564,8 @@ extern int		dev_set_mac_address(struct net_device *,
 extern int              dev_hard_start_xmit(struct sk_buff *skb,
                                             struct net_device *dev,
                                             struct netdev_queue *txq);
+extern int              dev_forward_skb(struct net_device *dev,
+                                        struct sk_buff *skb);
 
 extern int              netdev_budget;
 
@@ -1540,6 +1604,7 @@ static inline void dev_hold(struct net_device *dev)
  */
 
 extern void linkwatch_fire_event(struct net_device *dev);
+extern void linkwatch_forget_dev(struct net_device *dev);
 
 /**
  *      netif_carrier_ok - test if carrier present
@@ -1609,7 +1674,8 @@ static inline int netif_dormant(const struct net_device *dev)
  *
  * Check if carrier is operational
  */
-static inline int netif_oper_up(const struct net_device *dev) {
+static inline int netif_oper_up(const struct net_device *dev)
+{
         return (dev->operstate == IF_OPER_UP ||
                 dev->operstate == IF_OPER_UNKNOWN /* backward compat */);
 }
@@ -1880,6 +1946,7 @@ extern void		netdev_features_change(struct net_device *dev);
 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 void             dev_txq_stats_fold(const struct net_device *dev, struct net_device_stats *stats);
 
 extern int              netdev_max_backlog;
 extern int              weight_p;
@@ -1914,6 +1981,9 @@ unsigned long netdev_increment_features(unsigned long all, unsigned long one,
                                         unsigned long mask);
 unsigned long netdev_fix_features(unsigned long features, const char *name);
 
+void netif_stacked_transfer_operstate(const struct net_device *rootdev,
+                                        struct net_device *dev);
+
 static inline int net_gso_ok(int features, int gso_type)
 {
         int feature = gso_type << NETIF_F_GSO_SHIFT;
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 6132b5e6d9d..48c54960773 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -93,8 +93,7 @@ typedef unsigned int nf_hookfn(unsigned int hooknum,
                                const struct net_device *out,
                                int (*okfn)(struct sk_buff *));
 
-struct nf_hook_ops
-{
+struct nf_hook_ops {
         struct list_head list;
 
         /* User fills in from here down. */
@@ -106,8 +105,7 @@ struct nf_hook_ops
         int priority;
 };
 
-struct nf_sockopt_ops
-{
+struct nf_sockopt_ops {
         struct list_head list;
 
         u_int8_t pf;
diff --git a/include/linux/netfilter/nf_conntrack_common.h b/include/linux/netfilter/nf_conntrack_common.h
index a8248ee422b..a374787ed9b 100644
--- a/include/linux/netfilter/nf_conntrack_common.h
+++ b/include/linux/netfilter/nf_conntrack_common.h
@@ -3,8 +3,7 @@
 /* Connection state tracking for netfilter.  This is separated from,
    but required by, the NAT layer; it can also be used by an iptables
    extension. */
-enum ip_conntrack_info
-{
+enum ip_conntrack_info {
         /* Part of an established connection (either direction). */
         IP_CT_ESTABLISHED,
 
@@ -76,8 +75,7 @@ enum ip_conntrack_status {
 };
 
 #ifdef __KERNEL__
-struct ip_conntrack_stat
-{
+struct ip_conntrack_stat {
         unsigned int searched;
         unsigned int found;
         unsigned int new;
diff --git a/include/linux/netfilter/nf_conntrack_ftp.h b/include/linux/netfilter/nf_conntrack_ftp.h
index 47727d7546e..3e3aa08980c 100644
--- a/include/linux/netfilter/nf_conntrack_ftp.h
+++ b/include/linux/netfilter/nf_conntrack_ftp.h
@@ -3,8 +3,7 @@
 /* FTP tracking. */
 
 /* This enum is exposed to userspace */
-enum nf_ct_ftp_type
-{
+enum nf_ct_ftp_type {
         /* PORT command from client */
         NF_CT_FTP_PORT,
         /* PASV response from server */
diff --git a/include/linux/netfilter/nf_conntrack_sctp.h b/include/linux/netfilter/nf_conntrack_sctp.h
index 768f78c4ac5..ceeefe6681b 100644
--- a/include/linux/netfilter/nf_conntrack_sctp.h
+++ b/include/linux/netfilter/nf_conntrack_sctp.h
@@ -16,8 +16,7 @@ enum sctp_conntrack {
         SCTP_CONNTRACK_MAX
 };
 
-struct ip_ct_sctp
-{
+struct ip_ct_sctp {
         enum sctp_conntrack state;
 
         __be32 vtag[IP_CT_DIR_MAX];
diff --git a/include/linux/netfilter/nf_conntrack_tcp.h b/include/linux/netfilter/nf_conntrack_tcp.h
index 4352feed237..6e135f97e59 100644
--- a/include/linux/netfilter/nf_conntrack_tcp.h
+++ b/include/linux/netfilter/nf_conntrack_tcp.h
@@ -55,8 +55,7 @@ struct ip_ct_tcp_state {
         u_int8_t        flags;          /* per direction options */
 };
 
-struct ip_ct_tcp
-{
+struct ip_ct_tcp {
         struct ip_ct_tcp_state seen[2]; /* connection parameters per direction */
         u_int8_t        state;          /* state of the connection (enum tcp_conntrack) */
         /* For detecting stale connections */
@@ -67,6 +66,9 @@ struct ip_ct_tcp
         u_int32_t       last_ack;       /* Last sequence number seen in opposite dir */
         u_int32_t       last_end;       /* Last seq + len */
         u_int16_t       last_win;       /* Last window advertisement seen in dir */
+        /* For SYN packets while we may be out-of-sync */
+        u_int8_t        last_wscale;    /* Last window scaling factor seen */
+        u_int8_t        last_flags;     /* Last flags set */
 };
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 9f00da287f2..49d321f3ccd 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -55,8 +55,7 @@ struct nfgenmsg {
 #include <linux/capability.h>
 #include <net/netlink.h>
 
-struct nfnl_callback
-{
+struct nfnl_callback {
         int (*call)(struct sock *nl, struct sk_buff *skb, 
                     const struct nlmsghdr *nlh,
                     const struct nlattr * const cda[]);
@@ -64,8 +63,7 @@ struct nfnl_callback
         const u_int16_t attr_count;             /* number of nlattr's */
 };
 
-struct nfnetlink_subsystem
-{
+struct nfnetlink_subsystem {
         const char *name;
         __u8 subsys_id;                 /* nfnetlink subsystem ID */
         __u8 cb_count;                  /* number of callbacks */
diff --git a/include/linux/netfilter/nfnetlink_compat.h b/include/linux/netfilter/nfnetlink_compat.h
index eda55cabcee..ffb95036bbd 100644
--- a/include/linux/netfilter/nfnetlink_compat.h
+++ b/include/linux/netfilter/nfnetlink_compat.h
@@ -21,8 +21,7 @@
  * ! nfnetlink use the same attributes methods. - J. Schulist.
  */
 
-struct nfattr
-{
+struct nfattr {
         __u16 nfa_len;
         __u16 nfa_type; /* we use 15 bits for the type, and the highest
                                  * bit to indicate whether the payload is nested */
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 812cb153cab..378f27ae777 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -6,8 +6,7 @@
 #define XT_FUNCTION_MAXNAMELEN 30
 #define XT_TABLE_MAXNAMELEN 32
 
-struct xt_entry_match
-{
+struct xt_entry_match {
         union {
                 struct {
                         __u16 match_size;
@@ -31,8 +30,7 @@ struct xt_entry_match
         unsigned char data[0];
 };
 
-struct xt_entry_target
-{
+struct xt_entry_target {
         union {
                 struct {
                         __u16 target_size;
@@ -64,16 +62,14 @@ struct xt_entry_target
         },                                                                     \
 }
 
-struct xt_standard_target
-{
+struct xt_standard_target {
         struct xt_entry_target target;
         int verdict;
 };
 
 /* The argument to IPT_SO_GET_REVISION_*.  Returns highest revision
  * kernel supports, if >= revision. */
-struct xt_get_revision
-{
+struct xt_get_revision {
         char name[XT_FUNCTION_MAXNAMELEN-1];
 
         __u8 revision;
@@ -90,8 +86,7 @@ struct xt_get_revision
  * ip6t_entry and arpt_entry.  This sucks, and it is a hack.  It will be my
  * personal pleasure to remove it -HW
  */
-struct _xt_align
-{
+struct _xt_align {
         __u8 u8;
         __u16 u16;
         __u32 u32;
@@ -109,14 +104,12 @@ struct _xt_align
 #define SET_COUNTER(c,b,p) do { (c).bcnt = (b); (c).pcnt = (p); } while(0)
 #define ADD_COUNTER(c,b,p) do { (c).bcnt += (b); (c).pcnt += (p); } while(0)
 
-struct xt_counters
-{
+struct xt_counters {
         __u64 pcnt, bcnt;                       /* Packet and byte counters */
 };
 
 /* The argument to IPT_SO_ADD_COUNTERS. */
-struct xt_counters_info
-{
+struct xt_counters_info {
         /* Which table. */
         char name[XT_TABLE_MAXNAMELEN];
 
@@ -269,8 +262,7 @@ struct xt_tgdtor_param {
         u_int8_t family;
 };
 
-struct xt_match
-{
+struct xt_match {
         struct list_head list;
 
         const char name[XT_FUNCTION_MAXNAMELEN-1];
@@ -310,8 +302,7 @@ struct xt_match
 };
 
 /* Registration hooks for targets. */
-struct xt_target
-{
+struct xt_target {
         struct list_head list;
 
         const char name[XT_FUNCTION_MAXNAMELEN-1];
@@ -349,8 +340,7 @@ struct xt_target
 };
 
 /* Furniture shopping... */
-struct xt_table
-{
+struct xt_table {
         struct list_head list;
 
         /* What hooks you will enter on */
@@ -371,8 +361,7 @@ struct xt_table
 #include <linux/netfilter_ipv4.h>
 
 /* The table itself */
-struct xt_table_info
-{
+struct xt_table_info {
         /* Size per table */
         unsigned int size;
         /* Number of entries: FIXME. --RR */
@@ -528,8 +517,7 @@ static inline unsigned long ifname_compare_aligned(const char *_a,
 #ifdef CONFIG_COMPAT
 #include <net/compat.h>
 
-struct compat_xt_entry_match
-{
+struct compat_xt_entry_match {
         union {
                 struct {
                         u_int16_t match_size;
@@ -545,8 +533,7 @@ struct compat_xt_entry_match
         unsigned char data[0];
 };
 
-struct compat_xt_entry_target
-{
+struct compat_xt_entry_target {
         union {
                 struct {
                         u_int16_t target_size;
@@ -566,8 +553,7 @@ struct compat_xt_entry_target
  * need to change whole approach in order to calculate align as function of
  * current task alignment */
 
-struct compat_xt_counters
-{
+struct compat_xt_counters {
 #if defined(CONFIG_X86_64) || defined(CONFIG_IA64)
         u_int32_t cnt[4];
 #else
@@ -575,8 +561,7 @@ struct compat_xt_counters
 #endif
 };
 
-struct compat_xt_counters_info
-{
+struct compat_xt_counters_info {
         char name[XT_TABLE_MAXNAMELEN];
         compat_uint_t num_counters;
         struct compat_xt_counters counters[0];
diff --git a/include/linux/netfilter/xt_connbytes.h b/include/linux/netfilter/xt_connbytes.h
index 52bd6153b99..92fcbb0d193 100644
--- a/include/linux/netfilter/xt_connbytes.h
+++ b/include/linux/netfilter/xt_connbytes.h
@@ -15,8 +15,7 @@ enum xt_connbytes_direction {
         XT_CONNBYTES_DIR_BOTH,
 };
 
-struct xt_connbytes_info
-{
+struct xt_connbytes_info {
         struct {
                 aligned_u64 from;       /* count to be matched */
                 aligned_u64 to;         /* count to be matched */
diff --git a/include/linux/netfilter/xt_esp.h b/include/linux/netfilter/xt_esp.h
index ef6fa4747d0..ee688240800 100644
--- a/include/linux/netfilter/xt_esp.h
+++ b/include/linux/netfilter/xt_esp.h
@@ -3,8 +3,7 @@
 
 #include <linux/types.h>
 
-struct xt_esp
-{
+struct xt_esp {
         __u32 spis[2];  /* Security Parameter Index */
         __u8  invflags; /* Inverse flags */
 };
diff --git a/include/linux/netfilter/xt_multiport.h b/include/linux/netfilter/xt_multiport.h
index 185db499fcb..5b7e72dfffc 100644
--- a/include/linux/netfilter/xt_multiport.h
+++ b/include/linux/netfilter/xt_multiport.h
@@ -3,8 +3,7 @@
 
 #include <linux/types.h>
 
-enum xt_multiport_flags
-{
+enum xt_multiport_flags {
         XT_MULTIPORT_SOURCE,
         XT_MULTIPORT_DESTINATION,
         XT_MULTIPORT_EITHER
@@ -13,15 +12,13 @@ enum xt_multiport_flags
 #define XT_MULTI_PORTS  15
 
 /* Must fit inside union xt_matchinfo: 16 bytes */
-struct xt_multiport
-{
+struct xt_multiport {
         __u8 flags;                             /* Type of comparison */
         __u8 count;                             /* Number of ports */
         __u16 ports[XT_MULTI_PORTS];    /* Ports */
 };
 
-struct xt_multiport_v1
-{
+struct xt_multiport_v1 {
         __u8 flags;                             /* Type of comparison */
         __u8 count;                             /* Number of ports */
         __u16 ports[XT_MULTI_PORTS];    /* Ports */
diff --git a/include/linux/netfilter/xt_policy.h b/include/linux/netfilter/xt_policy.h
index 7bb64e7c853..be8ead05c31 100644
--- a/include/linux/netfilter/xt_policy.h
+++ b/include/linux/netfilter/xt_policy.h
@@ -5,22 +5,19 @@
 
 #define XT_POLICY_MAX_ELEM      4
 
-enum xt_policy_flags
-{
+enum xt_policy_flags {
         XT_POLICY_MATCH_IN      = 0x1,
         XT_POLICY_MATCH_OUT     = 0x2,
         XT_POLICY_MATCH_NONE    = 0x4,
         XT_POLICY_MATCH_STRICT  = 0x8,
 };
 
-enum xt_policy_modes
-{
+enum xt_policy_modes {
         XT_POLICY_MODE_TRANSPORT,
         XT_POLICY_MODE_TUNNEL
 };
 
-struct xt_policy_spec
-{
+struct xt_policy_spec {
         __u8    saddr:1,
                         daddr:1,
                         proto:1,
@@ -30,15 +27,13 @@ struct xt_policy_spec
 };
 
 #ifndef __KERNEL__
-union xt_policy_addr
-{
+union xt_policy_addr {
         struct in_addr  a4;
         struct in6_addr a6;
 };
 #endif
 
-struct xt_policy_elem
-{
+struct xt_policy_elem {
         union {
 #ifdef __KERNEL__
                 struct {
@@ -65,8 +60,7 @@ struct xt_policy_elem
         struct xt_policy_spec   invert;
 };
 
-struct xt_policy_info
-{
+struct xt_policy_info {
         struct xt_policy_elem pol[XT_POLICY_MAX_ELEM];
         __u16 flags;
         __u16 len;
diff --git a/include/linux/netfilter/xt_state.h b/include/linux/netfilter/xt_state.h
index c06f32edee0..7b32de88661 100644
--- a/include/linux/netfilter/xt_state.h
+++ b/include/linux/netfilter/xt_state.h
@@ -6,8 +6,7 @@
 
 #define XT_STATE_UNTRACKED (1 << (IP_CT_NUMBER + 1))
 
-struct xt_state_info
-{
+struct xt_state_info {
         unsigned int statemask;
 };
 #endif /*_XT_STATE_H*/
diff --git a/include/linux/netfilter/xt_string.h b/include/linux/netfilter/xt_string.h
index ecbb95fc89e..235347c02ea 100644
--- a/include/linux/netfilter/xt_string.h
+++ b/include/linux/netfilter/xt_string.h
@@ -11,8 +11,7 @@ enum {
         XT_STRING_FLAG_IGNORECASE       = 0x02
 };
 
-struct xt_string_info
-{
+struct xt_string_info {
         __u16 from_offset;
         __u16 to_offset;
         char      algo[XT_STRING_MAX_ALGO_NAME_SIZE];
diff --git a/include/linux/netfilter/xt_tcpudp.h b/include/linux/netfilter/xt_tcpudp.h
index a490a0bc1d2..38aa7b39902 100644
--- a/include/linux/netfilter/xt_tcpudp.h
+++ b/include/linux/netfilter/xt_tcpudp.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 
 /* TCP matching stuff */
-struct xt_tcp
-{
+struct xt_tcp {
         __u16 spts[2];                  /* Source port range. */
         __u16 dpts[2];                  /* Destination port range. */
         __u8 option;                    /* TCP Option iff non-zero*/
@@ -22,8 +21,7 @@ struct xt_tcp
 #define XT_TCP_INV_MASK         0x0F    /* All possible flags. */
 
 /* UDP matching stuff */
-struct xt_udp
-{
+struct xt_udp {
         __u16 spts[2];                  /* Source port range. */
         __u16 dpts[2];                  /* Destination port range. */
         __u8 invflags;                  /* Inverse flags */
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
index 6fe3e6aa10d..f2336523a9d 100644
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
@@ -132,8 +132,7 @@ struct arpt_entry
 #define ARPT_RETURN XT_RETURN
 
 /* The argument to ARPT_SO_GET_INFO */
-struct arpt_getinfo
-{
+struct arpt_getinfo {
         /* Which table: caller fills this in. */
         char name[ARPT_TABLE_MAXNAMELEN];
 
@@ -155,8 +154,7 @@ struct arpt_getinfo
 };
 
 /* The argument to ARPT_SO_SET_REPLACE. */
-struct arpt_replace
-{
+struct arpt_replace {
         /* Which table. */
         char name[ARPT_TABLE_MAXNAMELEN];
 
@@ -191,8 +189,7 @@ struct arpt_replace
 #define arpt_counters xt_counters
 
 /* The argument to ARPT_SO_GET_ENTRIES. */
-struct arpt_get_entries
-{
+struct arpt_get_entries {
         /* Which table: user fills this in. */
         char name[ARPT_TABLE_MAXNAMELEN];
 
@@ -224,20 +221,17 @@ static __inline__ struct arpt_entry_target *arpt_get_target(struct arpt_entry *e
 #ifdef __KERNEL__
 
 /* Standard entry. */
-struct arpt_standard
-{
+struct arpt_standard {
         struct arpt_entry entry;
         struct arpt_standard_target target;
 };
 
-struct arpt_error_target
-{
+struct arpt_error_target {
         struct arpt_entry_target target;
         char errorname[ARPT_FUNCTION_MAXNAMELEN];
 };
 
-struct arpt_error
-{
+struct arpt_error {
         struct arpt_entry entry;
         struct arpt_error_target target;
 };
@@ -279,8 +273,7 @@ extern unsigned int arpt_do_table(struct sk_buff *skb,
 #ifdef CONFIG_COMPAT
 #include <net/compat.h>
 
-struct compat_arpt_entry
-{
+struct compat_arpt_entry {
         struct arpt_arp arp;
         u_int16_t target_offset;
         u_int16_t next_offset;
diff --git a/include/linux/netfilter_bridge/ebt_802_3.h b/include/linux/netfilter_bridge/ebt_802_3.h
index a11b0c2017f..c73ef0b18bd 100644
--- a/include/linux/netfilter_bridge/ebt_802_3.h
+++ b/include/linux/netfilter_bridge/ebt_802_3.h
@@ -58,8 +58,7 @@ static inline struct ebt_802_3_hdr *ebt_802_3_hdr(const struct sk_buff *skb)
 }
 #endif
 
-struct ebt_802_3_info 
-{
+struct ebt_802_3_info {
         uint8_t  sap;
         __be16 type;
         uint8_t  bitmask;
diff --git a/include/linux/netfilter_bridge/ebt_among.h b/include/linux/netfilter_bridge/ebt_among.h
index 7654069233c..0009558609a 100644
--- a/include/linux/netfilter_bridge/ebt_among.h
+++ b/include/linux/netfilter_bridge/ebt_among.h
@@ -29,14 +29,12 @@
  * Yes, it is a memory overhead, but in 2003 AD, who cares?
  */
 
-struct ebt_mac_wormhash_tuple
-{
+struct ebt_mac_wormhash_tuple {
         uint32_t cmp[2];
         __be32 ip;
 };
 
-struct ebt_mac_wormhash
-{
+struct ebt_mac_wormhash {
         int table[257];
         int poolsize;
         struct ebt_mac_wormhash_tuple pool[0];
@@ -45,8 +43,7 @@ struct ebt_mac_wormhash
 #define ebt_mac_wormhash_size(x) ((x) ? sizeof(struct ebt_mac_wormhash) \
                 + (x)->poolsize * sizeof(struct ebt_mac_wormhash_tuple) : 0)
 
-struct ebt_among_info
-{
+struct ebt_among_info {
         int wh_dst_ofs;
         int wh_src_ofs;
         int bitmask;
diff --git a/include/linux/netfilter_bridge/ebt_arpreply.h b/include/linux/netfilter_bridge/ebt_arpreply.h
index 96a8339960e..7e77896e1fb 100644
--- a/include/linux/netfilter_bridge/ebt_arpreply.h
+++ b/include/linux/netfilter_bridge/ebt_arpreply.h
@@ -1,8 +1,7 @@
 #ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H
 #define __LINUX_BRIDGE_EBT_ARPREPLY_H
 
-struct ebt_arpreply_info
-{
+struct ebt_arpreply_info {
         unsigned char mac[ETH_ALEN];
         int target;
 };
diff --git a/include/linux/netfilter_bridge/ebt_ip.h b/include/linux/netfilter_bridge/ebt_ip.h
index d6847475bf2..6a708fb9224 100644
--- a/include/linux/netfilter_bridge/ebt_ip.h
+++ b/include/linux/netfilter_bridge/ebt_ip.h
@@ -26,8 +26,7 @@
 #define EBT_IP_MATCH "ip"
 
 /* the same values are used for the invflags */
-struct ebt_ip_info
-{
+struct ebt_ip_info {
         __be32 saddr;
         __be32 daddr;
         __be32 smsk;
diff --git a/include/linux/netfilter_bridge/ebt_ip6.h b/include/linux/netfilter_bridge/ebt_ip6.h
index 2273c3ae33c..e5de9870151 100644
--- a/include/linux/netfilter_bridge/ebt_ip6.h
+++ b/include/linux/netfilter_bridge/ebt_ip6.h
@@ -23,8 +23,7 @@
 #define EBT_IP6_MATCH "ip6"
 
 /* the same values are used for the invflags */
-struct ebt_ip6_info
-{
+struct ebt_ip6_info {
         struct in6_addr saddr;
         struct in6_addr daddr;
         struct in6_addr smsk;
diff --git a/include/linux/netfilter_bridge/ebt_limit.h b/include/linux/netfilter_bridge/ebt_limit.h
index d8b65000afe..4bf76b75167 100644
--- a/include/linux/netfilter_bridge/ebt_limit.h
+++ b/include/linux/netfilter_bridge/ebt_limit.h
@@ -9,8 +9,7 @@
 /* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
    seconds, or one every 59 hours. */
 
-struct ebt_limit_info
-{
+struct ebt_limit_info {
         u_int32_t avg;    /* Average secs between packets * scale */
         u_int32_t burst;  /* Period multiplier for upper limit. */
 
diff --git a/include/linux/netfilter_bridge/ebt_log.h b/include/linux/netfilter_bridge/ebt_log.h
index b76e653157e..cc2cdfb764b 100644
--- a/include/linux/netfilter_bridge/ebt_log.h
+++ b/include/linux/netfilter_bridge/ebt_log.h
@@ -9,8 +9,7 @@
 #define EBT_LOG_PREFIX_SIZE 30
 #define EBT_LOG_WATCHER "log"
 
-struct ebt_log_info
-{
+struct ebt_log_info {
         uint8_t loglevel;
         uint8_t prefix[EBT_LOG_PREFIX_SIZE];
         uint32_t bitmask;
diff --git a/include/linux/netfilter_bridge/ebt_mark_m.h b/include/linux/netfilter_bridge/ebt_mark_m.h
index 301524ff106..9ceb10ec0ed 100644
--- a/include/linux/netfilter_bridge/ebt_mark_m.h
+++ b/include/linux/netfilter_bridge/ebt_mark_m.h
@@ -4,8 +4,7 @@
 #define EBT_MARK_AND 0x01
 #define EBT_MARK_OR 0x02
 #define EBT_MARK_MASK (EBT_MARK_AND | EBT_MARK_OR)
-struct ebt_mark_m_info
-{
+struct ebt_mark_m_info {
         unsigned long mark, mask;
         uint8_t invert;
         uint8_t bitmask;
diff --git a/include/linux/netfilter_bridge/ebt_mark_t.h b/include/linux/netfilter_bridge/ebt_mark_t.h
index 6270f6f3369..7d5a268a431 100644
--- a/include/linux/netfilter_bridge/ebt_mark_t.h
+++ b/include/linux/netfilter_bridge/ebt_mark_t.h
@@ -13,8 +13,7 @@
 #define MARK_AND_VALUE (0xffffffd0)
 #define MARK_XOR_VALUE (0xffffffc0)
 
-struct ebt_mark_t_info
-{
+struct ebt_mark_t_info {
         unsigned long mark;
         /* EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN */
         int target;
diff --git a/include/linux/netfilter_bridge/ebt_nat.h b/include/linux/netfilter_bridge/ebt_nat.h
index 435b886a51a..5e74e3b03bd 100644
--- a/include/linux/netfilter_bridge/ebt_nat.h
+++ b/include/linux/netfilter_bridge/ebt_nat.h
@@ -2,8 +2,7 @@
 #define __LINUX_BRIDGE_EBT_NAT_H
 
 #define NAT_ARP_BIT  (0x00000010)
-struct ebt_nat_info
-{
+struct ebt_nat_info {
         unsigned char mac[ETH_ALEN];
         /* EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN */
         int target;
diff --git a/include/linux/netfilter_bridge/ebt_pkttype.h b/include/linux/netfilter_bridge/ebt_pkttype.h
index 0d64bbb29c6..51a79984093 100644
--- a/include/linux/netfilter_bridge/ebt_pkttype.h
+++ b/include/linux/netfilter_bridge/ebt_pkttype.h
@@ -1,8 +1,7 @@
 #ifndef __LINUX_BRIDGE_EBT_PKTTYPE_H
 #define __LINUX_BRIDGE_EBT_PKTTYPE_H
 
-struct ebt_pkttype_info
-{
+struct ebt_pkttype_info {
         uint8_t pkt_type;
         uint8_t invert;
 };
diff --git a/include/linux/netfilter_bridge/ebt_redirect.h b/include/linux/netfilter_bridge/ebt_redirect.h
index 5c67990fce3..dd9622ce848 100644
--- a/include/linux/netfilter_bridge/ebt_redirect.h
+++ b/include/linux/netfilter_bridge/ebt_redirect.h
@@ -1,8 +1,7 @@
 #ifndef __LINUX_BRIDGE_EBT_REDIRECT_H
 #define __LINUX_BRIDGE_EBT_REDIRECT_H
 
-struct ebt_redirect_info
-{
+struct ebt_redirect_info {
         /* EBT_ACCEPT, EBT_DROP, EBT_CONTINUE or EBT_RETURN */
         int target;
 };
diff --git a/include/linux/netfilter_bridge/ebt_stp.h b/include/linux/netfilter_bridge/ebt_stp.h
index e5fd67850f4..e503a0aa272 100644
--- a/include/linux/netfilter_bridge/ebt_stp.h
+++ b/include/linux/netfilter_bridge/ebt_stp.h
@@ -20,8 +20,7 @@
 
 #define EBT_STP_MATCH "stp"
 
-struct ebt_stp_config_info
-{
+struct ebt_stp_config_info {
         uint8_t flags;
         uint16_t root_priol, root_priou;
         char root_addr[6], root_addrmsk[6];
@@ -35,8 +34,7 @@ struct ebt_stp_config_info
         uint16_t forward_delayl, forward_delayu;
 };
 
-struct ebt_stp_info
-{
+struct ebt_stp_info {
         uint8_t type;
         struct ebt_stp_config_info config;
         uint16_t bitmask;
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h
index ea281e6a204..3cc40c131cc 100644
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
@@ -34,14 +34,12 @@
 struct xt_match;
 struct xt_target;
 
-struct ebt_counter
-{
+struct ebt_counter {
         uint64_t pcnt;
         uint64_t bcnt;
 };
 
-struct ebt_replace
-{
+struct ebt_replace {
         char name[EBT_TABLE_MAXNAMELEN];
         unsigned int valid_hooks;
         /* nr of rules in the table */
@@ -57,8 +55,7 @@ struct ebt_replace
         char __user *entries;
 };
 
-struct ebt_replace_kernel
-{
+struct ebt_replace_kernel {
         char name[EBT_TABLE_MAXNAMELEN];
         unsigned int valid_hooks;
         /* nr of rules in the table */
@@ -120,8 +117,7 @@ struct ebt_entries {
 #define EBT_INV_MASK (EBT_IPROTO | EBT_IIN | EBT_IOUT | EBT_ILOGICALIN \
    | EBT_ILOGICALOUT | EBT_ISOURCE | EBT_IDEST)
 
-struct ebt_entry_match
-{
+struct ebt_entry_match {
         union {
                 char name[EBT_FUNCTION_MAXNAMELEN];
                 struct xt_match *match;
@@ -131,8 +127,7 @@ struct ebt_entry_match
         unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
 };
 
-struct ebt_entry_watcher
-{
+struct ebt_entry_watcher {
         union {
                 char name[EBT_FUNCTION_MAXNAMELEN];
                 struct xt_target *watcher;
@@ -142,8 +137,7 @@ struct ebt_entry_watcher
         unsigned char data[0] __attribute__ ((aligned (__alignof__(struct ebt_replace))));
 };
 
-struct ebt_entry_target
-{
+struct ebt_entry_target {
         union {
                 char name[EBT_FUNCTION_MAXNAMELEN];
                 struct xt_target *target;
@@ -154,8 +148,7 @@ struct ebt_entry_target
 };
 
 #define EBT_STANDARD_TARGET "standard"
-struct ebt_standard_target
-{
+struct ebt_standard_target {
         struct ebt_entry_target target;
         int verdict;
 };
@@ -206,8 +199,7 @@ struct ebt_entry {
 #define EBT_MATCH 0
 #define EBT_NOMATCH 1
 
-struct ebt_match
-{
+struct ebt_match {
         struct list_head list;
         const char name[EBT_FUNCTION_MAXNAMELEN];
         bool (*match)(const struct sk_buff *skb, const struct net_device *in,
@@ -224,8 +216,7 @@ struct ebt_match
         struct module *me;
 };
 
-struct ebt_watcher
-{
+struct ebt_watcher {
         struct list_head list;
         const char name[EBT_FUNCTION_MAXNAMELEN];
         unsigned int (*target)(struct sk_buff *skb,
@@ -242,8 +233,7 @@ struct ebt_watcher
         struct module *me;
 };
 
-struct ebt_target
-{
+struct ebt_target {
         struct list_head list;
         const char name[EBT_FUNCTION_MAXNAMELEN];
         /* returns one of the standard EBT_* verdicts */
@@ -262,15 +252,13 @@ struct ebt_target
 };
 
 /* used for jumping from and into user defined chains (udc) */
-struct ebt_chainstack
-{
+struct ebt_chainstack {
         struct ebt_entries *chaininfo; /* pointer to chain data */
         struct ebt_entry *e; /* pointer to entry data */
         unsigned int n; /* n'th entry */
 };
 
-struct ebt_table_info
-{
+struct ebt_table_info {
         /* total size of the entries */
         unsigned int entries_size;
         unsigned int nentries;
@@ -282,8 +270,7 @@ struct ebt_table_info
         struct ebt_counter counters[0] ____cacheline_aligned;
 };
 
-struct ebt_table
-{
+struct ebt_table {
         struct list_head list;
         char name[EBT_TABLE_MAXNAMELEN];
         struct ebt_replace_kernel *table;
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 61fafc868a7..27b3f580730 100644
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -76,8 +76,7 @@ struct ipt_ip {
 /* This structure defines each of the firewall rules.  Consists of 3
    parts which are 1) general IP header stuff 2) match specific
    stuff 3) the target to perform if the rule matches */
-struct ipt_entry
-{
+struct ipt_entry {
         struct ipt_ip ip;
 
         /* Mark with fields that we care about. */
@@ -135,8 +134,7 @@ struct ipt_entry
 #define IPT_UDP_INV_MASK        XT_UDP_INV_MASK
 
 /* ICMP matching stuff */
-struct ipt_icmp
-{
+struct ipt_icmp {
         u_int8_t type;                          /* type to match */
         u_int8_t code[2];                       /* range of code */
         u_int8_t invflags;                      /* Inverse flags */
@@ -146,8 +144,7 @@ struct ipt_icmp
 #define IPT_ICMP_INV    0x01    /* Invert the sense of type/code test */
 
 /* The argument to IPT_SO_GET_INFO */
-struct ipt_getinfo
-{
+struct ipt_getinfo {
         /* Which table: caller fills this in. */
         char name[IPT_TABLE_MAXNAMELEN];
 
@@ -169,8 +166,7 @@ struct ipt_getinfo
 };
 
 /* The argument to IPT_SO_SET_REPLACE. */
-struct ipt_replace
-{
+struct ipt_replace {
         /* Which table. */
         char name[IPT_TABLE_MAXNAMELEN];
 
@@ -204,8 +200,7 @@ struct ipt_replace
 #define ipt_counters_info xt_counters_info
 
 /* The argument to IPT_SO_GET_ENTRIES. */
-struct ipt_get_entries
-{
+struct ipt_get_entries {
         /* Which table: user fills this in. */
         char name[IPT_TABLE_MAXNAMELEN];
 
@@ -250,20 +245,17 @@ extern struct xt_table *ipt_register_table(struct net *net,
 extern void ipt_unregister_table(struct xt_table *table);
 
 /* Standard entry. */
-struct ipt_standard
-{
+struct ipt_standard {
         struct ipt_entry entry;
         struct ipt_standard_target target;
 };
 
-struct ipt_error_target
-{
+struct ipt_error_target {
         struct ipt_entry_target target;
         char errorname[IPT_FUNCTION_MAXNAMELEN];
 };
 
-struct ipt_error
-{
+struct ipt_error {
         struct ipt_entry entry;
         struct ipt_error_target target;
 };
@@ -301,8 +293,7 @@ extern unsigned int ipt_do_table(struct sk_buff *skb,
 #ifdef CONFIG_COMPAT
 #include <net/compat.h>
 
-struct compat_ipt_entry
-{
+struct compat_ipt_entry {
         struct ipt_ip ip;
         compat_uint_t nfcache;
         u_int16_t target_offset;
diff --git a/include/linux/netfilter_ipv4/ipt_SAME.h b/include/linux/netfilter_ipv4/ipt_SAME.h
index be6e682a85e..2529660c5b3 100644
--- a/include/linux/netfilter_ipv4/ipt_SAME.h
+++ b/include/linux/netfilter_ipv4/ipt_SAME.h
@@ -5,8 +5,7 @@
 
 #define IPT_SAME_NODST          0x01
 
-struct ipt_same_info
-{
+struct ipt_same_info {
         unsigned char info;
         u_int32_t rangesize;
         u_int32_t ipnum;
diff --git a/include/linux/netfilter_ipv4/ipt_ah.h b/include/linux/netfilter_ipv4/ipt_ah.h
index 7b9a2ac7adb..2e555b4d05e 100644
--- a/include/linux/netfilter_ipv4/ipt_ah.h
+++ b/include/linux/netfilter_ipv4/ipt_ah.h
@@ -1,8 +1,7 @@
 #ifndef _IPT_AH_H
 #define _IPT_AH_H
 
-struct ipt_ah
-{
+struct ipt_ah {
         u_int32_t spis[2];                      /* Security Parameter Index */
         u_int8_t  invflags;                     /* Inverse flags */
 };
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index a64e1451ac3..b31050d20ae 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -88,8 +88,7 @@ struct ip6t_ip6 {
 /* This structure defines each of the firewall rules.  Consists of 3
    parts which are 1) general IP header stuff 2) match specific
    stuff 3) the target to perform if the rule matches */
-struct ip6t_entry
-{
+struct ip6t_entry {
         struct ip6t_ip6 ipv6;
 
         /* Mark with fields that we care about. */
@@ -111,20 +110,17 @@ struct ip6t_entry
 };
 
 /* Standard entry */
-struct ip6t_standard
-{
+struct ip6t_standard {
         struct ip6t_entry entry;
         struct ip6t_standard_target target;
 };
 
-struct ip6t_error_target
-{
+struct ip6t_error_target {
         struct ip6t_entry_target target;
         char errorname[IP6T_FUNCTION_MAXNAMELEN];
 };
 
-struct ip6t_error
-{
+struct ip6t_error {
         struct ip6t_entry entry;
         struct ip6t_error_target target;
 };
@@ -195,8 +191,7 @@ struct ip6t_error
 #define IP6T_UDP_INV_MASK       XT_UDP_INV_MASK
 
 /* ICMP matching stuff */
-struct ip6t_icmp
-{
+struct ip6t_icmp {
         u_int8_t type;                          /* type to match */
         u_int8_t code[2];                       /* range of code */
         u_int8_t invflags;                      /* Inverse flags */
@@ -206,8 +201,7 @@ struct ip6t_icmp
 #define IP6T_ICMP_INV   0x01    /* Invert the sense of type/code test */
 
 /* The argument to IP6T_SO_GET_INFO */
-struct ip6t_getinfo
-{
+struct ip6t_getinfo {
         /* Which table: caller fills this in. */
         char name[IP6T_TABLE_MAXNAMELEN];
 
@@ -229,8 +223,7 @@ struct ip6t_getinfo
 };
 
 /* The argument to IP6T_SO_SET_REPLACE. */
-struct ip6t_replace
-{
+struct ip6t_replace {
         /* Which table. */
         char name[IP6T_TABLE_MAXNAMELEN];
 
@@ -264,8 +257,7 @@ struct ip6t_replace
 #define ip6t_counters_info xt_counters_info
 
 /* The argument to IP6T_SO_GET_ENTRIES. */
-struct ip6t_get_entries
-{
+struct ip6t_get_entries {
         /* Which table: user fills this in. */
         char name[IP6T_TABLE_MAXNAMELEN];
 
@@ -330,8 +322,7 @@ extern int ip6_masked_addrcmp(const struct in6_addr *addr1,
 #ifdef CONFIG_COMPAT
 #include <net/compat.h>
 
-struct compat_ip6t_entry
-{
+struct compat_ip6t_entry {
         struct ip6t_ip6 ipv6;
         compat_uint_t nfcache;
         u_int16_t target_offset;
diff --git a/include/linux/netfilter_ipv6/ip6t_ah.h b/include/linux/netfilter_ipv6/ip6t_ah.h
index 8531879eb46..17a745cfb2c 100644
--- a/include/linux/netfilter_ipv6/ip6t_ah.h
+++ b/include/linux/netfilter_ipv6/ip6t_ah.h
@@ -1,8 +1,7 @@
 #ifndef _IP6T_AH_H
 #define _IP6T_AH_H
 
-struct ip6t_ah
-{
+struct ip6t_ah {
         u_int32_t spis[2];                      /* Security Parameter Index */
         u_int32_t hdrlen;                       /* Header Length */
         u_int8_t  hdrres;                       /* Test of the Reserved Filed */
diff --git a/include/linux/netfilter_ipv6/ip6t_frag.h b/include/linux/netfilter_ipv6/ip6t_frag.h
index 66070a0d6df..3724d085092 100644
--- a/include/linux/netfilter_ipv6/ip6t_frag.h
+++ b/include/linux/netfilter_ipv6/ip6t_frag.h
@@ -1,8 +1,7 @@
 #ifndef _IP6T_FRAG_H
 #define _IP6T_FRAG_H
 
-struct ip6t_frag
-{
+struct ip6t_frag {
         u_int32_t ids[2];                       /* Security Parameter Index */
         u_int32_t hdrlen;                       /* Header Length */
         u_int8_t  flags;                        /*  */
diff --git a/include/linux/netfilter_ipv6/ip6t_ipv6header.h b/include/linux/netfilter_ipv6/ip6t_ipv6header.h
index 51c53fc9c44..01dfd445596 100644
--- a/include/linux/netfilter_ipv6/ip6t_ipv6header.h
+++ b/include/linux/netfilter_ipv6/ip6t_ipv6header.h
@@ -8,8 +8,7 @@ on whether they contain certain headers */
 #ifndef __IPV6HEADER_H
 #define __IPV6HEADER_H
 
-struct ip6t_ipv6header_info
-{
+struct ip6t_ipv6header_info {
         u_int8_t matchflags;
         u_int8_t invflags;
         u_int8_t modeflag;
diff --git a/include/linux/netfilter_ipv6/ip6t_mh.h b/include/linux/netfilter_ipv6/ip6t_mh.h
index b9ca9a5f74d..18549bca2d1 100644
--- a/include/linux/netfilter_ipv6/ip6t_mh.h
+++ b/include/linux/netfilter_ipv6/ip6t_mh.h
@@ -2,8 +2,7 @@
 #define _IP6T_MH_H
 
 /* MH matching stuff */
-struct ip6t_mh
-{
+struct ip6t_mh {
         u_int8_t types[2];      /* MH type range */
         u_int8_t invflags;      /* Inverse flags */
 };
diff --git a/include/linux/netfilter_ipv6/ip6t_opts.h b/include/linux/netfilter_ipv6/ip6t_opts.h
index a07e36380ae..62d89bcd9f9 100644
--- a/include/linux/netfilter_ipv6/ip6t_opts.h
+++ b/include/linux/netfilter_ipv6/ip6t_opts.h
@@ -3,8 +3,7 @@
 
 #define IP6T_OPTS_OPTSNR 16
 
-struct ip6t_opts
-{
+struct ip6t_opts {
         u_int32_t hdrlen;                       /* Header Length */
         u_int8_t flags;                         /*  */
         u_int8_t invflags;                      /* Inverse flags */
diff --git a/include/linux/netfilter_ipv6/ip6t_rt.h b/include/linux/netfilter_ipv6/ip6t_rt.h
index 52156023e8d..ab91bfd2cd0 100644
--- a/include/linux/netfilter_ipv6/ip6t_rt.h
+++ b/include/linux/netfilter_ipv6/ip6t_rt.h
@@ -5,8 +5,7 @@
 
 #define IP6T_RT_HOPS 16
 
-struct ip6t_rt
-{
+struct ip6t_rt {
         u_int32_t rt_type;                      /* Routing Type */
         u_int32_t segsleft[2];                  /* Segments Left */
         u_int32_t hdrlen;                       /* Header Length */
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index ab5d3126831..fde27c01732 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -29,16 +29,14 @@
 
 struct net;
 
-struct sockaddr_nl
-{
+struct sockaddr_nl {
         sa_family_t     nl_family;      /* AF_NETLINK   */
         unsigned short  nl_pad;         /* zero         */
         __u32           nl_pid;         /* port ID      */
         __u32           nl_groups;      /* multicast groups mask */
 };
 
-struct nlmsghdr
-{
+struct nlmsghdr {
         __u32           nlmsg_len;      /* Length of message including header */
         __u16           nlmsg_type;     /* Message content */
         __u16           nlmsg_flags;    /* Additional flags */
@@ -94,8 +92,7 @@ struct nlmsghdr
 
 #define NLMSG_MIN_TYPE          0x10    /* < 0x10: reserved control messages */
 
-struct nlmsgerr
-{
+struct nlmsgerr {
         int             error;
         struct nlmsghdr msg;
 };
@@ -106,8 +103,7 @@ struct nlmsgerr
 #define NETLINK_BROADCAST_ERROR 4
 #define NETLINK_NO_ENOBUFS      5
 
-struct nl_pktinfo
-{
+struct nl_pktinfo {
         __u32   group;
 };
 
@@ -127,8 +123,7 @@ enum {
  *  <-------------- nlattr->nla_len -------------->
  */
 
-struct nlattr
-{
+struct nlattr {
         __u16           nla_len;
         __u16           nla_type;
 };
@@ -161,8 +156,7 @@ static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb)
         return (struct nlmsghdr *)skb->data;
 }
 
-struct netlink_skb_parms
-{
+struct netlink_skb_parms {
         struct ucred            creds;          /* Skb credentials      */
         __u32                   pid;
         __u32                   dst_group;
@@ -220,8 +214,7 @@ int netlink_sendskb(struct sock *sk, struct sk_buff *skb);
 #define NLMSG_DEFAULT_SIZE (NLMSG_GOODSIZE - NLMSG_HDRLEN)
 
 
-struct netlink_callback
-{
+struct netlink_callback {
         struct sk_buff          *skb;
         const struct nlmsghdr   *nlh;
         int                     (*dump)(struct sk_buff * skb,
@@ -231,8 +224,7 @@ struct netlink_callback
         long                    args[6];
 };
 
-struct netlink_notify
-{
+struct netlink_notify {
         struct net *net;
         int pid;
         int protocol;
diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h
index 79fec6af3f9..ce520402e84 100644
--- a/include/linux/nilfs2_fs.h
+++ b/include/linux/nilfs2_fs.h
@@ -425,15 +425,6 @@ struct nilfs_dat_entry {
 };
 
 /**
- * struct nilfs_dat_group_desc - block group descriptor
- * @dg_nfrees: number of free virtual block numbers in block group
- */
-struct nilfs_dat_group_desc {
-        __le32 dg_nfrees;
-};
-
-
-/**
  * struct nilfs_snapshot_list - snapshot list
  * @ssl_next: next checkpoint number on snapshot list
  * @ssl_prev: previous checkpoint number on snapshot list
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index a8d71ed43a0..da8ea2e1927 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -160,6 +160,11 @@
  * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
  *      partial scan results may be available
  *
+ * @NL80211_CMD_GET_SURVEY: get survey resuls, e.g. channel occupation
+ *      or noise level
+ * @NL80211_CMD_NEW_SURVEY_RESULTS: survey data notification (as a reply to
+ *      NL80211_CMD_GET_SURVEY and on the "scan" multicast group)
+ *
  * @NL80211_CMD_REG_CHANGE: indicates to userspace the regulatory domain
  *      has been changed and provides details of the request information
  *      that caused the change such as who initiated the regulatory request
@@ -341,6 +346,13 @@ enum nl80211_commands {
 
         NL80211_CMD_SET_WIPHY_NETNS,
 
+        NL80211_CMD_GET_SURVEY,
+        NL80211_CMD_NEW_SURVEY_RESULTS,
+
+        NL80211_CMD_SET_PMKSA,
+        NL80211_CMD_DEL_PMKSA,
+        NL80211_CMD_FLUSH_PMKSA,
+
         /* add new commands above here */
 
         /* used to define NL80211_CMD_MAX below */
@@ -584,6 +596,16 @@ enum nl80211_commands {
  *      changed then the list changed and the dump should be repeated
  *      completely from scratch.
  *
+ * @NL80211_ATTR_4ADDR: Use 4-address frames on a virtual interface
+ *
+ * @NL80211_ATTR_SURVEY_INFO: survey information about a channel, part of
+ *      the survey response for %NL80211_CMD_GET_SURVEY, nested attribute
+ *      containing info as possible, see &enum survey_info.
+ *
+ * @NL80211_ATTR_PMKID: PMK material for PMKSA caching.
+ * @NL80211_ATTR_MAX_NUM_PMKIDS: maximum number of PMKIDs a firmware can
+ *      cache, a wiphy attribute.
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -714,6 +736,13 @@ enum nl80211_attrs {
 
         NL80211_ATTR_PID,
 
+        NL80211_ATTR_4ADDR,
+
+        NL80211_ATTR_SURVEY_INFO,
+
+        NL80211_ATTR_PMKID,
+        NL80211_ATTR_MAX_NUM_PMKIDS,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -895,14 +924,14 @@ enum nl80211_sta_info {
  *
  * @NL80211_MPATH_FLAG_ACTIVE: the mesh path is active
  * @NL80211_MPATH_FLAG_RESOLVING: the mesh path discovery process is running
- * @NL80211_MPATH_FLAG_DSN_VALID: the mesh path contains a valid DSN
+ * @NL80211_MPATH_FLAG_SN_VALID: the mesh path contains a valid SN
  * @NL80211_MPATH_FLAG_FIXED: the mesh path has been manually set
  * @NL80211_MPATH_FLAG_RESOLVED: the mesh path discovery process succeeded
  */
 enum nl80211_mpath_flags {
         NL80211_MPATH_FLAG_ACTIVE =     1<<0,
         NL80211_MPATH_FLAG_RESOLVING =  1<<1,
-        NL80211_MPATH_FLAG_DSN_VALID =  1<<2,
+        NL80211_MPATH_FLAG_SN_VALID =   1<<2,
         NL80211_MPATH_FLAG_FIXED =      1<<3,
         NL80211_MPATH_FLAG_RESOLVED =   1<<4,
 };
@@ -915,7 +944,7 @@ enum nl80211_mpath_flags {
  *
  * @__NL80211_MPATH_INFO_INVALID: attribute number 0 is reserved
  * @NL80211_ATTR_MPATH_FRAME_QLEN: number of queued frames for this destination
- * @NL80211_ATTR_MPATH_DSN: destination sequence number
+ * @NL80211_ATTR_MPATH_SN: destination sequence number
  * @NL80211_ATTR_MPATH_METRIC: metric (cost) of this mesh path
  * @NL80211_ATTR_MPATH_EXPTIME: expiration time for the path, in msec from now
  * @NL80211_ATTR_MPATH_FLAGS: mesh path flags, enumerated in
@@ -926,7 +955,7 @@ enum nl80211_mpath_flags {
 enum nl80211_mpath_info {
         __NL80211_MPATH_INFO_INVALID,
         NL80211_MPATH_INFO_FRAME_QLEN,
-        NL80211_MPATH_INFO_DSN,
+        NL80211_MPATH_INFO_SN,
         NL80211_MPATH_INFO_METRIC,
         NL80211_MPATH_INFO_EXPTIME,
         NL80211_MPATH_INFO_FLAGS,
@@ -1117,6 +1146,26 @@ enum nl80211_reg_rule_flags {
 };
 
 /**
+ * enum nl80211_survey_info - survey information
+ *
+ * These attribute types are used with %NL80211_ATTR_SURVEY_INFO
+ * when getting information about a survey.
+ *
+ * @__NL80211_SURVEY_INFO_INVALID: attribute number 0 is reserved
+ * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel
+ * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm)
+ */
+enum nl80211_survey_info {
+        __NL80211_SURVEY_INFO_INVALID,
+        NL80211_SURVEY_INFO_FREQUENCY,
+        NL80211_SURVEY_INFO_NOISE,
+
+        /* keep last */
+        __NL80211_SURVEY_INFO_AFTER_LAST,
+        NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 1
+};
+
+/**
  * enum nl80211_mntr_flags - monitor configuration flags
  *
  * Monitor configuration flags.
@@ -1196,6 +1245,8 @@ enum nl80211_mntr_flags {
  * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
  * that it takes for an HWMP information element to propagate across the mesh
  *
+ * @NL80211_MESHCONF_ROOTMODE: whether root mode is enabled or not
+ *
  * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
  *
  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
@@ -1215,6 +1266,7 @@ enum nl80211_meshconf_params {
         NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
         NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
         NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
+        NL80211_MESHCONF_HWMP_ROOTMODE,
 
         /* keep last */
         __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -1277,6 +1329,7 @@ enum nl80211_channel_type {
  * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon
  *      in unspecified units, scaled to 0..100 (u8)
  * @NL80211_BSS_STATUS: status, if this BSS is "used"
+ * @NL80211_BSS_SEEN_MS_AGO: age of this BSS entry in ms
  * @__NL80211_BSS_AFTER_LAST: internal
  * @NL80211_BSS_MAX: highest BSS attribute
  */
@@ -1291,6 +1344,7 @@ enum nl80211_bss {
         NL80211_BSS_SIGNAL_MBM,
         NL80211_BSS_SIGNAL_UNSPEC,
         NL80211_BSS_STATUS,
+        NL80211_BSS_SEEN_MS_AGO,
 
         /* keep last */
         __NL80211_BSS_AFTER_LAST,
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h
index b7d9435d5a9..33d9f517510 100644
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
@@ -65,6 +65,9 @@ enum {
         IEEE802154_ATTR_SEC,
 
         IEEE802154_ATTR_PAGE,
+        IEEE802154_ATTR_CHANNEL_PAGE_LIST,
+
+        IEEE802154_ATTR_PHY_NAME,
 
         __IEEE802154_ATTR_MAX,
 };
@@ -114,6 +117,9 @@ enum {
         IEEE802154_RX_ENABLE_CONF, /* Not supported yet */
 
         IEEE802154_LIST_IFACE,
+        IEEE802154_LIST_PHY,
+        IEEE802154_ADD_IFACE,
+        IEEE802154_DEL_IFACE,
 
         __IEEE802154_CMD_MAX,
 };
diff --git a/include/linux/notifier.h b/include/linux/notifier.h
index 44428d247db..fee6c2f6807 100644
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
@@ -201,6 +201,8 @@ static inline int notifier_to_errno(int ret)
 #define NETDEV_PRE_UP           0x000D
 #define NETDEV_BONDING_OLDTYPE  0x000E
 #define NETDEV_BONDING_NEWTYPE  0x000F
+#define NETDEV_POST_INIT        0x0010
+#define NETDEV_UNREGISTER_BATCH 0x0011
 
 #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 7be2d1043c1..e7facd8fbce 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -17,14 +17,117 @@
  */
 #include <linux/types.h>
 #include <linux/bitops.h>
+#include <linux/kref.h>
 #include <linux/mod_devicetable.h>
 
+typedef u32 phandle;
+typedef u32 ihandle;
+
+struct property {
+        char    *name;
+        int     length;
+        void    *value;
+        struct property *next;
+        unsigned long _flags;
+        unsigned int unique_id;
+};
+
+#if defined(CONFIG_SPARC)
+struct of_irq_controller;
+#endif
+
+struct device_node {
+        const char *name;
+        const char *type;
+        phandle node;
+#if !defined(CONFIG_SPARC)
+        phandle linux_phandle;
+#endif
+        char    *full_name;
+
+        struct  property *properties;
+        struct  property *deadprops;    /* removed properties */
+        struct  device_node *parent;
+        struct  device_node *child;
+        struct  device_node *sibling;
+        struct  device_node *next;      /* next device of same type */
+        struct  device_node *allnext;   /* next in list of all nodes */
+        struct  proc_dir_entry *pde;    /* this node's proc directory */
+        struct  kref kref;
+        unsigned long _flags;
+        void    *data;
+#if defined(CONFIG_SPARC)
+        char    *path_component_name;
+        unsigned int unique_id;
+        struct of_irq_controller *irq_trans;
+#endif
+};
+
+static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
+{
+        return test_bit(flag, &n->_flags);
+}
+
+static inline void of_node_set_flag(struct device_node *n, unsigned long flag)
+{
+        set_bit(flag, &n->_flags);
+}
+
+static inline void
+set_node_proc_entry(struct device_node *dn, struct proc_dir_entry *de)
+{
+        dn->pde = de;
+}
+
+extern struct device_node *of_find_all_nodes(struct device_node *prev);
+
+#if defined(CONFIG_SPARC)
+/* Dummy ref counting routines - to be implemented later */
+static inline struct device_node *of_node_get(struct device_node *node)
+{
+        return node;
+}
+static inline void of_node_put(struct device_node *node)
+{
+}
+
+#else
+extern struct device_node *of_node_get(struct device_node *node);
+extern void of_node_put(struct device_node *node);
+#endif
+
+/*
+ * OF address retreival & translation
+ */
+
+/* Helper to read a big number; size is in cells (not bytes) */
+static inline u64 of_read_number(const u32 *cell, int size)
+{
+        u64 r = 0;
+        while (size--)
+                r = (r << 32) | *(cell++);
+        return r;
+}
+
+/* Like of_read_number, but we want an unsigned long result */
+#ifdef CONFIG_PPC32
+static inline unsigned long of_read_ulong(const u32 *cell, int size)
+{
+        return cell[size-1];
+}
+#else
+#define of_read_ulong(cell, size)       of_read_number(cell, size)
+#endif
+
 #include <asm/prom.h>
 
 /* flag descriptions */
 #define OF_DYNAMIC      1 /* node and properties were allocated via kmalloc */
 #define OF_DETACHED     2 /* node has been detached from the device tree */
 
+#define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags)
+#define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags)
+
 #define OF_BAD_ADDR     ((u64)-1)
 
 extern struct device_node *of_find_node_by_name(struct device_node *from,
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
new file mode 100644
index 00000000000..41d432b1355
--- /dev/null
+++ b/include/linux/of_fdt.h
@@ -0,0 +1,86 @@
+/*
+ * Definitions for working with the Flattened Device Tree data format
+ *
+ * Copyright 2009 Benjamin Herrenschmidt, IBM Corp
+ * benh@kernel.crashing.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ */
+
+#ifndef _LINUX_OF_FDT_H
+#define _LINUX_OF_FDT_H
+
+#include <linux/types.h>
+#include <linux/init.h>
+
+/* Definitions used by the flattened device tree */
+#define OF_DT_HEADER            0xd00dfeed      /* marker */
+#define OF_DT_BEGIN_NODE        0x1             /* Start of node, full name */
+#define OF_DT_END_NODE          0x2             /* End node */
+#define OF_DT_PROP              0x3             /* Property: name off, size,
+                                                 * content */
+#define OF_DT_NOP               0x4             /* nop */
+#define OF_DT_END               0x9
+
+#define OF_DT_VERSION           0x10
+
+#ifndef __ASSEMBLY__
+/*
+ * This is what gets passed to the kernel by prom_init or kexec
+ *
+ * The dt struct contains the device tree structure, full pathes and
+ * property contents. The dt strings contain a separate block with just
+ * the strings for the property names, and is fully page aligned and
+ * self contained in a page, so that it can be kept around by the kernel,
+ * each property name appears only once in this page (cheap compression)
+ *
+ * the mem_rsvmap contains a map of reserved ranges of physical memory,
+ * passing it here instead of in the device-tree itself greatly simplifies
+ * the job of everybody. It's just a list of u64 pairs (base/size) that
+ * ends when size is 0
+ */
+struct boot_param_header {
+        u32     magic;                  /* magic word OF_DT_HEADER */
+        u32     totalsize;              /* total size of DT block */
+        u32     off_dt_struct;          /* offset to structure */
+        u32     off_dt_strings;         /* offset to strings */
+        u32     off_mem_rsvmap;         /* offset to memory reserve map */
+        u32     version;                /* format version */
+        u32     last_comp_version;      /* last compatible version */
+        /* version 2 fields below */
+        u32     boot_cpuid_phys;        /* Physical CPU id we're booting on */
+        /* version 3 fields below */
+        u32     dt_strings_size;        /* size of the DT strings block */
+        /* version 17 fields below */
+        u32     dt_struct_size;         /* size of the DT structure block */
+};
+
+/* For scanning the flat device-tree at boot time */
+extern int __init of_scan_flat_dt(int (*it)(unsigned long node,
+                                            const char *uname, int depth,
+                                            void *data),
+                                  void *data);
+extern void __init *of_get_flat_dt_prop(unsigned long node, const char *name,
+                                        unsigned long *size);
+extern int __init of_flat_dt_is_compatible(unsigned long node,
+                                           const char *name);
+extern unsigned long __init of_get_flat_dt_root(void);
+
+/* Other Prototypes */
+extern void finish_device_tree(void);
+extern void unflatten_device_tree(void);
+extern void early_init_devtree(void *);
+extern int machine_is_compatible(const char *compat);
+extern void print_properties(struct device_node *node);
+extern int prom_n_intr_cells(struct device_node* np);
+extern void prom_get_irq_senses(unsigned char *senses, int off, int max);
+extern int prom_add_property(struct device_node* np, struct property* prop);
+extern int prom_remove_property(struct device_node *np, struct property *prop);
+extern int prom_update_property(struct device_node *np,
+                                struct property *newprop,
+                                struct property *oldprop);
+
+#endif /* __ASSEMBLY__ */
+#endif /* _LINUX_OF_FDT_H */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 84cf1f3b783..eae1f864c93 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1496,9 +1496,10 @@
 #define PCI_DEVICE_ID_SBE_WANXL400      0x0104
 
 #define PCI_VENDOR_ID_TOSHIBA           0x1179
-#define PCI_DEVICE_ID_TOSHIBA_PICCOLO   0x0102
-#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0103
-#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0105
+#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0101
+#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0102
+#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_3 0x0103
+#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_5 0x0105
 #define PCI_DEVICE_ID_TOSHIBA_TOPIC95   0x060a
 #define PCI_DEVICE_ID_TOSHIBA_TOPIC97   0x060f
 #define PCI_DEVICE_ID_TOSHIBA_TOPIC100  0x0617
@@ -1586,6 +1587,8 @@
 #define PCI_VENDOR_ID_COMPEX            0x11f6
 #define PCI_DEVICE_ID_COMPEX_ENET100VG4 0x0112
 
+#define PCI_VENDOR_ID_PMC_Sierra        0x11f8
+
 #define PCI_VENDOR_ID_RP                0x11fe
 #define PCI_DEVICE_ID_RP32INTF          0x0001
 #define PCI_DEVICE_ID_RP8INTF           0x0002
@@ -1633,6 +1636,8 @@
 #define PCI_DEVICE_ID_O2_6730           0x673a
 #define PCI_DEVICE_ID_O2_6832           0x6832
 #define PCI_DEVICE_ID_O2_6836           0x6836
+#define PCI_DEVICE_ID_O2_6812           0x6872
+#define PCI_DEVICE_ID_O2_6933           0x6933
 
 #define PCI_VENDOR_ID_3DFX              0x121a
 #define PCI_DEVICE_ID_3DFX_VOODOO       0x0001
diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 7b7fbf433cf..e3fb2560670 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -106,6 +106,8 @@ enum perf_sw_ids {
         PERF_COUNT_SW_CPU_MIGRATIONS            = 4,
         PERF_COUNT_SW_PAGE_FAULTS_MIN           = 5,
         PERF_COUNT_SW_PAGE_FAULTS_MAJ           = 6,
+        PERF_COUNT_SW_ALIGNMENT_FAULTS          = 7,
+        PERF_COUNT_SW_EMULATION_FAULTS          = 8,
 
         PERF_COUNT_SW_MAX,                      /* non-ABI */
 };
@@ -225,6 +227,7 @@ struct perf_counter_attr {
 #define PERF_COUNTER_IOC_RESET          _IO ('$', 3)
 #define PERF_COUNTER_IOC_PERIOD         _IOW('$', 4, u64)
 #define PERF_COUNTER_IOC_SET_OUTPUT     _IO ('$', 5)
+#define PERF_COUNTER_IOC_SET_FILTER     _IOW('$', 6, char *)
 
 enum perf_counter_ioc_flags {
         PERF_IOC_FLAG_GROUP             = 1U << 0,
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 9e7012689a8..43adbd7f001 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -18,6 +18,10 @@
 #include <linux/ioctl.h>
 #include <asm/byteorder.h>
 
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+#include <asm/hw_breakpoint.h>
+#endif
+
 /*
  * User-space ABI bits:
  */
@@ -31,6 +35,7 @@ enum perf_type_id {
         PERF_TYPE_TRACEPOINT                    = 2,
         PERF_TYPE_HW_CACHE                      = 3,
         PERF_TYPE_RAW                           = 4,
+        PERF_TYPE_BREAKPOINT                    = 5,
 
         PERF_TYPE_MAX,                          /* non-ABI */
 };
@@ -102,6 +107,8 @@ enum perf_sw_ids {
         PERF_COUNT_SW_CPU_MIGRATIONS            = 4,
         PERF_COUNT_SW_PAGE_FAULTS_MIN           = 5,
         PERF_COUNT_SW_PAGE_FAULTS_MAJ           = 6,
+        PERF_COUNT_SW_ALIGNMENT_FAULTS          = 7,
+        PERF_COUNT_SW_EMULATION_FAULTS          = 8,
 
         PERF_COUNT_SW_MAX,                      /* non-ABI */
 };
@@ -207,6 +214,15 @@ struct perf_event_attr {
                 __u32           wakeup_events;    /* wakeup every n events */
                 __u32           wakeup_watermark; /* bytes before wakeup   */
         };
+
+        union {
+                struct { /* Hardware breakpoint info */
+                        __u64           bp_addr;
+                        __u32           bp_type;
+                        __u32           bp_len;
+                };
+        };
+
         __u32                   __reserved_2;
 
         __u64                   __reserved_3;
@@ -219,8 +235,9 @@ struct perf_event_attr {
 #define PERF_EVENT_IOC_DISABLE          _IO ('$', 1)
 #define PERF_EVENT_IOC_REFRESH          _IO ('$', 2)
 #define PERF_EVENT_IOC_RESET            _IO ('$', 3)
-#define PERF_EVENT_IOC_PERIOD           _IOW('$', 4, u64)
+#define PERF_EVENT_IOC_PERIOD           _IOW('$', 4, __u64)
 #define PERF_EVENT_IOC_SET_OUTPUT       _IO ('$', 5)
+#define PERF_EVENT_IOC_SET_FILTER       _IOW('$', 6, char *)
 
 enum perf_event_ioc_flags {
         PERF_IOC_FLAG_GROUP             = 1U << 0,
@@ -475,6 +492,11 @@ struct hw_perf_event {
                         s64             remaining;
                         struct hrtimer  hrtimer;
                 };
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+                union { /* breakpoint */
+                        struct arch_hw_breakpoint       info;
+                };
+#endif
         };
         atomic64_t                      prev_count;
         u64                             sample_period;
@@ -543,6 +565,10 @@ struct perf_pending_entry {
         void (*func)(struct perf_pending_entry *);
 };
 
+typedef void (*perf_callback_t)(struct perf_event *, void *);
+
+struct perf_sample_data;
+
 /**
  * struct perf_event - performance event kernel representation:
  */
@@ -585,7 +611,7 @@ struct perf_event {
         u64                             tstamp_running;
         u64                             tstamp_stopped;
 
-        struct perf_event_attr  attr;
+        struct perf_event_attr          attr;
         struct hw_perf_event            hw;
 
         struct perf_event_context       *ctx;
@@ -633,7 +659,20 @@ struct perf_event {
 
         struct pid_namespace            *ns;
         u64                             id;
+
+        void (*overflow_handler)(struct perf_event *event,
+                        int nmi, struct perf_sample_data *data,
+                        struct pt_regs *regs);
+
+#ifdef CONFIG_EVENT_PROFILE
+        struct event_filter             *filter;
 #endif
+
+        perf_callback_t                 callback;
+
+        perf_callback_t                 event_callback;
+
+#endif /* CONFIG_PERF_EVENTS */
 };
 
 /**
@@ -706,7 +745,6 @@ struct perf_output_handle {
         int                             nmi;
         int                             sample;
         int                             locked;
-        unsigned long                   flags;
 };
 
 #ifdef CONFIG_PERF_EVENTS
@@ -738,6 +776,14 @@ extern int hw_perf_group_sched_in(struct perf_event *group_leader,
                struct perf_cpu_context *cpuctx,
                struct perf_event_context *ctx, int cpu);
 extern void perf_event_update_userpage(struct perf_event *event);
+extern int perf_event_release_kernel(struct perf_event *event);
+extern struct perf_event *
+perf_event_create_kernel_counter(struct perf_event_attr *attr,
+                                int cpu,
+                                pid_t pid,
+                                perf_callback_t callback);
+extern u64 perf_event_read_value(struct perf_event *event,
+                                 u64 *enabled, u64 *running);
 
 struct perf_sample_data {
         u64                             type;
@@ -814,6 +860,7 @@ extern int sysctl_perf_event_sample_rate;
 extern void perf_event_init(void);
 extern void perf_tp_event(int event_id, u64 addr, u64 count,
                                  void *record, int entry_size);
+extern void perf_bp_event(struct perf_event *event, void *data);
 
 #ifndef perf_misc_flags
 #define perf_misc_flags(regs)   (user_mode(regs) ? PERF_RECORD_MISC_USER : \
@@ -827,6 +874,8 @@ extern int perf_output_begin(struct perf_output_handle *handle,
 extern void perf_output_end(struct perf_output_handle *handle);
 extern void perf_output_copy(struct perf_output_handle *handle,
                              const void *buf, unsigned int len);
+extern int perf_swevent_get_recursion_context(void);
+extern void perf_swevent_put_recursion_context(int rctx);
 #else
 static inline void
 perf_event_task_sched_in(struct task_struct *task, int cpu)             { }
@@ -848,11 +897,15 @@ static inline int perf_event_task_enable(void)				{ return -EINVAL; }
 static inline void
 perf_sw_event(u32 event_id, u64 nr, int nmi,
                      struct pt_regs *regs, u64 addr)                    { }
+static inline void
+perf_bp_event(struct perf_event *event, void *data)             { }
 
 static inline void perf_event_mmap(struct vm_area_struct *vma)          { }
 static inline void perf_event_comm(struct task_struct *tsk)             { }
 static inline void perf_event_fork(struct task_struct *tsk)             { }
 static inline void perf_event_init(void)                                { }
+static inline int  perf_swevent_get_recursion_context(void)  { return -1; }
+static inline void perf_swevent_put_recursion_context(int rctx)         { }
 
 #endif
 
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 3c842edff38..7f6ba8658ab 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -75,8 +75,7 @@ bits 9,10,11: redirect counter -  redirect TTL. Loop avoidance
 #define SET_TC_AT(v,n)   ((V_TC_AT(n)) | (v & ~M_TC_AT))
 
 /* Action attributes */
-enum
-{
+enum {
         TCA_ACT_UNSPEC,
         TCA_ACT_KIND,
         TCA_ACT_OPTIONS,
@@ -108,8 +107,7 @@ enum
 #define TC_ACT_JUMP             0x10000000
 
 /* Action type identifiers*/
-enum
-{
+enum {
         TCA_ID_UNSPEC=0,
         TCA_ID_POLICE=1,
         /* other actions go here */
@@ -118,8 +116,7 @@ enum
 
 #define TCA_ID_MAX __TCA_ID_MAX
 
-struct tc_police
-{
+struct tc_police {
         __u32                   index;
         int                     action;
 #define TC_POLICE_UNSPEC        TC_ACT_UNSPEC
@@ -138,15 +135,13 @@ struct tc_police
         __u32                   capab;
 };
 
-struct tcf_t
-{
+struct tcf_t {
         __u64   install;
         __u64   lastuse;
         __u64   expires;
 };
 
-struct tc_cnt
-{
+struct tc_cnt {
         int                   refcnt; 
         int                   bindcnt;
 };
@@ -158,8 +153,7 @@ struct tc_cnt
         int                   refcnt; \
         int                   bindcnt
 
-enum
-{
+enum {
         TCA_POLICE_UNSPEC,
         TCA_POLICE_TBF,
         TCA_POLICE_RATE,
@@ -182,8 +176,7 @@ enum
 #define TC_U32_UNSPEC   0
 #define TC_U32_ROOT     (0xFFF00000)
 
-enum
-{
+enum {
         TCA_U32_UNSPEC,
         TCA_U32_CLASSID,
         TCA_U32_HASH,
@@ -200,16 +193,14 @@ enum
 
 #define TCA_U32_MAX (__TCA_U32_MAX - 1)
 
-struct tc_u32_key
-{
+struct tc_u32_key {
         __be32          mask;
         __be32          val;
         int             off;
         int             offmask;
 };
 
-struct tc_u32_sel
-{
+struct tc_u32_sel {
         unsigned char           flags;
         unsigned char           offshift;
         unsigned char           nkeys;
@@ -223,15 +214,13 @@ struct tc_u32_sel
         struct tc_u32_key       keys[0];
 };
 
-struct tc_u32_mark
-{
+struct tc_u32_mark {
         __u32           val;
         __u32           mask;
         __u32           success;
 };
 
-struct tc_u32_pcnt
-{
+struct tc_u32_pcnt {
         __u64 rcnt;
         __u64 rhit;
         __u64 kcnts[0];
@@ -249,8 +238,7 @@ struct tc_u32_pcnt
 
 /* RSVP filter */
 
-enum
-{
+enum {
         TCA_RSVP_UNSPEC,
         TCA_RSVP_CLASSID,
         TCA_RSVP_DST,
@@ -263,15 +251,13 @@ enum
 
 #define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )
 
-struct tc_rsvp_gpi
-{
+struct tc_rsvp_gpi {
         __u32   key;
         __u32   mask;
         int     offset;
 };
 
-struct tc_rsvp_pinfo
-{
+struct tc_rsvp_pinfo {
         struct tc_rsvp_gpi dpi;
         struct tc_rsvp_gpi spi;
         __u8    protocol;
@@ -282,8 +268,7 @@ struct tc_rsvp_pinfo
 
 /* ROUTE filter */
 
-enum
-{
+enum {
         TCA_ROUTE4_UNSPEC,
         TCA_ROUTE4_CLASSID,
         TCA_ROUTE4_TO,
@@ -299,8 +284,7 @@ enum
 
 /* FW filter */
 
-enum
-{
+enum {
         TCA_FW_UNSPEC,
         TCA_FW_CLASSID,
         TCA_FW_POLICE,
@@ -314,8 +298,7 @@ enum
 
 /* TC index filter */
 
-enum
-{
+enum {
         TCA_TCINDEX_UNSPEC,
         TCA_TCINDEX_HASH,
         TCA_TCINDEX_MASK,
@@ -331,8 +314,7 @@ enum
 
 /* Flow filter */
 
-enum
-{
+enum {
         FLOW_KEY_SRC,
         FLOW_KEY_DST,
         FLOW_KEY_PROTO,
@@ -355,14 +337,12 @@ enum
 
 #define FLOW_KEY_MAX    (__FLOW_KEY_MAX - 1)
 
-enum
-{
+enum {
         FLOW_MODE_MAP,
         FLOW_MODE_HASH,
 };
 
-enum
-{
+enum {
         TCA_FLOW_UNSPEC,
         TCA_FLOW_KEYS,
         TCA_FLOW_MODE,
@@ -383,8 +363,7 @@ enum
 
 /* Basic filter */
 
-enum
-{
+enum {
         TCA_BASIC_UNSPEC,
         TCA_BASIC_CLASSID,
         TCA_BASIC_EMATCHES,
@@ -398,8 +377,7 @@ enum
 
 /* Cgroup classifier */
 
-enum
-{
+enum {
         TCA_CGROUP_UNSPEC,
         TCA_CGROUP_ACT,
         TCA_CGROUP_POLICE,
@@ -411,14 +389,12 @@ enum
 
 /* Extended Matches */
 
-struct tcf_ematch_tree_hdr
-{
+struct tcf_ematch_tree_hdr {
         __u16           nmatches;
         __u16           progid;
 };
 
-enum
-{
+enum {
         TCA_EMATCH_TREE_UNSPEC,
         TCA_EMATCH_TREE_HDR,
         TCA_EMATCH_TREE_LIST,
@@ -426,8 +402,7 @@ enum
 };
 #define TCA_EMATCH_TREE_MAX (__TCA_EMATCH_TREE_MAX - 1)
 
-struct tcf_ematch_hdr
-{
+struct tcf_ematch_hdr {
         __u16           matchid;
         __u16           kind;
         __u16           flags;
@@ -457,8 +432,7 @@ struct tcf_ematch_hdr
 #define TCF_EM_REL_MASK 3
 #define TCF_EM_REL_VALID(v) (((v) & TCF_EM_REL_MASK) != TCF_EM_REL_MASK)
 
-enum
-{
+enum {
         TCF_LAYER_LINK,
         TCF_LAYER_NETWORK,
         TCF_LAYER_TRANSPORT,
@@ -479,13 +453,11 @@ enum
 #define        TCF_EM_VLAN              6
 #define TCF_EM_MAX              6
 
-enum
-{
+enum {
         TCF_EM_PROG_TC
 };
 
-enum
-{
+enum {
         TCF_EM_OPND_EQ,
         TCF_EM_OPND_GT,
         TCF_EM_OPND_LT
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index d51a2b3e221..2cfa4bc8dea 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -29,8 +29,7 @@
    Particular schedulers may have also their private records.
  */
 
-struct tc_stats
-{
+struct tc_stats {
         __u64   bytes;                  /* NUmber of enqueues bytes */
         __u32   packets;                /* Number of enqueued packets   */
         __u32   drops;                  /* Packets dropped because of lack of resources */
@@ -42,8 +41,7 @@ struct tc_stats
         __u32   backlog;
 };
 
-struct tc_estimator
-{
+struct tc_estimator {
         signed char     interval;
         unsigned char   ewma_log;
 };
@@ -75,8 +73,7 @@ struct tc_estimator
 #define TC_H_ROOT       (0xFFFFFFFFU)
 #define TC_H_INGRESS    (0xFFFFFFF1U)
 
-struct tc_ratespec
-{
+struct tc_ratespec {
         unsigned char   cell_log;
         unsigned char   __reserved;
         unsigned short  overhead;
@@ -109,8 +106,7 @@ enum {
 
 /* FIFO section */
 
-struct tc_fifo_qopt
-{
+struct tc_fifo_qopt {
         __u32   limit;  /* Queue length: bytes for bfifo, packets for pfifo */
 };
 
@@ -119,8 +115,7 @@ struct tc_fifo_qopt
 #define TCQ_PRIO_BANDS  16
 #define TCQ_MIN_PRIO_BANDS 2
 
-struct tc_prio_qopt
-{
+struct tc_prio_qopt {
         int     bands;                  /* Number of bands */
         __u8    priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */
 };
@@ -134,8 +129,7 @@ struct tc_multiq_qopt {
 
 /* TBF section */
 
-struct tc_tbf_qopt
-{
+struct tc_tbf_qopt {
         struct tc_ratespec rate;
         struct tc_ratespec peakrate;
         __u32           limit;
@@ -143,8 +137,7 @@ struct tc_tbf_qopt
         __u32           mtu;
 };
 
-enum
-{
+enum {
         TCA_TBF_UNSPEC,
         TCA_TBF_PARMS,
         TCA_TBF_RTAB,
@@ -161,8 +154,7 @@ enum
 
 /* SFQ section */
 
-struct tc_sfq_qopt
-{
+struct tc_sfq_qopt {
         unsigned        quantum;        /* Bytes per round allocated to flow */
         int             perturb_period; /* Period of hash perturbation */
         __u32           limit;          /* Maximal packets in queue */
@@ -170,8 +162,7 @@ struct tc_sfq_qopt
         unsigned        flows;          /* Maximal number of flows  */
 };
 
-struct tc_sfq_xstats
-{
+struct tc_sfq_xstats {
         __s32           allot;
 };
 
@@ -186,8 +177,7 @@ struct tc_sfq_xstats
 
 /* RED section */
 
-enum
-{
+enum {
         TCA_RED_UNSPEC,
         TCA_RED_PARMS,
         TCA_RED_STAB,
@@ -196,8 +186,7 @@ enum
 
 #define TCA_RED_MAX (__TCA_RED_MAX - 1)
 
-struct tc_red_qopt
-{
+struct tc_red_qopt {
         __u32           limit;          /* HARD maximal queue length (bytes)    */
         __u32           qth_min;        /* Min average length threshold (bytes) */
         __u32           qth_max;        /* Max average length threshold (bytes) */
@@ -209,8 +198,7 @@ struct tc_red_qopt
 #define TC_RED_HARDDROP 2
 };
 
-struct tc_red_xstats
-{
+struct tc_red_xstats {
         __u32           early;          /* Early drops */
         __u32           pdrop;          /* Drops due to queue limits */
         __u32           other;          /* Drops due to drop() calls */
@@ -221,8 +209,7 @@ struct tc_red_xstats
 
 #define MAX_DPs 16
 
-enum
-{
+enum {
        TCA_GRED_UNSPEC,
        TCA_GRED_PARMS,
        TCA_GRED_STAB,
@@ -232,8 +219,7 @@ enum
 
 #define TCA_GRED_MAX (__TCA_GRED_MAX - 1)
 
-struct tc_gred_qopt
-{
+struct tc_gred_qopt {
         __u32           limit;        /* HARD maximal queue length (bytes)    */
         __u32           qth_min;      /* Min average length threshold (bytes) */
         __u32           qth_max;      /* Max average length threshold (bytes) */
@@ -253,8 +239,7 @@ struct tc_gred_qopt
 };
 
 /* gred setup */
-struct tc_gred_sopt
-{
+struct tc_gred_sopt {
         __u32           DPs;
         __u32           def_DP;
         __u8            grio;
@@ -267,8 +252,7 @@ struct tc_gred_sopt
 #define TC_HTB_MAXDEPTH         8
 #define TC_HTB_PROTOVER         3 /* the same as HTB and TC's major */
 
-struct tc_htb_opt
-{
+struct tc_htb_opt {
         struct tc_ratespec      rate;
         struct tc_ratespec      ceil;
         __u32   buffer;
@@ -277,8 +261,7 @@ struct tc_htb_opt
         __u32   level;          /* out only */
         __u32   prio;
 };
-struct tc_htb_glob
-{
+struct tc_htb_glob {
         __u32 version;          /* to match HTB/TC */
         __u32 rate2quantum;     /* bps->quantum divisor */
         __u32 defcls;           /* default class number */
@@ -287,8 +270,7 @@ struct tc_htb_glob
         /* stats */
         __u32 direct_pkts; /* count of non shapped packets */
 };
-enum
-{
+enum {
         TCA_HTB_UNSPEC,
         TCA_HTB_PARMS,
         TCA_HTB_INIT,
@@ -299,8 +281,7 @@ enum
 
 #define TCA_HTB_MAX (__TCA_HTB_MAX - 1)
 
-struct tc_htb_xstats
-{
+struct tc_htb_xstats {
         __u32 lends;
         __u32 borrows;
         __u32 giants;   /* too big packets (rate will not be accurate) */
@@ -310,28 +291,24 @@ struct tc_htb_xstats
 
 /* HFSC section */
 
-struct tc_hfsc_qopt
-{
+struct tc_hfsc_qopt {
         __u16   defcls;         /* default class */
 };
 
-struct tc_service_curve
-{
+struct tc_service_curve {
         __u32   m1;             /* slope of the first segment in bps */
         __u32   d;              /* x-projection of the first segment in us */
         __u32   m2;             /* slope of the second segment in bps */
 };
 
-struct tc_hfsc_stats
-{
+struct tc_hfsc_stats {
         __u64   work;           /* total work done */
         __u64   rtwork;         /* work done by real-time criteria */
         __u32   period;         /* current period */
         __u32   level;          /* class level in hierarchy */
 };
 
-enum
-{
+enum {
         TCA_HFSC_UNSPEC,
         TCA_HFSC_RSC,
         TCA_HFSC_FSC,
@@ -348,8 +325,7 @@ enum
 #define TC_CBQ_MAXLEVEL         8
 #define TC_CBQ_DEF_EWMA         5
 
-struct tc_cbq_lssopt
-{
+struct tc_cbq_lssopt {
         unsigned char   change;
         unsigned char   flags;
 #define TCF_CBQ_LSS_BOUNDED     1
@@ -368,8 +344,7 @@ struct tc_cbq_lssopt
         __u32           avpkt;
 };
 
-struct tc_cbq_wrropt
-{
+struct tc_cbq_wrropt {
         unsigned char   flags;
         unsigned char   priority;
         unsigned char   cpriority;
@@ -378,8 +353,7 @@ struct tc_cbq_wrropt
         __u32           weight;
 };
 
-struct tc_cbq_ovl
-{
+struct tc_cbq_ovl {
         unsigned char   strategy;
 #define TC_CBQ_OVL_CLASSIC      0
 #define TC_CBQ_OVL_DELAY        1
@@ -391,30 +365,26 @@ struct tc_cbq_ovl
         __u32           penalty;
 };
 
-struct tc_cbq_police
-{
+struct tc_cbq_police {
         unsigned char   police;
         unsigned char   __res1;
         unsigned short  __res2;
 };
 
-struct tc_cbq_fopt
-{
+struct tc_cbq_fopt {
         __u32           split;
         __u32           defmap;
         __u32           defchange;
 };
 
-struct tc_cbq_xstats
-{
+struct tc_cbq_xstats {
         __u32           borrows;
         __u32           overactions;
         __s32           avgidle;
         __s32           undertime;
 };
 
-enum
-{
+enum {
         TCA_CBQ_UNSPEC,
         TCA_CBQ_LSSOPT,
         TCA_CBQ_WRROPT,
@@ -459,8 +429,7 @@ enum {
 
 /* Network emulator */
 
-enum
-{
+enum {
         TCA_NETEM_UNSPEC,
         TCA_NETEM_CORR,
         TCA_NETEM_DELAY_DIST,
@@ -471,8 +440,7 @@ enum
 
 #define TCA_NETEM_MAX (__TCA_NETEM_MAX - 1)
 
-struct tc_netem_qopt
-{
+struct tc_netem_qopt {
         __u32   latency;        /* added delay (us) */
         __u32   limit;          /* fifo limit (packets) */
         __u32   loss;           /* random packet loss (0=none ~0=100%) */
@@ -481,21 +449,18 @@ struct tc_netem_qopt
         __u32   jitter;         /* random jitter in latency (us) */
 };
 
-struct tc_netem_corr
-{
+struct tc_netem_corr {
         __u32   delay_corr;     /* delay correlation */
         __u32   loss_corr;      /* packet loss correlation */
         __u32   dup_corr;       /* duplicate correlation  */
 };
 
-struct tc_netem_reorder
-{
+struct tc_netem_reorder {
         __u32   probability;
         __u32   correlation;
 };
 
-struct tc_netem_corrupt
-{
+struct tc_netem_corrupt {
         __u32   probability;
         __u32   correlation;
 };
@@ -504,8 +469,7 @@ struct tc_netem_corrupt
 
 /* DRR */
 
-enum
-{
+enum {
         TCA_DRR_UNSPEC,
         TCA_DRR_QUANTUM,
         __TCA_DRR_MAX
@@ -513,8 +477,7 @@ enum
 
 #define TCA_DRR_MAX     (__TCA_DRR_MAX - 1)
 
-struct tc_drr_stats
-{
+struct tc_drr_stats {
         __u32   deficit;
 };
 
diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h
index d745f5b6c7b..76e5053e1fa 100644
--- a/include/linux/pktcdvd.h
+++ b/include/linux/pktcdvd.h
@@ -30,7 +30,7 @@
 
 /*
  * use drive write caching -- we need deferred error handling to be
- * able to sucessfully recover with this option (drive will return good
+ * able to successfully recover with this option (drive will return good
  * status as soon as the cdb is validated).
  */
 #if defined(CONFIG_CDROM_PKTCDVD_WCACHE)
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 3b7e04b95bd..0d65934246a 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -178,9 +178,10 @@ typedef struct pm_message {
  *      This need not mean that the device should be put into a low power state.
  *      For example, if the device is behind a link which is about to be turned
  *      off, the device may remain at full power.  If the device does go to low
- *      power and if device_may_wakeup(dev) is true, remote wake-up (i.e., a
- *      hardware mechanism allowing the device to request a change of its power
- *      state, such as PCI PME) should be enabled for it.
+ *      power and is capable of generating run-time wake-up events, remote
+ *      wake-up (i.e., a hardware mechanism allowing the device to request a
+ *      change of its power state via a wake-up event, such as PCI PME) should
+ *      be enabled for it.
  *
  * @runtime_resume: Put the device into the fully active state in response to a
  *      wake-up event generated by hardware or at the request of software.  If
@@ -428,6 +429,7 @@ struct dev_pm_info {
         unsigned int            idle_notification:1;
         unsigned int            request_pending:1;
         unsigned int            deferred_resume:1;
+        unsigned int            run_wake:1;
         enum rpm_request        request;
         enum rpm_status         runtime_status;
         int                     runtime_error;
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
index 44087044910..370ce0a6fe4 100644
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@ -50,6 +50,16 @@ static inline void pm_runtime_put_noidle(struct device *dev)
         atomic_add_unless(&dev->power.usage_count, -1, 0);
 }
 
+static inline bool device_run_wake(struct device *dev)
+{
+        return dev->power.run_wake;
+}
+
+static inline void device_set_run_wake(struct device *dev, bool enable)
+{
+        dev->power.run_wake = enable;
+}
+
 #else /* !CONFIG_PM_RUNTIME */
 
 static inline int pm_runtime_idle(struct device *dev) { return -ENOSYS; }
@@ -73,6 +83,8 @@ static inline bool pm_children_suspended(struct device *dev) { return false; }
 static inline void pm_suspend_ignore_children(struct device *dev, bool en) {}
 static inline void pm_runtime_get_noresume(struct device *dev) {}
 static inline void pm_runtime_put_noidle(struct device *dev) {}
+static inline bool device_run_wake(struct device *dev) { return false; }
+static inline void device_set_run_wake(struct device *dev, bool enable) {}
 
 #endif /* !CONFIG_PM_RUNTIME */
 
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 065a3652a3e..67608161df6 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -147,6 +147,20 @@ static inline void forget_cached_acl(struct inode *inode, int type)
         if (old != ACL_NOT_CACHED)
                 posix_acl_release(old);
 }
+
+static inline void forget_all_cached_acls(struct inode *inode)
+{
+        struct posix_acl *old_access, *old_default;
+        spin_lock(&inode->i_lock);
+        old_access = inode->i_acl;
+        old_default = inode->i_default_acl;
+        inode->i_acl = inode->i_default_acl = ACL_NOT_CACHED;
+        spin_unlock(&inode->i_lock);
+        if (old_access != ACL_NOT_CACHED)
+                posix_acl_release(old_access);
+        if (old_default != ACL_NOT_CACHED)
+                posix_acl_release(old_default);
+}
 #endif
 
 static inline void cache_no_acl(struct inode *inode)
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index 72b1a10a59b..2e681d9555b 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -105,6 +105,11 @@ struct preempt_notifier;
  * @sched_out: we've just been preempted
  *    notifier: struct preempt_notifier for the task being preempted
  *    next: the task that's kicking us out
+ *
+ * Please note that sched_in and out are called under different
+ * contexts.  sched_out is called with rq lock held and irq disabled
+ * while sched_in is called without rq lock and irq enabled.  This
+ * difference is intentional and depended upon by its users.
  */
 struct preempt_ops {
         void (*sched_in)(struct preempt_notifier *notifier, int cpu);
diff --git a/include/linux/quota.h b/include/linux/quota.h
index 78c48895b12..ce9a9b2e5cd 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -376,6 +376,17 @@ static inline unsigned int dquot_generic_flag(unsigned int flags, int type)
         return flags >> _DQUOT_STATE_FLAGS;
 }
 
+#ifdef CONFIG_QUOTA_NETLINK_INTERFACE
+extern void quota_send_warning(short type, unsigned int id, dev_t dev,
+                               const char warntype);
+#else
+static inline void quota_send_warning(short type, unsigned int id, dev_t dev,
+                                      const char warntype)
+{
+        return;
+}
+#endif /* CONFIG_QUOTA_NETLINK_INTERFACE */
+
 struct quota_info {
         unsigned int flags;                     /* Flags for diskquotas on this device */
         struct mutex dqio_mutex;                /* lock device while I/O in progress */
diff --git a/include/linux/ratelimit.h b/include/linux/ratelimit.h
index 00044b85645..668cf1bef03 100644
--- a/include/linux/ratelimit.h
+++ b/include/linux/ratelimit.h
@@ -1,20 +1,31 @@
 #ifndef _LINUX_RATELIMIT_H
 #define _LINUX_RATELIMIT_H
+
 #include <linux/param.h>
+#include <linux/spinlock_types.h>
 
-#define DEFAULT_RATELIMIT_INTERVAL (5 * HZ)
-#define DEFAULT_RATELIMIT_BURST 10
+#define DEFAULT_RATELIMIT_INTERVAL      (5 * HZ)
+#define DEFAULT_RATELIMIT_BURST         10
 
 struct ratelimit_state {
-        int interval;
-        int burst;
-        int printed;
-        int missed;
-        unsigned long begin;
+        spinlock_t      lock;           /* protect the state */
+
+        int             interval;
+        int             burst;
+        int             printed;
+        int             missed;
+        unsigned long   begin;
 };
 
-#define DEFINE_RATELIMIT_STATE(name, interval, burst)           \
-                struct ratelimit_state name = {interval, burst,}
+#define DEFINE_RATELIMIT_STATE(name, interval_init, burst_init)         \
+                                                                        \
+        struct ratelimit_state name = {                                 \
+                .lock           = __SPIN_LOCK_UNLOCKED(name.lock),      \
+                .interval       = interval_init,                        \
+                .burst          = burst_init,                           \
+        }
+
+extern int ___ratelimit(struct ratelimit_state *rs, const char *func);
+#define __ratelimit(state) ___ratelimit(state, __func__)
 
-extern int __ratelimit(struct ratelimit_state *rs);
-#endif
+#endif /* _LINUX_RATELIMIT_H */
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
index 5710f43bbc9..1bf0f708c4f 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
@@ -262,6 +262,20 @@ static inline void list_splice_init_rcu(struct list_head *list,
                 (pos) = rcu_dereference((pos)->next))
 
 /**
+ * list_for_each_entry_continue_rcu - continue iteration over list of given type
+ * @pos:        the type * to use as a loop cursor.
+ * @head:       the head for your list.
+ * @member:     the name of the list_struct within the struct.
+ *
+ * Continue to iterate over list of given type, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue_rcu(pos, head, member)             \
+        for (pos = list_entry_rcu(pos->member.next, typeof(*pos), member); \
+             prefetch(pos->member.next), &pos->member != (head);        \
+             pos = list_entry_rcu(pos->member.next, typeof(*pos), member))
+
+/**
  * hlist_del_rcu - deletes entry from hash list without re-initialization
  * @n: the element to delete from the hash list.
  *
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 3ebd0b7bcb0..24440f4bf47 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -52,11 +52,6 @@ struct rcu_head {
 };
 
 /* Exported common interfaces */
-#ifdef CONFIG_TREE_PREEMPT_RCU
-extern void synchronize_rcu(void);
-#else /* #ifdef CONFIG_TREE_PREEMPT_RCU */
-#define synchronize_rcu synchronize_sched
-#endif /* #else #ifdef CONFIG_TREE_PREEMPT_RCU */
 extern void synchronize_rcu_bh(void);
 extern void synchronize_sched(void);
 extern void rcu_barrier(void);
@@ -67,12 +62,11 @@ extern int sched_expedited_torture_stats(char *page);
 
 /* Internal to kernel */
 extern void rcu_init(void);
-extern void rcu_scheduler_starting(void);
-extern int rcu_needs_cpu(int cpu);
-extern int rcu_scheduler_active;
 
 #if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU)
 #include <linux/rcutree.h>
+#elif defined(CONFIG_TINY_RCU)
+#include <linux/rcutiny.h>
 #else
 #error "Unknown RCU implementation specified to kernel configuration"
 #endif
diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h
new file mode 100644
index 00000000000..c4ba9a78721
--- /dev/null
+++ b/include/linux/rcutiny.h
@@ -0,0 +1,104 @@
+/*
+ * Read-Copy Update mechanism for mutual exclusion, the Bloatwatch edition.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright IBM Corporation, 2008
+ *
+ * Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+ *
+ * For detailed explanation of Read-Copy Update mechanism see -
+ *              Documentation/RCU
+ */
+#ifndef __LINUX_TINY_H
+#define __LINUX_TINY_H
+
+#include <linux/cache.h>
+
+void rcu_sched_qs(int cpu);
+void rcu_bh_qs(int cpu);
+
+#define __rcu_read_lock()       preempt_disable()
+#define __rcu_read_unlock()     preempt_enable()
+#define __rcu_read_lock_bh()    local_bh_disable()
+#define __rcu_read_unlock_bh()  local_bh_enable()
+#define call_rcu_sched          call_rcu
+
+#define rcu_init_sched()        do { } while (0)
+extern void rcu_check_callbacks(int cpu, int user);
+
+static inline int rcu_needs_cpu(int cpu)
+{
+        return 0;
+}
+
+/*
+ * Return the number of grace periods.
+ */
+static inline long rcu_batches_completed(void)
+{
+        return 0;
+}
+
+/*
+ * Return the number of bottom-half grace periods.
+ */
+static inline long rcu_batches_completed_bh(void)
+{
+        return 0;
+}
+
+extern int rcu_expedited_torture_stats(char *page);
+
+#define synchronize_rcu synchronize_sched
+
+static inline void synchronize_rcu_expedited(void)
+{
+        synchronize_sched();
+}
+
+static inline void synchronize_rcu_bh_expedited(void)
+{
+        synchronize_sched();
+}
+
+struct notifier_block;
+
+#ifdef CONFIG_NO_HZ
+
+extern void rcu_enter_nohz(void);
+extern void rcu_exit_nohz(void);
+
+#else /* #ifdef CONFIG_NO_HZ */
+
+static inline void rcu_enter_nohz(void)
+{
+}
+
+static inline void rcu_exit_nohz(void)
+{
+}
+
+#endif /* #else #ifdef CONFIG_NO_HZ */
+
+static inline void rcu_scheduler_starting(void)
+{
+}
+
+static inline void exit_rcu(void)
+{
+}
+
+#endif /* __LINUX_RCUTINY_H */
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
index 9642c6bcb39..c93eee5911b 100644
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
@@ -34,15 +34,15 @@ struct notifier_block;
 
 extern void rcu_sched_qs(int cpu);
 extern void rcu_bh_qs(int cpu);
-extern int rcu_cpu_notify(struct notifier_block *self,
-                          unsigned long action, void *hcpu);
 extern int rcu_needs_cpu(int cpu);
+extern void rcu_scheduler_starting(void);
 extern int rcu_expedited_torture_stats(char *page);
 
 #ifdef CONFIG_TREE_PREEMPT_RCU
 
 extern void __rcu_read_lock(void);
 extern void __rcu_read_unlock(void);
+extern void synchronize_rcu(void);
 extern void exit_rcu(void);
 
 #else /* #ifdef CONFIG_TREE_PREEMPT_RCU */
@@ -57,7 +57,7 @@ static inline void __rcu_read_unlock(void)
         preempt_enable();
 }
 
-#define __synchronize_sched() synchronize_rcu()
+#define synchronize_rcu synchronize_sched
 
 static inline void exit_rcu(void)
 {
@@ -83,7 +83,6 @@ static inline void synchronize_rcu_bh_expedited(void)
         synchronize_sched_expedited();
 }
 
-extern void __rcu_init(void);
 extern void rcu_check_callbacks(int cpu, int user);
 
 extern long rcu_batches_completed(void);
diff --git a/include/linux/rds.h b/include/linux/rds.h
index 89d46e1afbb..cab4994c2f6 100644
--- a/include/linux/rds.h
+++ b/include/linux/rds.h
@@ -56,6 +56,7 @@
 /* deprecated: RDS_BARRIER 4 */
 #define RDS_RECVERR                     5
 #define RDS_CONG_MONITOR                6
+#define RDS_GET_MR_FOR_DEST             7
 
 /*
  * Control message types for SOL_RDS.
@@ -224,6 +225,13 @@ struct rds_get_mr_args {
         uint64_t        flags;
 };
 
+struct rds_get_mr_for_dest_args {
+        struct sockaddr_storage dest_addr;
+        struct rds_iovec        vec;
+        u_int64_t               cookie_addr;
+        uint64_t                flags;
+};
+
 struct rds_free_mr_args {
         rds_rdma_cookie_t cookie;
         u_int64_t       flags;
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index dd31e7bae35..a05b4a20768 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -52,11 +52,63 @@
 #define REISERFS_IOC32_GETVERSION       FS_IOC32_GETVERSION
 #define REISERFS_IOC32_SETVERSION       FS_IOC32_SETVERSION
 
-/* Locking primitives */
-/* Right now we are still falling back to (un)lock_kernel, but eventually that
-   would evolve into real per-fs locks */
-#define reiserfs_write_lock( sb ) lock_kernel()
-#define reiserfs_write_unlock( sb ) unlock_kernel()
+/*
+ * Locking primitives. The write lock is a per superblock
+ * special mutex that has properties close to the Big Kernel Lock
+ * which was used in the previous locking scheme.
+ */
+void reiserfs_write_lock(struct super_block *s);
+void reiserfs_write_unlock(struct super_block *s);
+int reiserfs_write_lock_once(struct super_block *s);
+void reiserfs_write_unlock_once(struct super_block *s, int lock_depth);
+
+/*
+ * Several mutexes depend on the write lock.
+ * However sometimes we want to relax the write lock while we hold
+ * these mutexes, according to the release/reacquire on schedule()
+ * properties of the Bkl that were used.
+ * Reiserfs performances and locking were based on this scheme.
+ * Now that the write lock is a mutex and not the bkl anymore, doing so
+ * may result in a deadlock:
+ *
+ * A acquire write_lock
+ * A acquire j_commit_mutex
+ * A release write_lock and wait for something
+ * B acquire write_lock
+ * B can't acquire j_commit_mutex and sleep
+ * A can't acquire write lock anymore
+ * deadlock
+ *
+ * What we do here is avoiding such deadlock by playing the same game
+ * than the Bkl: if we can't acquire a mutex that depends on the write lock,
+ * we release the write lock, wait a bit and then retry.
+ *
+ * The mutexes concerned by this hack are:
+ * - The commit mutex of a journal list
+ * - The flush mutex
+ * - The journal lock
+ * - The inode mutex
+ */
+static inline void reiserfs_mutex_lock_safe(struct mutex *m,
+                               struct super_block *s)
+{
+        reiserfs_write_unlock(s);
+        mutex_lock(m);
+        reiserfs_write_lock(s);
+}
+
+/*
+ * When we schedule, we usually want to also release the write lock,
+ * according to the previous bkl based locking scheme of reiserfs.
+ */
+static inline void reiserfs_cond_resched(struct super_block *s)
+{
+        if (need_resched()) {
+                reiserfs_write_unlock(s);
+                schedule();
+                reiserfs_write_lock(s);
+        }
+}
 
 struct fid;
 
@@ -1329,7 +1381,11 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
 #define get_generation(s) atomic_read (&fs_generation(s))
 #define FILESYSTEM_CHANGED_TB(tb)  (get_generation((tb)->tb_sb) != (tb)->fs_gen)
 #define __fs_changed(gen,s) (gen != get_generation (s))
-#define fs_changed(gen,s) ({cond_resched(); __fs_changed(gen, s);})
+#define fs_changed(gen,s)               \
+({                                      \
+        reiserfs_cond_resched(s);       \
+        __fs_changed(gen, s);           \
+})
 
 /***************************************************************************/
 /*                  FIXATE NODES                                           */
@@ -2258,8 +2314,7 @@ __u32 r5_hash(const signed char *msg, int len);
 #define SPARE_SPACE 500
 
 /* prototypes from ioctl.c */
-int reiserfs_ioctl(struct inode *inode, struct file *filp,
-                   unsigned int cmd, unsigned long arg);
+long reiserfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
 long reiserfs_compat_ioctl(struct file *filp,
                    unsigned int cmd, unsigned long arg);
 int reiserfs_unpack(struct inode *inode, struct file *filp);
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index dab68bbed67..52c83b6a758 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -7,6 +7,8 @@
 #ifdef __KERNEL__
 #include <linux/workqueue.h>
 #include <linux/rwsem.h>
+#include <linux/mutex.h>
+#include <linux/sched.h>
 #endif
 
 typedef enum {
@@ -355,6 +357,13 @@ struct reiserfs_sb_info {
         struct reiserfs_journal *s_journal;     /* pointer to journal information */
         unsigned short s_mount_state;   /* reiserfs state (valid, invalid) */
 
+        /* Serialize writers access, replace the old bkl */
+        struct mutex lock;
+        /* Owner of the lock (can be recursive) */
+        struct task_struct *lock_owner;
+        /* Depth of the lock, start from -1 like the bkl */
+        int lock_depth;
+
         /* Comment? -Hans */
         void (*end_io_handler) (struct buffer_head *, int);
         hashf_t s_hash_function;        /* pointer to function which is used
@@ -408,6 +417,17 @@ struct reiserfs_sb_info {
         char *s_qf_names[MAXQUOTAS];
         int s_jquota_fmt;
 #endif
+#ifdef CONFIG_REISERFS_CHECK
+
+        struct tree_balance *cur_tb;    /*
+                                         * Detects whether more than one
+                                         * copy of tb exists per superblock
+                                         * as a means of checking whether
+                                         * do_balance is executing concurrently
+                                         * against another tree reader/writer
+                                         * on a same mount point.
+                                         */
+#endif
 };
 
 /* Definitions of reiserfs on-disk properties: */
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 3392c59d270..97059d08a62 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -35,6 +35,8 @@
  * @RFKILL_TYPE_UWB: switch is on a ultra wideband device.
  * @RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
  * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device.
+ * @RFKILL_TYPE_GPS: switch is on a GPS device.
+ * @RFKILL_TYPE_FM: switch is on a FM radio device.
  * @NUM_RFKILL_TYPES: number of defined rfkill types
  */
 enum rfkill_type {
@@ -45,6 +47,7 @@ enum rfkill_type {
         RFKILL_TYPE_WIMAX,
         RFKILL_TYPE_WWAN,
         RFKILL_TYPE_GPS,
+        RFKILL_TYPE_FM,
         NUM_RFKILL_TYPES,
 };
 
diff --git a/include/linux/route.h b/include/linux/route.h
index f7ed35d5e65..6600708311c 100644
--- a/include/linux/route.h
+++ b/include/linux/route.h
@@ -27,8 +27,7 @@
 #include <linux/compiler.h>
 
 /* This structure gets passed by the SIOCADDRT and SIOCDELRT calls. */
-struct rtentry 
-{
+struct rtentry {
         unsigned long   rt_pad1;
         struct sockaddr rt_dst;         /* target address               */
         struct sockaddr rt_gateway;     /* gateway addr (RTF_GATEWAY)   */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index adf2068d12b..14fc906ed60 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -127,8 +127,7 @@ enum {
    with attribute type.
  */
 
-struct rtattr
-{
+struct rtattr {
         unsigned short  rta_len;
         unsigned short  rta_type;
 };
@@ -154,8 +153,7 @@ struct rtattr
  *              Definitions used in routing table administration.
  ****/
 
-struct rtmsg
-{
+struct rtmsg {
         unsigned char           rtm_family;
         unsigned char           rtm_dst_len;
         unsigned char           rtm_src_len;
@@ -171,8 +169,7 @@ struct rtmsg
 
 /* rtm_type */
 
-enum
-{
+enum {
         RTN_UNSPEC,
         RTN_UNICAST,            /* Gateway or direct route      */
         RTN_LOCAL,              /* Accept locally               */
@@ -230,8 +227,7 @@ enum
    could be assigned a value between UNIVERSE and LINK.
 */
 
-enum rt_scope_t
-{
+enum rt_scope_t {
         RT_SCOPE_UNIVERSE=0,
 /* User defined values  */
         RT_SCOPE_SITE=200,
@@ -249,8 +245,7 @@ enum rt_scope_t
 
 /* Reserved table identifiers */
 
-enum rt_class_t
-{
+enum rt_class_t {
         RT_TABLE_UNSPEC=0,
 /* User defined values */
         RT_TABLE_COMPAT=252,
@@ -263,8 +258,7 @@ enum rt_class_t
 
 /* Routing message attributes */
 
-enum rtattr_type_t
-{
+enum rtattr_type_t {
         RTA_UNSPEC,
         RTA_DST,
         RTA_SRC,
@@ -298,8 +292,7 @@ enum rtattr_type_t
  * and rtt for different paths from multipath.
  */
 
-struct rtnexthop
-{
+struct rtnexthop {
         unsigned short          rtnh_len;
         unsigned char           rtnh_flags;
         unsigned char           rtnh_hops;
@@ -325,8 +318,7 @@ struct rtnexthop
 
 /* RTM_CACHEINFO */
 
-struct rta_cacheinfo
-{
+struct rta_cacheinfo {
         __u32   rta_clntref;
         __u32   rta_lastuse;
         __s32   rta_expires;
@@ -341,8 +333,7 @@ struct rta_cacheinfo
 
 /* RTM_METRICS --- array of struct rtattr with types of RTAX_* */
 
-enum
-{
+enum {
         RTAX_UNSPEC,
 #define RTAX_UNSPEC RTAX_UNSPEC
         RTAX_LOCK,
@@ -377,12 +368,13 @@ enum
 #define RTAX_MAX (__RTAX_MAX - 1)
 
 #define RTAX_FEATURE_ECN        0x00000001
-#define RTAX_FEATURE_SACK       0x00000002
-#define RTAX_FEATURE_TIMESTAMP  0x00000004
+#define RTAX_FEATURE_NO_SACK    0x00000002
+#define RTAX_FEATURE_NO_TSTAMP  0x00000004
 #define RTAX_FEATURE_ALLFRAG    0x00000008
+#define RTAX_FEATURE_NO_WSCALE  0x00000010
+#define RTAX_FEATURE_NO_DSACK   0x00000020
 
-struct rta_session
-{
+struct rta_session {
         __u8    proto;
         __u8    pad1;
         __u16   pad2;
@@ -407,8 +399,7 @@ struct rta_session
  *              General form of address family dependent message.
  ****/
 
-struct rtgenmsg
-{
+struct rtgenmsg {
         unsigned char           rtgen_family;
 };
 
@@ -421,8 +412,7 @@ struct rtgenmsg
  * on network protocol.
  */
 
-struct ifinfomsg
-{
+struct ifinfomsg {
         unsigned char   ifi_family;
         unsigned char   __ifi_pad;
         unsigned short  ifi_type;               /* ARPHRD_* */
@@ -435,8 +425,7 @@ struct ifinfomsg
  *              prefix information 
  ****/
 
-struct prefixmsg
-{
+struct prefixmsg {
         unsigned char   prefix_family;
         unsigned char   prefix_pad1;
         unsigned short  prefix_pad2;
@@ -457,8 +446,7 @@ enum
 
 #define PREFIX_MAX      (__PREFIX_MAX - 1)
 
-struct prefix_cacheinfo
-{
+struct prefix_cacheinfo {
         __u32   preferred_time;
         __u32   valid_time;
 };
@@ -468,8 +456,7 @@ struct prefix_cacheinfo
  *              Traffic control messages.
  ****/
 
-struct tcmsg
-{
+struct tcmsg {
         unsigned char   tcm_family;
         unsigned char   tcm__pad1;
         unsigned short  tcm__pad2;
@@ -479,8 +466,7 @@ struct tcmsg
         __u32           tcm_info;
 };
 
-enum
-{
+enum {
         TCA_UNSPEC,
         TCA_KIND,
         TCA_OPTIONS,
@@ -502,8 +488,7 @@ enum
  *              Neighbor Discovery userland options
  ****/
 
-struct nduseroptmsg
-{
+struct nduseroptmsg {
         unsigned char   nduseropt_family;
         unsigned char   nduseropt_pad1;
         unsigned short  nduseropt_opts_len;     /* Total length of options */
@@ -515,8 +500,7 @@ struct nduseroptmsg
         /* Followed by one or more ND options */
 };
 
-enum
-{
+enum {
         NDUSEROPT_UNSPEC,
         NDUSEROPT_SRCADDR,
         __NDUSEROPT_MAX
@@ -598,8 +582,7 @@ enum rtnetlink_groups {
 #define RTNLGRP_MAX     (__RTNLGRP_MAX - 1)
 
 /* TC action piece */
-struct tcamsg
-{
+struct tcamsg {
         unsigned char   tca_family;
         unsigned char   tca__pad1;
         unsigned short  tca__pad2;
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 75e6e60bf58..89115ec7d43 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -145,7 +145,6 @@ extern unsigned long this_cpu_load(void);
 
 
 extern void calc_global_load(void);
-extern u64 cpu_nr_migrations(int cpu);
 
 extern unsigned long get_parent_ip(unsigned long addr);
 
@@ -171,8 +170,6 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
 }
 #endif
 
-extern unsigned long long time_sync_thresh;
-
 /*
  * Task state bitmask. NOTE! These bits are also
  * encoded in fs/proc/array.c: get_task_state().
@@ -349,7 +346,6 @@ extern signed long schedule_timeout(signed long timeout);
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
-asmlinkage void __schedule(void);
 asmlinkage void schedule(void);
 extern int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner);
 
@@ -628,6 +624,9 @@ struct signal_struct {
         cputime_t utime, stime, cutime, cstime;
         cputime_t gtime;
         cputime_t cgtime;
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+        cputime_t prev_utime, prev_stime;
+#endif
         unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw;
         unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;
         unsigned long inblock, oublock, cinblock, coublock;
@@ -1013,9 +1012,13 @@ static inline struct cpumask *sched_domain_span(struct sched_domain *sd)
         return to_cpumask(sd->span);
 }
 
-extern void partition_sched_domains(int ndoms_new, struct cpumask *doms_new,
+extern void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
                                     struct sched_domain_attr *dattr_new);
 
+/* Allocate an array of sched domains, for partition_sched_domains(). */
+cpumask_var_t *alloc_sched_domains(unsigned int ndoms);
+void free_sched_domains(cpumask_var_t doms[], unsigned int ndoms);
+
 /* Test a flag in parent sched domain */
 static inline int test_sd_parent(struct sched_domain *sd, int flag)
 {
@@ -1033,7 +1036,7 @@ unsigned long default_scale_smt_power(struct sched_domain *sd, int cpu);
 struct sched_domain_attr;
 
 static inline void
-partition_sched_domains(int ndoms_new, struct cpumask *doms_new,
+partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
                         struct sched_domain_attr *dattr_new)
 {
 }
@@ -1331,7 +1334,9 @@ struct task_struct {
 
         cputime_t utime, stime, utimescaled, stimescaled;
         cputime_t gtime;
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
         cputime_t prev_utime, prev_stime;
+#endif
         unsigned long nvcsw, nivcsw; /* context switch counts */
         struct timespec start_time;             /* monotonic time */
         struct timespec real_start_time;        /* boot based time */
@@ -1421,17 +1426,17 @@ struct task_struct {
 #endif
 #ifdef CONFIG_TRACE_IRQFLAGS
         unsigned int irq_events;
-        int hardirqs_enabled;
         unsigned long hardirq_enable_ip;
-        unsigned int hardirq_enable_event;
         unsigned long hardirq_disable_ip;
+        unsigned int hardirq_enable_event;
         unsigned int hardirq_disable_event;
-        int softirqs_enabled;
+        int hardirqs_enabled;
+        int hardirq_context;
         unsigned long softirq_disable_ip;
-        unsigned int softirq_disable_event;
         unsigned long softirq_enable_ip;
+        unsigned int softirq_disable_event;
         unsigned int softirq_enable_event;
-        int hardirq_context;
+        int softirqs_enabled;
         int softirq_context;
 #endif
 #ifdef CONFIG_LOCKDEP
@@ -1720,9 +1725,8 @@ static inline void put_task_struct(struct task_struct *t)
                 __put_task_struct(t);
 }
 
-extern cputime_t task_utime(struct task_struct *p);
-extern cputime_t task_stime(struct task_struct *p);
-extern cputime_t task_gtime(struct task_struct *p);
+extern void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st);
+extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st);
 
 /*
  * Per process flags
@@ -2086,11 +2090,18 @@ static inline int is_si_special(const struct siginfo *info)
         return info <= SEND_SIG_FORCED;
 }
 
-/* True if we are on the alternate signal stack.  */
-
+/*
+ * True if we are on the alternate signal stack.
+ */
 static inline int on_sig_stack(unsigned long sp)
 {
-        return (sp - current->sas_ss_sp < current->sas_ss_size);
+#ifdef CONFIG_STACK_GROWSUP
+        return sp >= current->sas_ss_sp &&
+                sp - current->sas_ss_sp < current->sas_ss_size;
+#else
+        return sp > current->sas_ss_sp &&
+                sp - current->sas_ss_sp <= current->sas_ss_size;
+#endif
 }
 
 static inline int sas_ss_flags(unsigned long sp)
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index 1ee2c05142f..899fbb487c9 100644
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -14,7 +14,8 @@ struct screen_info {
         __u16 orig_video_page;  /* 0x04 */
         __u8  orig_video_mode;  /* 0x06 */
         __u8  orig_video_cols;  /* 0x07 */
-        __u16 unused2;          /* 0x08 */
+        __u8  flags;            /* 0x08 */
+        __u8  unused2;          /* 0x09 */
         __u16 orig_video_ega_bx;/* 0x0a */
         __u16 unused3;          /* 0x0c */
         __u8  orig_video_lines; /* 0x0e */
@@ -65,6 +66,8 @@ struct screen_info {
 
 #define VIDEO_TYPE_EFI          0x70    /* EFI graphic mode             */
 
+#define VIDEO_FLAGS_NOCURSOR    (1 << 0) /* The video mode has no cursor set */
+
 #ifdef __KERNEL__
 extern struct screen_info screen_info;
 
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index b464b9d3d24..c20d3ce673c 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -242,6 +242,7 @@ enum {
         SCTP_DATA_FIRST_FRAG    = 0x02,
         SCTP_DATA_NOT_FRAG      = 0x03,
         SCTP_DATA_UNORDERED     = 0x04,
+        SCTP_DATA_SACK_IMM      = 0x08,
 };
 enum { SCTP_DATA_FRAG_MASK = 0x03, };
 
diff --git a/include/linux/securebits.h b/include/linux/securebits.h
index d2c5ed845bc..33406174cbe 100644
--- a/include/linux/securebits.h
+++ b/include/linux/securebits.h
@@ -1,6 +1,15 @@
 #ifndef _LINUX_SECUREBITS_H
 #define _LINUX_SECUREBITS_H 1
 
+/* Each securesetting is implemented using two bits. One bit specifies
+   whether the setting is on or off. The other bit specify whether the
+   setting is locked or not. A setting which is locked cannot be
+   changed from user-level. */
+#define issecure_mask(X)        (1 << (X))
+#ifdef __KERNEL__
+#define issecure(X)             (issecure_mask(X) & current_cred_xxx(securebits))
+#endif
+
 #define SECUREBITS_DEFAULT 0x00000000
 
 /* When set UID 0 has no special privileges. When unset, we support
@@ -12,6 +21,9 @@
 #define SECURE_NOROOT                   0
 #define SECURE_NOROOT_LOCKED            1  /* make bit-0 immutable */
 
+#define SECBIT_NOROOT           (issecure_mask(SECURE_NOROOT))
+#define SECBIT_NOROOT_LOCKED    (issecure_mask(SECURE_NOROOT_LOCKED))
+
 /* When set, setuid to/from uid 0 does not trigger capability-"fixup".
    When unset, to provide compatiblility with old programs relying on
    set*uid to gain/lose privilege, transitions to/from uid 0 cause
@@ -19,6 +31,10 @@
 #define SECURE_NO_SETUID_FIXUP          2
 #define SECURE_NO_SETUID_FIXUP_LOCKED   3  /* make bit-2 immutable */
 
+#define SECBIT_NO_SETUID_FIXUP  (issecure_mask(SECURE_NO_SETUID_FIXUP))
+#define SECBIT_NO_SETUID_FIXUP_LOCKED \
+                        (issecure_mask(SECURE_NO_SETUID_FIXUP_LOCKED))
+
 /* When set, a process can retain its capabilities even after
    transitioning to a non-root user (the set-uid fixup suppressed by
    bit 2). Bit-4 is cleared when a process calls exec(); setting both
@@ -27,12 +43,8 @@
 #define SECURE_KEEP_CAPS                4
 #define SECURE_KEEP_CAPS_LOCKED         5  /* make bit-4 immutable */
 
-/* Each securesetting is implemented using two bits. One bit specifies
-   whether the setting is on or off. The other bit specify whether the
-   setting is locked or not. A setting which is locked cannot be
-   changed from user-level. */
-#define issecure_mask(X)        (1 << (X))
-#define issecure(X)             (issecure_mask(X) & current_cred_xxx(securebits))
+#define SECBIT_KEEP_CAPS        (issecure_mask(SECURE_KEEP_CAPS))
+#define SECBIT_KEEP_CAPS_LOCKED (issecure_mask(SECURE_KEEP_CAPS_LOCKED))
 
 #define SECURE_ALL_BITS         (issecure_mask(SECURE_NOROOT) | \
                                  issecure_mask(SECURE_NO_SETUID_FIXUP) | \
diff --git a/include/linux/security.h b/include/linux/security.h
index 239e40d0450..466cbadbd1e 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -447,6 +447,22 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *      @new_dir contains the path structure for parent of the new link.
  *      @new_dentry contains the dentry structure of the new link.
  *      Return 0 if permission is granted.
+ * @path_chmod:
+ *      Check for permission to change DAC's permission of a file or directory.
+ *      @dentry contains the dentry structure.
+ *      @mnt contains the vfsmnt structure.
+ *      @mode contains DAC's mode.
+ *      Return 0 if permission is granted.
+ * @path_chown:
+ *      Check for permission to change owner/group of a file or directory.
+ *      @path contains the path structure.
+ *      @uid contains new owner's ID.
+ *      @gid contains new group's ID.
+ *      Return 0 if permission is granted.
+ * @path_chroot:
+ *      Check for permission to change root directory.
+ *      @path contains the path structure.
+ *      Return 0 if permission is granted.
  * @inode_readlink:
  *      Check the permission to read the symbolic link.
  *      @dentry contains the dentry structure for the file link.
@@ -690,6 +706,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  * @kernel_module_request:
  *      Ability to trigger the kernel to automatically upcall to userspace for
  *      userspace to load a kernel module with the given name.
+ *      @kmod_name name of the module requested by the kernel
  *      Return 0 if successful.
  * @task_setuid:
  *      Check permission before setting one or more of the user identity
@@ -1488,6 +1505,10 @@ struct security_operations {
                           struct dentry *new_dentry);
         int (*path_rename) (struct path *old_dir, struct dentry *old_dentry,
                             struct path *new_dir, struct dentry *new_dentry);
+        int (*path_chmod) (struct dentry *dentry, struct vfsmount *mnt,
+                           mode_t mode);
+        int (*path_chown) (struct path *path, uid_t uid, gid_t gid);
+        int (*path_chroot) (struct path *path);
 #endif
 
         int (*inode_alloc_security) (struct inode *inode);
@@ -1557,7 +1578,7 @@ struct security_operations {
         void (*cred_transfer)(struct cred *new, const struct cred *old);
         int (*kernel_act_as)(struct cred *new, u32 secid);
         int (*kernel_create_files_as)(struct cred *new, struct inode *inode);
-        int (*kernel_module_request)(void);
+        int (*kernel_module_request)(char *kmod_name);
         int (*task_setuid) (uid_t id0, uid_t id1, uid_t id2, int flags);
         int (*task_fix_setuid) (struct cred *new, const struct cred *old,
                                 int flags);
@@ -1822,7 +1843,7 @@ void security_commit_creds(struct cred *new, const struct cred *old);
 void security_transfer_creds(struct cred *new, const struct cred *old);
 int security_kernel_act_as(struct cred *new, u32 secid);
 int security_kernel_create_files_as(struct cred *new, struct inode *inode);
-int security_kernel_module_request(void);
+int security_kernel_module_request(char *kmod_name);
 int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags);
 int security_task_fix_setuid(struct cred *new, const struct cred *old,
                              int flags);
@@ -2387,7 +2408,7 @@ static inline int security_kernel_create_files_as(struct cred *cred,
         return 0;
 }
 
-static inline int security_kernel_module_request(void)
+static inline int security_kernel_module_request(char *kmod_name)
 {
         return 0;
 }
@@ -2952,6 +2973,10 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
                        struct dentry *new_dentry);
 int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
                          struct path *new_dir, struct dentry *new_dentry);
+int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+                        mode_t mode);
+int security_path_chown(struct path *path, uid_t uid, gid_t gid);
+int security_path_chroot(struct path *path);
 #else   /* CONFIG_SECURITY_PATH */
 static inline int security_path_unlink(struct path *dir, struct dentry *dentry)
 {
@@ -3001,6 +3026,23 @@ static inline int security_path_rename(struct path *old_dir,
 {
         return 0;
 }
+
+static inline int security_path_chmod(struct dentry *dentry,
+                                      struct vfsmount *mnt,
+                                      mode_t mode)
+{
+        return 0;
+}
+
+static inline int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+{
+        return 0;
+}
+
+static inline int security_path_chroot(struct path *path)
+{
+        return 0;
+}
 #endif  /* CONFIG_SECURITY_PATH */
 
 #ifdef CONFIG_KEYS
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index db532ce288b..8c3dd36fe91 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -179,6 +179,9 @@
 /* BCM63xx family SoCs */
 #define PORT_BCM63XX    89
 
+/* Aeroflex Gaisler GRLIB APBUART */
+#define PORT_APBUART    90
+
 #ifdef __KERNEL__
 
 #include <linux/compiler.h>
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h
index 850db2e8051..cf9327c051a 100644
--- a/include/linux/serial_reg.h
+++ b/include/linux/serial_reg.h
@@ -216,10 +216,10 @@
 
 #define UART_IIR_TOD    0x08    /* Character Timeout Indication Detected */
 
-#define UART_FCR_PXAR1  0x00    /* receive FIFO treshold = 1 */
-#define UART_FCR_PXAR8  0x40    /* receive FIFO treshold = 8 */
-#define UART_FCR_PXAR16 0x80    /* receive FIFO treshold = 16 */
-#define UART_FCR_PXAR32 0xc0    /* receive FIFO treshold = 32 */
+#define UART_FCR_PXAR1  0x00    /* receive FIFO threshold = 1 */
+#define UART_FCR_PXAR8  0x40    /* receive FIFO threshold = 8 */
+#define UART_FCR_PXAR16 0x80    /* receive FIFO threshold = 16 */
+#define UART_FCR_PXAR32 0xc0    /* receive FIFO threshold = 32 */
 
 
 
diff --git a/include/linux/serio.h b/include/linux/serio.h
index a640bc2afe7..e2f3044d4a4 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -215,5 +215,6 @@ static inline void serio_unpin_driver(struct serio *serio)
 #define SERIO_INEXIO    0x37
 #define SERIO_TOUCHIT213        0x38
 #define SERIO_W8001     0x39
+#define SERIO_DYNAPRO   0x3a
 
 #endif
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index 68e212ff9dd..4ef246f1465 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -57,10 +57,8 @@ struct intc_desc {
         struct intc_sense_reg *sense_regs;
         unsigned int nr_sense_regs;
         char *name;
-#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
         struct intc_mask_reg *ack_regs;
         unsigned int nr_ack_regs;
-#endif
 };
 
 #define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a)
@@ -73,7 +71,6 @@ struct intc_desc symbol __initdata = {					\
         chipname,                                                       \
 }
 
-#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)
 #define DECLARE_INTC_DESC_ACK(symbol, chipname, vectors, groups,        \
         mask_regs, prio_regs, sense_regs, ack_regs)                     \
 struct intc_desc symbol __initdata = {                                  \
@@ -83,9 +80,11 @@ struct intc_desc symbol __initdata = {					\
         chipname,                                                       \
         _INTC_ARRAY(ack_regs),                                          \
 }
-#endif
 
 void __init register_intc_controller(struct intc_desc *desc);
 int intc_set_priority(unsigned int irq, unsigned int prio);
 
+int reserve_irq_vector(unsigned int irq);
+void reserve_irq_legacy(void);
+
 #endif /* __SH_INTC_H */
diff --git a/include/linux/sh_pfc.h b/include/linux/sh_pfc.h
new file mode 100644
index 00000000000..07c08af9f8f
--- /dev/null
+++ b/include/linux/sh_pfc.h
@@ -0,0 +1,96 @@
+/*
+ * SuperH Pin Function Controller Support
+ *
+ * Copyright (c) 2008 Magnus Damm
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#ifndef __SH_PFC_H
+#define __SH_PFC_H
+
+#include <asm-generic/gpio.h>
+
+typedef unsigned short pinmux_enum_t;
+typedef unsigned short pinmux_flag_t;
+
+#define PINMUX_TYPE_NONE            0
+#define PINMUX_TYPE_FUNCTION        1
+#define PINMUX_TYPE_GPIO            2
+#define PINMUX_TYPE_OUTPUT          3
+#define PINMUX_TYPE_INPUT           4
+#define PINMUX_TYPE_INPUT_PULLUP    5
+#define PINMUX_TYPE_INPUT_PULLDOWN  6
+
+#define PINMUX_FLAG_TYPE            (0x7)
+#define PINMUX_FLAG_WANT_PULLUP     (1 << 3)
+#define PINMUX_FLAG_WANT_PULLDOWN   (1 << 4)
+
+#define PINMUX_FLAG_DBIT_SHIFT      5
+#define PINMUX_FLAG_DBIT            (0x1f << PINMUX_FLAG_DBIT_SHIFT)
+#define PINMUX_FLAG_DREG_SHIFT      10
+#define PINMUX_FLAG_DREG            (0x3f << PINMUX_FLAG_DREG_SHIFT)
+
+struct pinmux_gpio {
+        pinmux_enum_t enum_id;
+        pinmux_flag_t flags;
+};
+
+#define PINMUX_GPIO(gpio, data_or_mark) [gpio] = { data_or_mark }
+#define PINMUX_DATA(data_or_mark, ids...) data_or_mark, ids, 0
+
+struct pinmux_cfg_reg {
+        unsigned long reg, reg_width, field_width;
+        unsigned long *cnt;
+        pinmux_enum_t *enum_ids;
+};
+
+#define PINMUX_CFG_REG(name, r, r_width, f_width) \
+        .reg = r, .reg_width = r_width, .field_width = f_width,         \
+        .cnt = (unsigned long [r_width / f_width]) {}, \
+        .enum_ids = (pinmux_enum_t [(r_width / f_width) * (1 << f_width)]) \
+
+struct pinmux_data_reg {
+        unsigned long reg, reg_width, reg_shadow;
+        pinmux_enum_t *enum_ids;
+};
+
+#define PINMUX_DATA_REG(name, r, r_width) \
+        .reg = r, .reg_width = r_width, \
+        .enum_ids = (pinmux_enum_t [r_width]) \
+
+struct pinmux_range {
+        pinmux_enum_t begin;
+        pinmux_enum_t end;
+        pinmux_enum_t force;
+};
+
+struct pinmux_info {
+        char *name;
+        pinmux_enum_t reserved_id;
+        struct pinmux_range data;
+        struct pinmux_range input;
+        struct pinmux_range input_pd;
+        struct pinmux_range input_pu;
+        struct pinmux_range output;
+        struct pinmux_range mark;
+        struct pinmux_range function;
+
+        unsigned first_gpio, last_gpio;
+
+        struct pinmux_gpio *gpios;
+        struct pinmux_cfg_reg *cfg_regs;
+        struct pinmux_data_reg *data_regs;
+
+        pinmux_enum_t *gpio_data;
+        unsigned int gpio_data_size;
+
+        unsigned long *gpio_in_use;
+        struct gpio_chip chip;
+};
+
+int register_pinmux(struct pinmux_info *pip);
+
+#endif /* __SH_PFC_H */
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index bcdd6606f46..ae836fded53 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -299,7 +299,7 @@ typedef unsigned char *sk_buff_data_t;
  *      @nfctinfo: Relationship of this skb to the connection
  *      @nfct_reasm: netfilter conntrack re-assembly pointer
  *      @nf_bridge: Saved data about a bridged frame - see br_netfilter.c
- *      @iif: ifindex of device we arrived on
+ *      @skb_iif: ifindex of device we arrived on
  *      @queue_mapping: Queue mapping for multiqueue devices
  *      @tc_index: Traffic control index
  *      @tc_verd: traffic control verdict
@@ -366,7 +366,7 @@ struct sk_buff {
         struct nf_bridge_info   *nf_bridge;
 #endif
 
-        int                     iif;
+        int                     skb_iif;
 #ifdef CONFIG_NET_SCHED
         __u16                   tc_index;       /* traffic control index */
 #ifdef CONFIG_NET_CLS_ACT
@@ -389,8 +389,10 @@ struct sk_buff {
 #ifdef CONFIG_NETWORK_SECMARK
         __u32                   secmark;
 #endif
-
-        __u32                   mark;
+        union {
+                __u32           mark;
+                __u32           dropcount;
+        };
 
         __u16                   vlan_tci;
 
@@ -414,14 +416,6 @@ struct sk_buff {
 
 #include <asm/system.h>
 
-#ifdef CONFIG_HAS_DMA
-#include <linux/dma-mapping.h>
-extern int skb_dma_map(struct device *dev, struct sk_buff *skb,
-                       enum dma_data_direction dir);
-extern void skb_dma_unmap(struct device *dev, struct sk_buff *skb,
-                          enum dma_data_direction dir);
-#endif
-
 static inline struct dst_entry *skb_dst(const struct sk_buff *skb)
 {
         return (struct dst_entry *)skb->_skb_dst;
@@ -489,8 +483,7 @@ extern int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb,
                         int len,int odd, struct sk_buff *skb),
                         void *from, int length);
 
-struct skb_seq_state
-{
+struct skb_seq_state {
         __u32           lower_offset;
         __u32           upper_offset;
         __u32           frag_idx;
@@ -1489,6 +1482,16 @@ static inline struct sk_buff *netdev_alloc_skb(struct net_device *dev,
         return __netdev_alloc_skb(dev, length, GFP_ATOMIC);
 }
 
+static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
+                unsigned int length)
+{
+        struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN);
+
+        if (NET_IP_ALIGN && skb)
+                skb_reserve(skb, NET_IP_ALIGN);
+        return skb;
+}
+
 extern struct page *__netdev_alloc_page(struct net_device *dev, gfp_t gfp_mask);
 
 /**
diff --git a/include/linux/slow-work.h b/include/linux/slow-work.h
index b65c8881f07..13337bf6c3f 100644
--- a/include/linux/slow-work.h
+++ b/include/linux/slow-work.h
@@ -17,13 +17,20 @@
 #ifdef CONFIG_SLOW_WORK
 
 #include <linux/sysctl.h>
+#include <linux/timer.h>
 
 struct slow_work;
+#ifdef CONFIG_SLOW_WORK_DEBUG
+struct seq_file;
+#endif
 
 /*
  * The operations used to support slow work items
  */
 struct slow_work_ops {
+        /* owner */
+        struct module *owner;
+
         /* get a ref on a work item
          * - return 0 if successful, -ve if not
          */
@@ -34,6 +41,11 @@ struct slow_work_ops {
 
         /* execute a work item */
         void (*execute)(struct slow_work *work);
+
+#ifdef CONFIG_SLOW_WORK_DEBUG
+        /* describe a work item for debugfs */
+        void (*desc)(struct slow_work *work, struct seq_file *m);
+#endif
 };
 
 /*
@@ -42,13 +54,24 @@ struct slow_work_ops {
  *   queued
  */
 struct slow_work {
+        struct module           *owner; /* the owning module */
         unsigned long           flags;
 #define SLOW_WORK_PENDING       0       /* item pending (further) execution */
 #define SLOW_WORK_EXECUTING     1       /* item currently executing */
 #define SLOW_WORK_ENQ_DEFERRED  2       /* item enqueue deferred */
 #define SLOW_WORK_VERY_SLOW     3       /* item is very slow */
+#define SLOW_WORK_CANCELLING    4       /* item is being cancelled, don't enqueue */
+#define SLOW_WORK_DELAYED       5       /* item is struct delayed_slow_work with active timer */
         const struct slow_work_ops *ops; /* operations table for this item */
         struct list_head        link;   /* link in queue */
+#ifdef CONFIG_SLOW_WORK_DEBUG
+        struct timespec         mark;   /* jiffies at which queued or exec begun */
+#endif
+};
+
+struct delayed_slow_work {
+        struct slow_work        work;
+        struct timer_list       timer;
 };
 
 /**
@@ -67,6 +90,20 @@ static inline void slow_work_init(struct slow_work *work,
 }
 
 /**
+ * slow_work_init - Initialise a delayed slow work item
+ * @work: The work item to initialise
+ * @ops: The operations to use to handle the slow work item
+ *
+ * Initialise a delayed slow work item.
+ */
+static inline void delayed_slow_work_init(struct delayed_slow_work *dwork,
+                                          const struct slow_work_ops *ops)
+{
+        init_timer(&dwork->timer);
+        slow_work_init(&dwork->work, ops);
+}
+
+/**
  * vslow_work_init - Initialise a very slow work item
  * @work: The work item to initialise
  * @ops: The operations to use to handle the slow work item
@@ -83,9 +120,40 @@ static inline void vslow_work_init(struct slow_work *work,
         INIT_LIST_HEAD(&work->link);
 }
 
+/**
+ * slow_work_is_queued - Determine if a slow work item is on the work queue
+ * work: The work item to test
+ *
+ * Determine if the specified slow-work item is on the work queue.  This
+ * returns true if it is actually on the queue.
+ *
+ * If the item is executing and has been marked for requeue when execution
+ * finishes, then false will be returned.
+ *
+ * Anyone wishing to wait for completion of execution can wait on the
+ * SLOW_WORK_EXECUTING bit.
+ */
+static inline bool slow_work_is_queued(struct slow_work *work)
+{
+        unsigned long flags = work->flags;
+        return flags & SLOW_WORK_PENDING && !(flags & SLOW_WORK_EXECUTING);
+}
+
 extern int slow_work_enqueue(struct slow_work *work);
-extern int slow_work_register_user(void);
-extern void slow_work_unregister_user(void);
+extern void slow_work_cancel(struct slow_work *work);
+extern int slow_work_register_user(struct module *owner);
+extern void slow_work_unregister_user(struct module *owner);
+
+extern int delayed_slow_work_enqueue(struct delayed_slow_work *dwork,
+                                     unsigned long delay);
+
+static inline void delayed_slow_work_cancel(struct delayed_slow_work *dwork)
+{
+        slow_work_cancel(&dwork->work);
+}
+
+extern bool slow_work_sleep_till_thread_needed(struct slow_work *work,
+                                               signed long *_timeout);
 
 #ifdef CONFIG_SYSCTL
 extern ctl_table slow_work_sysctls[];
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 39c64bae776..7a0570e6a59 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -76,6 +76,9 @@ void smp_call_function_many(const struct cpumask *mask,
 void __smp_call_function_single(int cpuid, struct call_single_data *data,
                                 int wait);
 
+int smp_call_function_any(const struct cpumask *mask,
+                          void (*func)(void *info), void *info, int wait);
+
 /*
  * Generic and arch helpers
  */
@@ -137,9 +140,15 @@ static inline void smp_send_reschedule(int cpu) { }
 #define smp_prepare_boot_cpu()                  do {} while (0)
 #define smp_call_function_many(mask, func, info, wait) \
                         (up_smp_call_function(func, info))
-static inline void init_call_single_data(void)
+static inline void init_call_single_data(void) { }
+
+static inline int
+smp_call_function_any(const struct cpumask *mask, void (*func)(void *info),
+                      void *info, int wait)
 {
+        return smp_call_function_single(0, func, info, wait);
 }
+
 #endif /* !SMP */
 
 /*
diff --git a/include/linux/smp_lock.h b/include/linux/smp_lock.h
index 813be59bf34..2ea1dd1ba21 100644
--- a/include/linux/smp_lock.h
+++ b/include/linux/smp_lock.h
@@ -24,8 +24,21 @@ static inline int reacquire_kernel_lock(struct task_struct *task)
         return 0;
 }
 
-extern void __lockfunc lock_kernel(void)        __acquires(kernel_lock);
-extern void __lockfunc unlock_kernel(void)      __releases(kernel_lock);
+extern void __lockfunc
+_lock_kernel(const char *func, const char *file, int line)
+__acquires(kernel_lock);
+
+extern void __lockfunc
+_unlock_kernel(const char *func, const char *file, int line)
+__releases(kernel_lock);
+
+#define lock_kernel() do {                                      \
+        _lock_kernel(__func__, __FILE__, __LINE__);             \
+} while (0)
+
+#define unlock_kernel() do {                                    \
+        _unlock_kernel(__func__, __FILE__, __LINE__);           \
+} while (0)
 
 /*
  * Various legacy drivers don't really need the BKL in a specific
@@ -41,8 +54,8 @@ static inline void cycle_kernel_lock(void)
 
 #else
 
-#define lock_kernel()                           do { } while(0)
-#define unlock_kernel()                         do { } while(0)
+#define lock_kernel()
+#define unlock_kernel()
 #define release_kernel_lock(task)               do { } while(0)
 #define cycle_kernel_lock()                     do { } while(0)
 #define reacquire_kernel_lock(task)             0
diff --git a/include/linux/smsc911x.h b/include/linux/smsc911x.h
index 5241e4fb4ec..7144e8aa1e4 100644
--- a/include/linux/smsc911x.h
+++ b/include/linux/smsc911x.h
@@ -30,6 +30,7 @@ struct smsc911x_platform_config {
         unsigned int irq_type;
         unsigned int flags;
         phy_interface_t phy_interface;
+        unsigned char mac[6];
 };
 
 /* Constants for platform_device irq polarity configuration */
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 3273a0c5043..7b3aae2052a 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                       */
 
+#define __sockaddr_check_size(size)     \
+        BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
+
 #ifdef __KERNEL__
 # ifdef CONFIG_PROC_FS
 struct seq_file;
@@ -65,6 +68,12 @@ struct msghdr {
         unsigned        msg_flags;
 };
 
+/* For recvmmsg/sendmmsg */
+struct mmsghdr {
+        struct msghdr   msg_hdr;
+        unsigned        msg_len;
+};
+
 /*
  *      POSIX 1003.1g - ancillary data object information
  *      Ancillary data consits of a sequence of pairs of
@@ -312,6 +321,10 @@ extern int move_addr_to_user(struct sockaddr *kaddr, int klen, void __user *uadd
 extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr *kaddr);
 extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
 
+struct timespec;
+
+extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
+                          unsigned int flags, struct timespec *timeout);
 #endif
 #endif /* not kernel and not glibc */
 #endif /* _LINUX_SOCKET_H */
diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h
index eed4254bd50..3274c507b8a 100644
--- a/include/linux/spi/spi_bitbang.h
+++ b/include/linux/spi/spi_bitbang.h
@@ -15,7 +15,7 @@
  * Some hardware works well with requests at spi_transfer scope:
  *
  *   -  Drivers leveraging smarter hardware, with fifos or DMA; or for half
- *      duplex (MicroWire) controllers.  Provide chipslect() and txrx_bufs(),
+ *      duplex (MicroWire) controllers.  Provide chipselect() and txrx_bufs(),
  *      and custom setup()/cleanup() methods.
  */
 
diff --git a/include/linux/spi/wl12xx.h b/include/linux/spi/wl12xx.h
index 11430cab2aa..aed64ed3dc8 100644
--- a/include/linux/spi/wl12xx.h
+++ b/include/linux/spi/wl12xx.h
@@ -26,6 +26,7 @@
 
 struct wl12xx_platform_data {
         void (*set_power)(bool enable);
+        bool use_eeprom;
 };
 
 #endif
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index f0ca7a7a175..71dccfeb0d8 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -79,8 +79,6 @@
  */
 #include <linux/spinlock_types.h>
 
-extern int __lockfunc generic__raw_read_trylock(raw_rwlock_t *lock);
-
 /*
  * Pull the __raw*() functions/declarations (UP-nondebug doesnt need them):
  */
@@ -102,7 +100,7 @@ do {								\
 
 #else
 # define spin_lock_init(lock)                                   \
-        do { *(lock) = SPIN_LOCK_UNLOCKED; } while (0)
+        do { *(lock) = __SPIN_LOCK_UNLOCKED(lock); } while (0)
 #endif
 
 #ifdef CONFIG_DEBUG_SPINLOCK
@@ -116,7 +114,7 @@ do {								\
 } while (0)
 #else
 # define rwlock_init(lock)                                      \
-        do { *(lock) = RW_LOCK_UNLOCKED; } while (0)
+        do { *(lock) = __RW_LOCK_UNLOCKED(lock); } while (0)
 #endif
 
 #define spin_is_locked(lock)    __raw_spin_is_locked(&(lock)->raw_lock)
diff --git a/include/linux/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h
index 7a7e18fc241..8264a7f459b 100644
--- a/include/linux/spinlock_api_smp.h
+++ b/include/linux/spinlock_api_smp.h
@@ -60,137 +60,118 @@ void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
 void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
                                                         __releases(lock);
 
-/*
- * We inline the unlock functions in the nondebug case:
- */
-#if !defined(CONFIG_DEBUG_SPINLOCK) && !defined(CONFIG_PREEMPT)
-#define __always_inline__spin_unlock
-#define __always_inline__read_unlock
-#define __always_inline__write_unlock
-#define __always_inline__spin_unlock_irq
-#define __always_inline__read_unlock_irq
-#define __always_inline__write_unlock_irq
-#endif
-
-#ifndef CONFIG_DEBUG_SPINLOCK
-#ifndef CONFIG_GENERIC_LOCKBREAK
-
-#ifdef __always_inline__spin_lock
+#ifdef CONFIG_INLINE_SPIN_LOCK
 #define _spin_lock(lock) __spin_lock(lock)
 #endif
 
-#ifdef __always_inline__read_lock
+#ifdef CONFIG_INLINE_READ_LOCK
 #define _read_lock(lock) __read_lock(lock)
 #endif
 
-#ifdef __always_inline__write_lock
+#ifdef CONFIG_INLINE_WRITE_LOCK
 #define _write_lock(lock) __write_lock(lock)
 #endif
 
-#ifdef __always_inline__spin_lock_bh
+#ifdef CONFIG_INLINE_SPIN_LOCK_BH
 #define _spin_lock_bh(lock) __spin_lock_bh(lock)
 #endif
 
-#ifdef __always_inline__read_lock_bh
+#ifdef CONFIG_INLINE_READ_LOCK_BH
 #define _read_lock_bh(lock) __read_lock_bh(lock)
 #endif
 
-#ifdef __always_inline__write_lock_bh
+#ifdef CONFIG_INLINE_WRITE_LOCK_BH
 #define _write_lock_bh(lock) __write_lock_bh(lock)
 #endif
 
-#ifdef __always_inline__spin_lock_irq
+#ifdef CONFIG_INLINE_SPIN_LOCK_IRQ
 #define _spin_lock_irq(lock) __spin_lock_irq(lock)
 #endif
 
-#ifdef __always_inline__read_lock_irq
+#ifdef CONFIG_INLINE_READ_LOCK_IRQ
 #define _read_lock_irq(lock) __read_lock_irq(lock)
 #endif
 
-#ifdef __always_inline__write_lock_irq
+#ifdef CONFIG_INLINE_WRITE_LOCK_IRQ
 #define _write_lock_irq(lock) __write_lock_irq(lock)
 #endif
 
-#ifdef __always_inline__spin_lock_irqsave
+#ifdef CONFIG_INLINE_SPIN_LOCK_IRQSAVE
 #define _spin_lock_irqsave(lock) __spin_lock_irqsave(lock)
 #endif
 
-#ifdef __always_inline__read_lock_irqsave
+#ifdef CONFIG_INLINE_READ_LOCK_IRQSAVE
 #define _read_lock_irqsave(lock) __read_lock_irqsave(lock)
 #endif
 
-#ifdef __always_inline__write_lock_irqsave
+#ifdef CONFIG_INLINE_WRITE_LOCK_IRQSAVE
 #define _write_lock_irqsave(lock) __write_lock_irqsave(lock)
 #endif
 
-#endif /* !CONFIG_GENERIC_LOCKBREAK */
-
-#ifdef __always_inline__spin_trylock
+#ifdef CONFIG_INLINE_SPIN_TRYLOCK
 #define _spin_trylock(lock) __spin_trylock(lock)
 #endif
 
-#ifdef __always_inline__read_trylock
+#ifdef CONFIG_INLINE_READ_TRYLOCK
 #define _read_trylock(lock) __read_trylock(lock)
 #endif
 
-#ifdef __always_inline__write_trylock
+#ifdef CONFIG_INLINE_WRITE_TRYLOCK
 #define _write_trylock(lock) __write_trylock(lock)
 #endif
 
-#ifdef __always_inline__spin_trylock_bh
+#ifdef CONFIG_INLINE_SPIN_TRYLOCK_BH
 #define _spin_trylock_bh(lock) __spin_trylock_bh(lock)
 #endif
 
-#ifdef __always_inline__spin_unlock
+#ifdef CONFIG_INLINE_SPIN_UNLOCK
 #define _spin_unlock(lock) __spin_unlock(lock)
 #endif
 
-#ifdef __always_inline__read_unlock
+#ifdef CONFIG_INLINE_READ_UNLOCK
 #define _read_unlock(lock) __read_unlock(lock)
 #endif
 
-#ifdef __always_inline__write_unlock
+#ifdef CONFIG_INLINE_WRITE_UNLOCK
 #define _write_unlock(lock) __write_unlock(lock)
 #endif
 
-#ifdef __always_inline__spin_unlock_bh
+#ifdef CONFIG_INLINE_SPIN_UNLOCK_BH
 #define _spin_unlock_bh(lock) __spin_unlock_bh(lock)
 #endif
 
-#ifdef __always_inline__read_unlock_bh
+#ifdef CONFIG_INLINE_READ_UNLOCK_BH
 #define _read_unlock_bh(lock) __read_unlock_bh(lock)
 #endif
 
-#ifdef __always_inline__write_unlock_bh
+#ifdef CONFIG_INLINE_WRITE_UNLOCK_BH
 #define _write_unlock_bh(lock) __write_unlock_bh(lock)
 #endif
 
-#ifdef __always_inline__spin_unlock_irq
+#ifdef CONFIG_INLINE_SPIN_UNLOCK_IRQ
 #define _spin_unlock_irq(lock) __spin_unlock_irq(lock)
 #endif
 
-#ifdef __always_inline__read_unlock_irq
+#ifdef CONFIG_INLINE_READ_UNLOCK_IRQ
 #define _read_unlock_irq(lock) __read_unlock_irq(lock)
 #endif
 
-#ifdef __always_inline__write_unlock_irq
+#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQ
 #define _write_unlock_irq(lock) __write_unlock_irq(lock)
 #endif
 
-#ifdef __always_inline__spin_unlock_irqrestore
+#ifdef CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE
 #define _spin_unlock_irqrestore(lock, flags) __spin_unlock_irqrestore(lock, flags)
 #endif
 
-#ifdef __always_inline__read_unlock_irqrestore
+#ifdef CONFIG_INLINE_READ_UNLOCK_IRQRESTORE
 #define _read_unlock_irqrestore(lock, flags) __read_unlock_irqrestore(lock, flags)
 #endif
 
-#ifdef __always_inline__write_unlock_irqrestore
+#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE
 #define _write_unlock_irqrestore(lock, flags) __write_unlock_irqrestore(lock, flags)
 #endif
 
-#endif /* CONFIG_DEBUG_SPINLOCK */
-
 static inline int __spin_trylock(spinlock_t *lock)
 {
         preempt_disable();
diff --git a/include/linux/srcu.h b/include/linux/srcu.h
index aca0eee5393..4765d97dcaf 100644
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
@@ -48,6 +48,7 @@ void cleanup_srcu_struct(struct srcu_struct *sp);
 int srcu_read_lock(struct srcu_struct *sp) __acquires(sp);
 void srcu_read_unlock(struct srcu_struct *sp, int idx) __releases(sp);
 void synchronize_srcu(struct srcu_struct *sp);
+void synchronize_srcu_expedited(struct srcu_struct *sp);
 long srcu_batches_completed(struct srcu_struct *sp);
 
 #endif
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 3d0a9ff24f0..24f98854736 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -269,7 +269,8 @@ struct ssb_bus {
 
         const struct ssb_bus_ops *ops;
 
-        /* The core in the basic address register window. (PCI bus only) */
+        /* The core currently mapped into the MMIO window.
+         * Not valid on all host-buses. So don't use outside of SSB. */
         struct ssb_device *mapped_device;
         union {
                 /* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
@@ -281,14 +282,17 @@ struct ssb_bus {
          * On PCMCIA-host busses this is used to protect the whole MMIO access. */
         spinlock_t bar_lock;
 
-        /* The bus this backplane is running on. */
+        /* The host-bus this backplane is running on. */
         enum ssb_bustype bustype;
-        /* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
-        struct pci_dev *host_pci;
-        /* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
-        struct pcmcia_device *host_pcmcia;
-        /* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
-        struct sdio_func *host_sdio;
+        /* Pointers to the host-bus. Check bustype before using any of these pointers. */
+        union {
+                /* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
+                struct pci_dev *host_pci;
+                /* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
+                struct pcmcia_device *host_pcmcia;
+                /* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
+                struct sdio_func *host_sdio;
+        };
 
         /* See enum ssb_quirks */
         unsigned int quirks;
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index cd15df6c63c..5e781d824e6 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -301,6 +301,8 @@ static inline int unregister_pm_notifier(struct notifier_block *nb)
 #define pm_notifier(fn, pri)    do { (void)(fn); } while (0)
 #endif /* !CONFIG_PM_SLEEP */
 
+extern struct mutex pm_mutex;
+
 #ifndef CONFIG_HIBERNATION
 static inline void register_nosave_region(unsigned long b, unsigned long e)
 {
@@ -308,8 +310,23 @@ static inline void register_nosave_region(unsigned long b, unsigned long e)
 static inline void register_nosave_region_late(unsigned long b, unsigned long e)
 {
 }
-#endif
 
-extern struct mutex pm_mutex;
+static inline void lock_system_sleep(void) {}
+static inline void unlock_system_sleep(void) {}
+
+#else
+
+/* Let some subsystems like memory hotadd exclude hibernation */
+
+static inline void lock_system_sleep(void)
+{
+        mutex_lock(&pm_mutex);
+}
+
+static inline void unlock_system_sleep(void)
+{
+        mutex_unlock(&pm_mutex);
+}
+#endif
 
 #endif /* _LINUX_SUSPEND_H */
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 73b1f1cec42..febedcf67c7 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -7,6 +7,8 @@ struct device;
 struct dma_attrs;
 struct scatterlist;
 
+extern int swiotlb_force;
+
 /*
  * Maximum allowable number of contiguous slabs to map,
  * must be a power of 2.  What is the appropriate value ?
@@ -20,8 +22,7 @@ struct scatterlist;
  */
 #define IO_TLB_SHIFT 11
 
-extern void
-swiotlb_init(void);
+extern void swiotlb_init(int verbose);
 
 extern void
 *swiotlb_alloc_coherent(struct device *hwdev, size_t size,
@@ -88,4 +89,11 @@ swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr);
 extern int
 swiotlb_dma_supported(struct device *hwdev, u64 mask);
 
+#ifdef CONFIG_SWIOTLB
+extern void __init swiotlb_free(void);
+#else
+static inline void swiotlb_free(void) { }
+#endif
+
+extern void swiotlb_print_info(void);
 #endif /* __LINUX_SWIOTLB_H */
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index a990ace1a83..bc70c5810fe 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -25,6 +25,7 @@ struct linux_dirent64;
 struct list_head;
 struct msgbuf;
 struct msghdr;
+struct mmsghdr;
 struct msqid_ds;
 struct new_utsname;
 struct nfsctl_arg;
@@ -99,37 +100,16 @@ struct perf_event_attr;
 #define __SC_TEST6(t6, a6, ...) __SC_TEST(t6); __SC_TEST5(__VA_ARGS__)
 
 #ifdef CONFIG_EVENT_PROFILE
-#define TRACE_SYS_ENTER_PROFILE(sname)                                         \
-static int prof_sysenter_enable_##sname(void)                                  \
-{                                                                              \
-        return reg_prof_syscall_enter("sys"#sname);                            \
-}                                                                              \
-                                                                               \
-static void prof_sysenter_disable_##sname(void)                                \
-{                                                                              \
-        unreg_prof_syscall_enter("sys"#sname);                                 \
-}
-
-#define TRACE_SYS_EXIT_PROFILE(sname)                                          \
-static int prof_sysexit_enable_##sname(void)                                   \
-{                                                                              \
-        return reg_prof_syscall_exit("sys"#sname);                             \
-}                                                                              \
-                                                                               \
-static void prof_sysexit_disable_##sname(void)                                 \
-{                                                                              \
-        unreg_prof_syscall_exit("sys"#sname);                                  \
-}
 
 #define TRACE_SYS_ENTER_PROFILE_INIT(sname)                                    \
         .profile_count = ATOMIC_INIT(-1),                                      \
-        .profile_enable = prof_sysenter_enable_##sname,                        \
-        .profile_disable = prof_sysenter_disable_##sname,
+        .profile_enable = prof_sysenter_enable,                                \
+        .profile_disable = prof_sysenter_disable,
 
 #define TRACE_SYS_EXIT_PROFILE_INIT(sname)                                     \
         .profile_count = ATOMIC_INIT(-1),                                      \
-        .profile_enable = prof_sysexit_enable_##sname,                         \
-        .profile_disable = prof_sysexit_disable_##sname,
+        .profile_enable = prof_sysexit_enable,                                 \
+        .profile_disable = prof_sysexit_disable,
 #else
 #define TRACE_SYS_ENTER_PROFILE(sname)
 #define TRACE_SYS_ENTER_PROFILE_INIT(sname)
@@ -153,74 +133,46 @@ static void prof_sysexit_disable_##sname(void)				       \
 #define __SC_STR_TDECL6(t, a, ...)      #t, __SC_STR_TDECL5(__VA_ARGS__)
 
 #define SYSCALL_TRACE_ENTER_EVENT(sname)                                \
+        static const struct syscall_metadata __syscall_meta_##sname;    \
         static struct ftrace_event_call event_enter_##sname;            \
-        struct trace_event enter_syscall_print_##sname = {              \
+        static struct trace_event enter_syscall_print_##sname = {       \
                 .trace                  = print_syscall_enter,          \
         };                                                              \
-        static int init_enter_##sname(void)                             \
-        {                                                               \
-                int num, id;                                            \
-                num = syscall_name_to_nr("sys"#sname);                  \
-                if (num < 0)                                            \
-                        return -ENOSYS;                                 \
-                id = register_ftrace_event(&enter_syscall_print_##sname);\
-                if (!id)                                                \
-                        return -ENODEV;                                 \
-                event_enter_##sname.id = id;                            \
-                set_syscall_enter_id(num, id);                          \
-                INIT_LIST_HEAD(&event_enter_##sname.fields);            \
-                return 0;                                               \
-        }                                                               \
-        TRACE_SYS_ENTER_PROFILE(sname);                                 \
         static struct ftrace_event_call __used                          \
           __attribute__((__aligned__(4)))                               \
           __attribute__((section("_ftrace_events")))                    \
           event_enter_##sname = {                                       \
                 .name                   = "sys_enter"#sname,            \
                 .system                 = "syscalls",                   \
-                .event                  = &event_syscall_enter,         \
-                .raw_init               = init_enter_##sname,           \
+                .event                  = &enter_syscall_print_##sname, \
+                .raw_init               = init_syscall_trace,           \
                 .show_format            = syscall_enter_format,         \
                 .define_fields          = syscall_enter_define_fields,  \
                 .regfunc                = reg_event_syscall_enter,      \
                 .unregfunc              = unreg_event_syscall_enter,    \
-                .data                   = "sys"#sname,                  \
+                .data                   = (void *)&__syscall_meta_##sname,\
                 TRACE_SYS_ENTER_PROFILE_INIT(sname)                     \
         }
 
 #define SYSCALL_TRACE_EXIT_EVENT(sname)                                 \
+        static const struct syscall_metadata __syscall_meta_##sname;    \
         static struct ftrace_event_call event_exit_##sname;             \
-        struct trace_event exit_syscall_print_##sname = {               \
+        static struct trace_event exit_syscall_print_##sname = {        \
                 .trace                  = print_syscall_exit,           \
         };                                                              \
-        static int init_exit_##sname(void)                              \
-        {                                                               \
-                int num, id;                                            \
-                num = syscall_name_to_nr("sys"#sname);                  \
-                if (num < 0)                                            \
-                        return -ENOSYS;                                 \
-                id = register_ftrace_event(&exit_syscall_print_##sname);\
-                if (!id)                                                \
-                        return -ENODEV;                                 \
-                event_exit_##sname.id = id;                             \
-                set_syscall_exit_id(num, id);                           \
-                INIT_LIST_HEAD(&event_exit_##sname.fields);             \
-                return 0;                                               \
-        }                                                               \
-        TRACE_SYS_EXIT_PROFILE(sname);                                  \
         static struct ftrace_event_call __used                          \
           __attribute__((__aligned__(4)))                               \
           __attribute__((section("_ftrace_events")))                    \
           event_exit_##sname = {                                        \
                 .name                   = "sys_exit"#sname,             \
                 .system                 = "syscalls",                   \
-                .event                  = &event_syscall_exit,          \
-                .raw_init               = init_exit_##sname,            \
+                .event                  = &exit_syscall_print_##sname,  \
+                .raw_init               = init_syscall_trace,           \
                 .show_format            = syscall_exit_format,          \
                 .define_fields          = syscall_exit_define_fields,   \
                 .regfunc                = reg_event_syscall_exit,       \
                 .unregfunc              = unreg_event_syscall_exit,     \
-                .data                   = "sys"#sname,                  \
+                .data                   = (void *)&__syscall_meta_##sname,\
                 TRACE_SYS_EXIT_PROFILE_INIT(sname)                      \
         }
 
@@ -677,6 +629,9 @@ asmlinkage long sys_recv(int, void __user *, size_t, unsigned);
 asmlinkage long sys_recvfrom(int, void __user *, size_t, unsigned,
                                 struct sockaddr __user *, int __user *);
 asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned flags);
+asmlinkage long sys_recvmmsg(int fd, struct mmsghdr __user *msg,
+                             unsigned int vlen, unsigned flags,
+                             struct timespec __user *timeout);
 asmlinkage long sys_socket(int, int, int);
 asmlinkage long sys_socketpair(int, int, int, int __user *);
 asmlinkage long sys_socketcall(int call, unsigned long __user *args);
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 1e4743ee683..877ba039e6a 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -15,9 +15,6 @@
  **  The kernel will then return -ENOTDIR to any application using
  **  the old binary interface.
  **
- **  For new interfaces unless you really need a binary number
- **  please use CTL_UNNUMBERED.
- **
  ****************************************************************
  ****************************************************************
  */
@@ -50,12 +47,6 @@ struct __sysctl_args {
 
 /* Top-level names: */
 
-/* For internal pattern-matching use only: */
-#ifdef __KERNEL__
-#define CTL_NONE        0
-#define CTL_UNNUMBERED  CTL_NONE        /* sysctl without a binary number */
-#endif
-
 enum
 {
         CTL_KERN=1,             /* General kernel info and control */
@@ -98,8 +89,8 @@ enum
         KERN_VERSION=4,         /* string: compile time info */
         KERN_SECUREMASK=5,      /* struct: maximum rights mask */
         KERN_PROF=6,            /* table: profiling information */
-        KERN_NODENAME=7,
-        KERN_DOMAINNAME=8,
+        KERN_NODENAME=7,        /* string: hostname */
+        KERN_DOMAINNAME=8,      /* string: domainname */
 
         KERN_PANIC=15,          /* int: panic timeout */
         KERN_REALROOTDEV=16,    /* real root device to mount after initrd */
@@ -111,8 +102,8 @@ enum
         KERN_PPC_HTABRECLAIM=25, /* turn htab reclaimation on/off on PPC */
         KERN_PPC_ZEROPAGED=26,  /* turn idle page zeroing on/off on PPC */
         KERN_PPC_POWERSAVE_NAP=27, /* use nap mode for power saving */
-        KERN_MODPROBE=28,
-        KERN_SG_BIG_BUFF=29,
+        KERN_MODPROBE=28,       /* string: modprobe path */
+        KERN_SG_BIG_BUFF=29,    /* int: sg driver reserved buffer size */
         KERN_ACCT=30,           /* BSD process accounting parameters */
         KERN_PPC_L2CR=31,       /* l2cr register on PPC */
 
@@ -159,7 +150,7 @@ enum
         KERN_ACPI_VIDEO_FLAGS=71, /* int: flags for setting up video after ACPI sleep */
         KERN_IA64_UNALIGNED=72, /* int: ia64 unaligned userland trap enable */
         KERN_COMPAT_LOG=73,     /* int: print compat layer  messages */
-        KERN_MAX_LOCK_DEPTH=74,
+        KERN_MAX_LOCK_DEPTH=74, /* int: rtmutex's maximum lock depth */
         KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
         KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
 };
@@ -490,6 +481,7 @@ enum
         NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
         NET_IPV4_CONF_ARP_ACCEPT=21,
         NET_IPV4_CONF_ARP_NOTIFY=22,
+        NET_IPV4_CONF_ACCEPT_LOCAL=23,
         __NET_IPV4_CONF_MAX
 };
 
@@ -972,10 +964,6 @@ extern int sysctl_perm(struct ctl_table_root *root,
 
 typedef struct ctl_table ctl_table;
 
-typedef int ctl_handler (struct ctl_table *table,
-                         void __user *oldval, size_t __user *oldlenp,
-                         void __user *newval, size_t newlen);
-
 typedef int proc_handler (struct ctl_table *ctl, int write,
                           void __user *buffer, size_t *lenp, loff_t *ppos);
 
@@ -996,21 +984,10 @@ extern int proc_doulongvec_minmax(struct ctl_table *, int,
 extern int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int,
                                       void __user *, size_t *, loff_t *);
 
-extern int do_sysctl (int __user *name, int nlen,
-                      void __user *oldval, size_t __user *oldlenp,
-                      void __user *newval, size_t newlen);
-
-extern ctl_handler sysctl_data;
-extern ctl_handler sysctl_string;
-extern ctl_handler sysctl_intvec;
-extern ctl_handler sysctl_jiffies;
-extern ctl_handler sysctl_ms_jiffies;
-
-
 /*
  * Register a set of sysctl names by calling register_sysctl_table
- * with an initialised array of struct ctl_table's.  An entry with zero
- * ctl_name and NULL procname terminates the table.  table->de will be
+ * with an initialised array of struct ctl_table's.  An entry with 
+ * NULL procname terminates the table.  table->de will be
  * set up by the registration and need not be initialised in advance.
  *
  * sysctl names can be mirrored automatically under /proc/sys.  The
@@ -1023,24 +1000,11 @@ extern ctl_handler sysctl_ms_jiffies;
  * under /proc; non-leaf nodes will be represented by directories.  A
  * null procname disables /proc mirroring at this node.
  *
- * sysctl entries with a zero ctl_name will not be available through
- * the binary sysctl interface.
- *
  * sysctl(2) can automatically manage read and write requests through
  * the sysctl table.  The data and maxlen fields of the ctl_table
  * struct enable minimal validation of the values being written to be
  * performed, and the mode field allows minimal authentication.
  * 
- * More sophisticated management can be enabled by the provision of a
- * strategy routine with the table entry.  This will be called before
- * any automatic read or write of the data is performed.
- * 
- * The strategy routine may return:
- * <0: Error occurred (error is passed to user process)
- * 0:  OK - proceed with automatic read or write.
- * >0: OK - read or write has been done by the strategy routine, so 
- *     return immediately.
- * 
  * There must be a proc_handler routine for any terminal nodes
  * mirrored under /proc/sys (non-terminals are handled by a built-in
  * directory handler).  Several default handlers are available to
@@ -1050,7 +1014,6 @@ extern ctl_handler sysctl_ms_jiffies;
 /* A sysctl table is an array of struct ctl_table: */
 struct ctl_table 
 {
-        int ctl_name;                   /* Binary ID */
         const char *procname;           /* Text ID for /proc/sys, or zero */
         void *data;
         int maxlen;
@@ -1058,7 +1021,6 @@ struct ctl_table
         struct ctl_table *child;
         struct ctl_table *parent;       /* Automatically set */
         proc_handler *proc_handler;     /* Callback for text formatting */
-        ctl_handler *strategy;          /* Callback function for all r/w */
         void *extra1;
         void *extra2;
 };
@@ -1092,7 +1054,6 @@ struct ctl_table_header
 /* struct ctl_path describes where in the hierarchy a table is added */
 struct ctl_path {
         const char *procname;
-        int ctl_name;
 };
 
 void register_sysctl_root(struct ctl_table_root *root);
diff --git a/include/linux/tc_act/tc_defact.h b/include/linux/tc_act/tc_defact.h
index 964f473af0f..6f65d07c7ce 100644
--- a/include/linux/tc_act/tc_defact.h
+++ b/include/linux/tc_act/tc_defact.h
@@ -3,13 +3,11 @@
 
 #include <linux/pkt_cls.h>
 
-struct tc_defact
-{
+struct tc_defact {
         tc_gen;
 };
                                                                                 
-enum
-{
+enum {
         TCA_DEF_UNSPEC,
         TCA_DEF_TM,
         TCA_DEF_PARMS,
diff --git a/include/linux/tc_act/tc_gact.h b/include/linux/tc_act/tc_gact.h
index e895c0a3962..f7bf94eed51 100644
--- a/include/linux/tc_act/tc_gact.h
+++ b/include/linux/tc_act/tc_gact.h
@@ -5,14 +5,12 @@
 #include <linux/pkt_cls.h>
 
 #define TCA_ACT_GACT 5
-struct tc_gact
-{
+struct tc_gact {
         tc_gen;
 
 };
 
-struct tc_gact_p
-{
+struct tc_gact_p {
 #define PGACT_NONE              0
 #define PGACT_NETRAND           1
 #define PGACT_DETERM            2
@@ -22,8 +20,7 @@ struct tc_gact_p
         int                   paction;
 };
  
-enum
-{
+enum {
         TCA_GACT_UNSPEC,
         TCA_GACT_TM,
         TCA_GACT_PARMS,
diff --git a/include/linux/tc_act/tc_ipt.h b/include/linux/tc_act/tc_ipt.h
index 4b6f7b6c7a7..a2335563d21 100644
--- a/include/linux/tc_act/tc_ipt.h
+++ b/include/linux/tc_act/tc_ipt.h
@@ -5,8 +5,7 @@
 
 #define TCA_ACT_IPT 6
 
-enum
-{
+enum {
         TCA_IPT_UNSPEC,
         TCA_IPT_TABLE,
         TCA_IPT_HOOK,
diff --git a/include/linux/tc_act/tc_mirred.h b/include/linux/tc_act/tc_mirred.h
index 0a99ab60d61..7561750e8fd 100644
--- a/include/linux/tc_act/tc_mirred.h
+++ b/include/linux/tc_act/tc_mirred.h
@@ -10,15 +10,13 @@
 #define TCA_INGRESS_REDIR 3  /* packet redirect to INGRESS*/
 #define TCA_INGRESS_MIRROR 4 /* mirror packet to INGRESS */
                                                                                 
-struct tc_mirred
-{
+struct tc_mirred {
         tc_gen;
         int                     eaction;   /* one of IN/EGRESS_MIRROR/REDIR */
         __u32                   ifindex;  /* ifindex of egress port */
 };
                                                                                 
-enum
-{
+enum {
         TCA_MIRRED_UNSPEC,
         TCA_MIRRED_TM,
         TCA_MIRRED_PARMS,
diff --git a/include/linux/tc_act/tc_nat.h b/include/linux/tc_act/tc_nat.h
index e7cf31e8ba7..6663aeba0b9 100644
--- a/include/linux/tc_act/tc_nat.h
+++ b/include/linux/tc_act/tc_nat.h
@@ -6,8 +6,7 @@
 
 #define TCA_ACT_NAT 9
 
-enum
-{
+enum {
         TCA_NAT_UNSPEC,
         TCA_NAT_PARMS,
         TCA_NAT_TM,
@@ -17,8 +16,7 @@ enum
 
 #define TCA_NAT_FLAG_EGRESS 1
 
-struct tc_nat
-{
+struct tc_nat {
         tc_gen;
         __be32 old_addr;
         __be32 new_addr;
diff --git a/include/linux/tc_act/tc_pedit.h b/include/linux/tc_act/tc_pedit.h
index 54ce9064115..716cfabcd5b 100644
--- a/include/linux/tc_act/tc_pedit.h
+++ b/include/linux/tc_act/tc_pedit.h
@@ -6,8 +6,7 @@
 
 #define TCA_ACT_PEDIT 7
 
-enum
-{
+enum {
         TCA_PEDIT_UNSPEC,
         TCA_PEDIT_TM,
         TCA_PEDIT_PARMS,
@@ -15,8 +14,7 @@ enum
 };
 #define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1)
                                                                                 
-struct tc_pedit_key
-{
+struct tc_pedit_key {
         __u32           mask;  /* AND */
         __u32           val;   /*XOR */
         __u32           off;  /*offset */
@@ -25,8 +23,7 @@ struct tc_pedit_key
         __u32           shift;
 };
                                                                                 
-struct tc_pedit_sel
-{
+struct tc_pedit_sel {
         tc_gen;
         unsigned char           nkeys;
         unsigned char           flags;
diff --git a/include/linux/tc_act/tc_skbedit.h b/include/linux/tc_act/tc_skbedit.h
index a14e461a7af..7a2e910a5f0 100644
--- a/include/linux/tc_act/tc_skbedit.h
+++ b/include/linux/tc_act/tc_skbedit.h
@@ -26,6 +26,7 @@
 
 #define SKBEDIT_F_PRIORITY              0x1
 #define SKBEDIT_F_QUEUE_MAPPING         0x2
+#define SKBEDIT_F_MARK                  0x4
 
 struct tc_skbedit {
         tc_gen;
@@ -37,6 +38,7 @@ enum {
         TCA_SKBEDIT_PARMS,
         TCA_SKBEDIT_PRIORITY,
         TCA_SKBEDIT_QUEUE_MAPPING,
+        TCA_SKBEDIT_MARK,
         __TCA_SKBEDIT_MAX
 };
 #define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)
diff --git a/include/linux/tc_ematch/tc_em_cmp.h b/include/linux/tc_ematch/tc_em_cmp.h
index 38e7f7b25ec..f34bb1bae08 100644
--- a/include/linux/tc_ematch/tc_em_cmp.h
+++ b/include/linux/tc_ematch/tc_em_cmp.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 #include <linux/pkt_cls.h>
 
-struct tcf_em_cmp
-{
+struct tcf_em_cmp {
         __u32           val;
         __u32           mask;
         __u16           off;
@@ -15,8 +14,7 @@ struct tcf_em_cmp
         __u8            opnd:4;
 };
 
-enum
-{
+enum {
         TCF_EM_ALIGN_U8  = 1,
         TCF_EM_ALIGN_U16 = 2,
         TCF_EM_ALIGN_U32 = 4
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index dcfb733fa1f..0864206ec1a 100644
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 #include <linux/pkt_cls.h>
 
-enum
-{
+enum {
         TCA_EM_META_UNSPEC,
         TCA_EM_META_HDR,
         TCA_EM_META_LVALUE,
@@ -14,8 +13,7 @@ enum
 };
 #define TCA_EM_META_MAX (__TCA_EM_META_MAX - 1)
 
-struct tcf_meta_val
-{
+struct tcf_meta_val {
         __u16                   kind;
         __u8                    shift;
         __u8                    op;
@@ -26,16 +24,14 @@ struct tcf_meta_val
 #define TCF_META_ID_MASK        0x7ff
 #define TCF_META_ID(kind)       ((kind) & TCF_META_ID_MASK)
 
-enum
-{
+enum {
         TCF_META_TYPE_VAR,
         TCF_META_TYPE_INT,
         __TCF_META_TYPE_MAX
 };
 #define TCF_META_TYPE_MAX (__TCF_META_TYPE_MAX - 1)
 
-enum
-{
+enum {
         TCF_META_ID_VALUE,
         TCF_META_ID_RANDOM,
         TCF_META_ID_LOADAVG_0,
@@ -87,8 +83,7 @@ enum
 };
 #define TCF_META_ID_MAX (__TCF_META_ID_MAX - 1)
 
-struct tcf_meta_hdr
-{
+struct tcf_meta_hdr {
         struct tcf_meta_val     left;
         struct tcf_meta_val     right;
 };
diff --git a/include/linux/tc_ematch/tc_em_nbyte.h b/include/linux/tc_ematch/tc_em_nbyte.h
index 9ed8c2e5848..7172cfb999c 100644
--- a/include/linux/tc_ematch/tc_em_nbyte.h
+++ b/include/linux/tc_ematch/tc_em_nbyte.h
@@ -4,8 +4,7 @@
 #include <linux/types.h>
 #include <linux/pkt_cls.h>
 
-struct tcf_em_nbyte
-{
+struct tcf_em_nbyte {
         __u16           off;
         __u16           len:12;
         __u8            layer:4;
diff --git a/include/linux/tc_ematch/tc_em_text.h b/include/linux/tc_ematch/tc_em_text.h
index d12a73a225f..5aac4045ba8 100644
--- a/include/linux/tc_ematch/tc_em_text.h
+++ b/include/linux/tc_ematch/tc_em_text.h
@@ -6,8 +6,7 @@
 
 #define TC_EM_TEXT_ALGOSIZ      16
 
-struct tcf_em_text
-{
+struct tcf_em_text {
         char            algo[TC_EM_TEXT_ALGOSIZ];
         __u16           from_offset;
         __u16           to_offset;
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 61723a7c21f..7fee8a4df93 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -81,6 +81,12 @@ enum {
         TCP_DATA_OFFSET = __cpu_to_be32(0xF0000000)
 }; 
 
+/*
+ * TCP general constants
+ */
+#define TCP_MSS_DEFAULT          536U   /* IPv4 (RFC1122, RFC2581) */
+#define TCP_MSS_DESIRED         1220U   /* IPv6 (tunneled), EDNS0 (RFC3226) */
+
 /* TCP socket options */
 #define TCP_NODELAY             1       /* Turn off Nagle's algorithm. */
 #define TCP_MAXSEG              2       /* Limit MSS */
@@ -96,14 +102,15 @@ enum {
 #define TCP_QUICKACK            12      /* Block/reenable quick acks */
 #define TCP_CONGESTION          13      /* Congestion control algorithm */
 #define TCP_MD5SIG              14      /* TCP MD5 Signature (RFC2385) */
+#define TCP_COOKIE_TRANSACTIONS 15      /* TCP Cookie Transactions */
 
+/* for TCP_INFO socket option */
 #define TCPI_OPT_TIMESTAMPS     1
 #define TCPI_OPT_SACK           2
 #define TCPI_OPT_WSCALE         4
 #define TCPI_OPT_ECN            8
 
-enum tcp_ca_state
-{
+enum tcp_ca_state {
         TCP_CA_Open = 0,
 #define TCPF_CA_Open    (1<<TCP_CA_Open)
         TCP_CA_Disorder = 1,
@@ -116,8 +123,7 @@ enum tcp_ca_state
 #define TCPF_CA_Loss    (1<<TCP_CA_Loss)
 };
 
-struct tcp_info
-{
+struct tcp_info {
         __u8    tcpi_state;
         __u8    tcpi_ca_state;
         __u8    tcpi_retransmits;
@@ -170,6 +176,30 @@ struct tcp_md5sig {
         __u8    tcpm_key[TCP_MD5SIG_MAXKEYLEN];         /* key (binary) */
 };
 
+/* for TCP_COOKIE_TRANSACTIONS (TCPCT) socket option */
+#define TCP_COOKIE_MIN           8              /*  64-bits */
+#define TCP_COOKIE_MAX          16              /* 128-bits */
+#define TCP_COOKIE_PAIR_SIZE    (2*TCP_COOKIE_MAX)
+
+/* Flags for both getsockopt and setsockopt */
+#define TCP_COOKIE_IN_ALWAYS    (1 << 0)        /* Discard SYN without cookie */
+#define TCP_COOKIE_OUT_NEVER    (1 << 1)        /* Prohibit outgoing cookies,
+                                                 * supercedes everything. */
+
+/* Flags for getsockopt */
+#define TCP_S_DATA_IN           (1 << 2)        /* Was data received? */
+#define TCP_S_DATA_OUT          (1 << 3)        /* Was data sent? */
+
+/* TCP_COOKIE_TRANSACTIONS data */
+struct tcp_cookie_transactions {
+        __u16   tcpct_flags;                    /* see above */
+        __u8    __tcpct_pad1;                   /* zero */
+        __u8    tcpct_cookie_desired;           /* bytes */
+        __u16   tcpct_s_data_desired;           /* bytes of variable data */
+        __u16   tcpct_used;                     /* bytes in value */
+        __u8    tcpct_value[TCP_MSS_DEFAULT];
+};
+
 #ifdef __KERNEL__
 
 #include <linux/skbuff.h>
@@ -217,26 +247,38 @@ struct tcp_options_received {
                 sack_ok : 4,    /* SACK seen on SYN packet              */
                 snd_wscale : 4, /* Window scaling received from sender  */
                 rcv_wscale : 4; /* Window scaling to send to receiver   */
-/*      SACKs data      */
+        u8      cookie_plus:6,  /* bytes in authenticator/cookie option */
+                cookie_out_never:1,
+                cookie_in_always:1;
         u8      num_sacks;      /* Number of SACK blocks                */
-        u16     user_mss;       /* mss requested by user in ioctl */
+        u16     user_mss;       /* mss requested by user in ioctl       */
         u16     mss_clamp;      /* Maximal mss, negotiated at connection setup */
 };
 
+static inline void tcp_clear_options(struct tcp_options_received *rx_opt)
+{
+        rx_opt->tstamp_ok = rx_opt->sack_ok = 0;
+        rx_opt->wscale_ok = rx_opt->snd_wscale = 0;
+        rx_opt->cookie_plus = 0;
+}
+
 /* This is the max number of SACKS that we'll generate and process. It's safe
- * to increse this, although since:
+ * to increase this, although since:
  *   size = TCPOLEN_SACK_BASE_ALIGNED (4) + n * TCPOLEN_SACK_PERBLOCK (8)
  * only four options will fit in a standard TCP header */
 #define TCP_NUM_SACKS 4
 
+struct tcp_cookie_values;
+struct tcp_request_sock_ops;
+
 struct tcp_request_sock {
         struct inet_request_sock        req;
 #ifdef CONFIG_TCP_MD5SIG
         /* Only used by TCP MD5 Signature so far. */
         const struct tcp_request_sock_ops *af_specific;
 #endif
-        u32                             rcv_isn;
-        u32                             snt_isn;
+        u32                             rcv_isn;
+        u32                             snt_isn;
 };
 
 static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)
@@ -406,6 +448,12 @@ struct tcp_sock {
 /* TCP MD5 Signature Option information */
         struct tcp_md5sig_info  *md5sig_info;
 #endif
+
+        /* When the cookie options are generated and exchanged, then this
+         * object holds a reference to them (cookie_values->kref).  Also
+         * contains related tcp_cookie_transactions fields.
+         */
+        struct tcp_cookie_values  *cookie_values;
 };
 
 static inline struct tcp_sock *tcp_sk(const struct sock *sk)
@@ -424,6 +472,10 @@ struct tcp_timewait_sock {
         u16                       tw_md5_keylen;
         u8                        tw_md5_key[TCP_MD5SIG_MAXKEYLEN];
 #endif
+        /* Few sockets in timewait have cookies; in that case, then this
+         * object holds a reference to them (tw_cookie_values->kref).
+         */
+        struct tcp_cookie_values  *tw_cookie_values;
 };
 
 static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
@@ -431,6 +483,6 @@ static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
         return (struct tcp_timewait_sock *)sk;
 }
 
-#endif
+#endif  /* __KERNEL__ */
 
 #endif  /* _LINUX_TCP_H */
diff --git a/include/linux/tick.h b/include/linux/tick.h
index 0482229c07d..d2ae79e21be 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -43,6 +43,7 @@ enum tick_nohz_mode {
  * @idle_exittime:      Time when the idle state was left
  * @idle_sleeptime:     Sum of the time slept in idle with sched tick stopped
  * @sleep_length:       Duration of the current idle sleep
+ * @do_timer_lst:       CPU was the last one doing do_timer before going idle
  */
 struct tick_sched {
         struct hrtimer                  sched_timer;
@@ -64,6 +65,7 @@ struct tick_sched {
         unsigned long                   last_jiffies;
         unsigned long                   next_jiffies;
         ktime_t                         idle_expires;
+        int                             do_timer_last;
 };
 
 extern void __init tick_init(void);
@@ -98,6 +100,9 @@ extern int tick_check_oneshot_change(int allow_nohz);
 extern struct tick_sched *tick_get_tick_sched(int cpu);
 extern void tick_check_idle(int cpu);
 extern int tick_oneshot_mode_active(void);
+#  ifndef arch_needs_cpu
+#   define arch_needs_cpu(cpu) (0)
+#  endif
 # else
 static inline void tick_clock_notify(void) { }
 static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }
diff --git a/include/linux/time.h b/include/linux/time.h
index fe04e5ef6a5..6e026e45a17 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -148,6 +148,7 @@ extern void monotonic_to_bootbased(struct timespec *ts);
 
 extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
 extern int timekeeping_valid_for_hres(void);
+extern u64 timekeeping_max_deferment(void);
 extern void update_wall_time(void);
 extern void update_xtime_cache(u64 nsec);
 extern void timekeeping_leap_insert(int leapsecond);
diff --git a/include/linux/timex.h b/include/linux/timex.h
index e6967d10d9e..94f8faecdcb 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -115,13 +115,16 @@ struct timex {
 #define ADJ_OFFSET_SS_READ      0xa001  /* read-only adjtime */
 #endif
 
-/* xntp 3.4 compatibility names */
+/* NTP userland likes the MOD_ prefix better */
 #define MOD_OFFSET      ADJ_OFFSET
 #define MOD_FREQUENCY   ADJ_FREQUENCY
 #define MOD_MAXERROR    ADJ_MAXERROR
 #define MOD_ESTERROR    ADJ_ESTERROR
 #define MOD_STATUS      ADJ_STATUS
 #define MOD_TIMECONST   ADJ_TIMECONST
+#define MOD_TAI ADJ_TAI
+#define MOD_MICRO       ADJ_MICRO
+#define MOD_NANO        ADJ_NANO
 
 
 /*
@@ -261,11 +264,7 @@ static inline int ntp_synced(void)
 
 #define NTP_SCALE_SHIFT         32
 
-#ifdef CONFIG_NO_HZ
-#define NTP_INTERVAL_FREQ  (2)
-#else
 #define NTP_INTERVAL_FREQ  (HZ)
-#endif
 #define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ)
 
 /* Returns how long ticks are at present, in ns / 2^NTP_SCALE_SHIFT. */
diff --git a/include/linux/tpm.h b/include/linux/tpm.h
index 3338b3f5c21..ac5d1c1285d 100644
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -27,9 +27,16 @@
  */
 #define TPM_ANY_NUM 0xFFFF
 
-#if defined(CONFIG_TCG_TPM)
+#if defined(CONFIG_TCG_TPM) || defined(CONFIG_TCG_TPM_MODULE)
 
 extern int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf);
 extern int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash);
+#else
+static inline int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf) {
+        return -ENODEV;
+}
+static inline int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash) {
+        return -ENODEV;
+}
 #endif
 #endif
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 2aac8a83e89..f59604ed0ec 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -280,6 +280,12 @@ static inline void tracepoint_synchronize_unregister(void)
  * TRACE_EVENT_FN to perform any (un)registration work.
  */
 
+#define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print)
+#define DEFINE_EVENT(template, name, proto, args)               \
+        DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
+#define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
+        DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
+
 #define TRACE_EVENT(name, proto, args, struct, assign, print)   \
         DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
 #define TRACE_EVENT_FN(name, proto, args, struct,               \
diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h
index adb44066680..1b479091105 100644
--- a/include/linux/ucb1400.h
+++ b/include/linux/ucb1400.h
@@ -110,6 +110,10 @@ struct ucb1400 {
         struct platform_device  *ucb1400_gpio;
 };
 
+struct ucb1400_pdata {
+        int     irq;
+};
+
 static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg)
 {
         return ac97->bus->ops->read(ac97, reg);
diff --git a/include/linux/udp.h b/include/linux/udp.h
index 0cf5c4c0ec8..03f72a2ba02 100644
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -45,16 +45,19 @@ static inline struct udphdr *udp_hdr(const struct sk_buff *skb)
         return (struct udphdr *)skb_transport_header(skb);
 }
 
-#define UDP_HTABLE_SIZE         128
+#define UDP_HTABLE_SIZE_MIN             (CONFIG_BASE_SMALL ? 128 : 256)
 
-static inline int udp_hashfn(struct net *net, const unsigned num)
+static inline int udp_hashfn(struct net *net, unsigned num, unsigned mask)
 {
-        return (num + net_hash_mix(net)) & (UDP_HTABLE_SIZE - 1);
+        return (num + net_hash_mix(net)) & mask;
 }
 
 struct udp_sock {
         /* inet_sock has to be the first member */
         struct inet_sock inet;
+#define udp_port_hash           inet.sk.__sk_common.skc_u16hashes[0]
+#define udp_portaddr_hash       inet.sk.__sk_common.skc_u16hashes[1]
+#define udp_portaddr_node       inet.sk.__sk_common.skc_portaddr_node
         int              pending;       /* Any pending frames ? */
         unsigned int     corkflag;      /* Cork is required */
         __u16            encap_type;    /* Is this an Encapsulation socket? */
@@ -85,6 +88,12 @@ static inline struct udp_sock *udp_sk(const struct sock *sk)
         return (struct udp_sock *)sk;
 }
 
+#define udp_portaddr_for_each_entry(__sk, node, list) \
+        hlist_nulls_for_each_entry(__sk, node, list, __sk_common.skc_portaddr_node)
+
+#define udp_portaddr_for_each_entry_rcu(__sk, node, list) \
+        hlist_nulls_for_each_entry_rcu(__sk, node, list, __sk_common.skc_portaddr_node)
+
 #define IS_UDPLITE(__sk) (udp_sk(__sk)->pcflag)
 
 #endif
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index f8147305205..8ce61359bf7 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -55,6 +55,7 @@ struct usbnet {
         struct sk_buff_head     done;
         struct sk_buff_head     rxq_pause;
         struct urb              *interrupt;
+        struct usb_anchor       deferred;
         struct tasklet_struct   bh;
 
         struct work_struct      kevent;
@@ -65,6 +66,8 @@ struct usbnet {
 #               define EVENT_STS_SPLIT  3
 #               define EVENT_LINK_RESET 4
 #               define EVENT_RX_PAUSED  5
+#               define EVENT_DEV_WAKING 6
+#               define EVENT_DEV_ASLEEP 7
 };
 
 static inline struct usb_driver *driver_of(struct usb_interface *intf)
@@ -90,7 +93,9 @@ struct driver_info {
 #define FLAG_WLAN       0x0080          /* use "wlan%d" names */
 #define FLAG_AVOID_UNLINK_URBS 0x0100   /* don't unlink urbs at usbnet_stop() */
 #define FLAG_SEND_ZLP   0x0200          /* hw requires ZLPs are sent */
+#define FLAG_WWAN       0x0400          /* use "wwan%d" names */
 
+#define FLAG_LINK_INTR  0x0800          /* updates link (carrier) status */
 
         /* init device ... can sleep, or cause probe() failure */
         int     (*bind)(struct usbnet *, struct usb_interface *);
@@ -107,6 +112,9 @@ struct driver_info {
         /* see if peer is connected ... can sleep */
         int     (*check_connect)(struct usbnet *);
 
+        /* (dis)activate runtime power management */
+        int     (*manage_power)(struct usbnet *, int);
+
         /* for status polling */
         void    (*status)(struct usbnet *, struct urb *);
 
diff --git a/include/linux/usb/wusb.h b/include/linux/usb/wusb.h
index 429c631d2aa..63ebdcc5dda 100644
--- a/include/linux/usb/wusb.h
+++ b/include/linux/usb/wusb.h
@@ -74,7 +74,7 @@ enum {
  * WUSB defines that CHIDs, CDIDs and CKs are a 16 byte string of
  * data. In order to avoid confusion and enforce types, we wrap it.
  *
- * Make it packed, as we use it in some hw defintions.
+ * Make it packed, as we use it in some hw definitions.
  */
 struct wusb_ckhdid {
         u8 data[16];
diff --git a/include/linux/user-return-notifier.h b/include/linux/user-return-notifier.h
new file mode 100644
index 00000000000..9c4a445bb43
--- /dev/null
+++ b/include/linux/user-return-notifier.h
@@ -0,0 +1,49 @@
+#ifndef _LINUX_USER_RETURN_NOTIFIER_H
+#define _LINUX_USER_RETURN_NOTIFIER_H
+
+#ifdef CONFIG_USER_RETURN_NOTIFIER
+
+#include <linux/list.h>
+#include <linux/sched.h>
+
+struct user_return_notifier {
+        void (*on_user_return)(struct user_return_notifier *urn);
+        struct hlist_node link;
+};
+
+
+void user_return_notifier_register(struct user_return_notifier *urn);
+void user_return_notifier_unregister(struct user_return_notifier *urn);
+
+static inline void propagate_user_return_notify(struct task_struct *prev,
+                                                struct task_struct *next)
+{
+        if (test_tsk_thread_flag(prev, TIF_USER_RETURN_NOTIFY)) {
+                clear_tsk_thread_flag(prev, TIF_USER_RETURN_NOTIFY);
+                set_tsk_thread_flag(next, TIF_USER_RETURN_NOTIFY);
+        }
+}
+
+void fire_user_return_notifiers(void);
+
+static inline void clear_user_return_notifier(struct task_struct *p)
+{
+        clear_tsk_thread_flag(p, TIF_USER_RETURN_NOTIFY);
+}
+
+#else
+
+struct user_return_notifier {};
+
+static inline void propagate_user_return_notify(struct task_struct *prev,
+                                                struct task_struct *next)
+{
+}
+
+static inline void fire_user_return_notifiers(void) {}
+
+static inline void clear_user_return_notifier(struct task_struct *p) {}
+
+#endif
+
+#endif
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index b59e78c5716..32b92298fd7 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -361,6 +361,7 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_PJPG     v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
 #define V4L2_PIX_FMT_OV511    v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
 #define V4L2_PIX_FMT_OV518    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
+#define V4L2_PIX_FMT_STV0680  v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
 
 /*
  *      F O R M A T   E N U M E R A T I O N
@@ -490,7 +491,7 @@ struct v4l2_jpegcompression {
                                  * you do, leave them untouched.
                                  * Inluding less markers will make the
                                  * resulting code smaller, but there will
-                                 * be fewer aplications which can read it.
+                                 * be fewer applications which can read it.
                                  * The presence of the APP and COM marker
                                  * is influenced by APP_len and COM_len
                                  * ONLY, not by this property! */
@@ -563,6 +564,7 @@ struct v4l2_framebuffer {
 #define V4L2_FBUF_CAP_LOCAL_ALPHA       0x0010
 #define V4L2_FBUF_CAP_GLOBAL_ALPHA      0x0020
 #define V4L2_FBUF_CAP_LOCAL_INV_ALPHA   0x0040
+#define V4L2_FBUF_CAP_SRC_CHROMAKEY     0x0080
 /*  Flags for the 'flags' field. */
 #define V4L2_FBUF_FLAG_PRIMARY          0x0001
 #define V4L2_FBUF_FLAG_OVERLAY          0x0002
@@ -570,6 +572,7 @@ struct v4l2_framebuffer {
 #define V4L2_FBUF_FLAG_LOCAL_ALPHA      0x0008
 #define V4L2_FBUF_FLAG_GLOBAL_ALPHA     0x0010
 #define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA  0x0020
+#define V4L2_FBUF_FLAG_SRC_CHROMAKEY    0x0040
 
 struct v4l2_clip {
         struct v4l2_rect        c;
@@ -912,8 +915,10 @@ enum v4l2_colorfx {
 #define V4L2_CID_AUTOBRIGHTNESS                 (V4L2_CID_BASE+32)
 #define V4L2_CID_BAND_STOP_FILTER               (V4L2_CID_BASE+33)
 
+#define V4L2_CID_ROTATE                         (V4L2_CID_BASE+34)
+#define V4L2_CID_BG_COLOR                       (V4L2_CID_BASE+35)
 /* last CID + 1 */
-#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+34)
+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+36)
 
 /*  MPEG-class control IDs defined by V4L2 */
 #define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
diff --git a/include/linux/vt.h b/include/linux/vt.h
index 7afca0d7213..7ffa11f0623 100644
--- a/include/linux/vt.h
+++ b/include/linux/vt.h
@@ -70,8 +70,8 @@ struct vt_event {
 #define VT_EVENT_UNBLANK        0x0004  /* Screen unblank */
 #define VT_EVENT_RESIZE         0x0008  /* Resize display */
 #define VT_MAX_EVENT            0x000F
-        unsigned int old;               /* Old console */
-        unsigned int new;               /* New console (if changing) */
+        unsigned int oldev;             /* Old console */
+        unsigned int newev;             /* New console (if changing) */
         unsigned int pad[4];            /* Padding for expansion */
 };
 
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h
index c0c4e1103a7..7f56db4a79f 100644
--- a/include/linux/vt_kern.h
+++ b/include/linux/vt_kern.h
@@ -110,6 +110,7 @@ extern char con_buf[CON_BUF_SIZE];
 extern struct mutex con_buf_mtx;
 extern char vt_dont_switch;
 extern int default_utf8;
+extern int global_cursor_default;
 
 struct vt_spawn_console {
         spinlock_t lock;
@@ -130,4 +131,6 @@ struct vt_notifier_param {
 extern int register_vt_notifier(struct notifier_block *nb);
 extern int unregister_vt_notifier(struct notifier_block *nb);
 
+extern void hide_boot_cursor(bool hide);
+
 #endif /* _VT_KERN_H */
diff --git a/include/linux/wimax/debug.h b/include/linux/wimax/debug.h
index c703e034042..db8096e8853 100644
--- a/include/linux/wimax/debug.h
+++ b/include/linux/wimax/debug.h
@@ -450,4 +450,76 @@ do {							\
 })
 
 
+static inline
+void d_submodule_set(struct d_level *d_level, size_t d_level_size,
+                     const char *submodule, u8 level, const char *tag)
+{
+        struct d_level *itr, *top;
+        int index = -1;
+
+        for (itr = d_level, top = itr + d_level_size; itr < top; itr++) {
+                index++;
+                if (itr->name == NULL) {
+                        printk(KERN_ERR "%s: itr->name NULL?? (%p, #%d)\n",
+                               tag, itr, index);
+                        continue;
+                }
+                if (!strcmp(itr->name, submodule)) {
+                        itr->level = level;
+                        return;
+                }
+        }
+        printk(KERN_ERR "%s: unknown submodule %s\n", tag, submodule);
+}
+
+
+/**
+ * d_parse_params - Parse a string with debug parameters from the
+ * command line
+ *
+ * @d_level: level structure (D_LEVEL)
+ * @d_level_size: number of items in the level structure
+ *     (D_LEVEL_SIZE).
+ * @_params: string with the parameters; this is a space (not tab!)
+ *     separated list of NAME:VALUE, where value is the debug level
+ *     and NAME is the name of the submodule.
+ * @tag: string for error messages (example: MODULE.ARGNAME).
+ */
+static inline
+void d_parse_params(struct d_level *d_level, size_t d_level_size,
+                    const char *_params, const char *tag)
+{
+        char submodule[130], *params, *params_orig, *token, *colon;
+        unsigned level, tokens;
+
+        if (_params == NULL)
+                return;
+        params_orig = kstrdup(_params, GFP_KERNEL);
+        params = params_orig;
+        while (1) {
+                token = strsep(&params, " ");
+                if (token == NULL)
+                        break;
+                if (*token == '\0')     /* eat joint spaces */
+                        continue;
+                /* kernel's sscanf %s eats until whitespace, so we
+                 * replace : by \n so it doesn't get eaten later by
+                 * strsep */
+                colon = strchr(token, ':');
+                if (colon != NULL)
+                        *colon = '\n';
+                tokens = sscanf(token, "%s\n%u", submodule, &level);
+                if (colon != NULL)
+                        *colon = ':';   /* set back, for error messages */
+                if (tokens == 2)
+                        d_submodule_set(d_level, d_level_size,
+                                        submodule, level, tag);
+                else
+                        printk(KERN_ERR "%s: can't parse '%s' as a "
+                               "SUBMODULE:LEVEL (%d tokens)\n",
+                               tag, token, tokens);
+        }
+        kfree(params_orig);
+}
+
 #endif /* #ifndef __debug__h__ */
diff --git a/include/linux/wimax/i2400m.h b/include/linux/wimax/i2400m.h
index 433693ef2bb..62d35615356 100644
--- a/include/linux/wimax/i2400m.h
+++ b/include/linux/wimax/i2400m.h
@@ -138,7 +138,7 @@ struct i2400m_bcf_hdr {
         __le32 module_id;
         __le32 module_vendor;
         __le32 date;            /* BCD YYYMMDD */
-        __le32 size;
+        __le32 size;            /* in dwords */
         __le32 key_size;        /* in dwords */
         __le32 modulus_size;    /* in dwords */
         __le32 exponent_size;   /* in dwords */
@@ -168,16 +168,6 @@ enum i2400m_brh {
 };
 
 
-/* Constants for bcf->module_id */
-enum i2400m_bcf_mod_id {
-        /* Firmware file carries its own pokes -- pokes are a set of
-         * magical values that have to be written in certain memory
-         * addresses to get the device up and ready for firmware
-         * download when it is in non-signed boot mode. */
-        I2400M_BCF_MOD_ID_POKES = 0x000000001,
-};
-
-
 /**
  * i2400m_bootrom_header - Header for a boot-mode command
  *
@@ -276,6 +266,7 @@ enum {
         I2400M_WARM_RESET_BARKER = 0x50f750f7,
         I2400M_NBOOT_BARKER = 0xdeadbeef,
         I2400M_SBOOT_BARKER = 0x0ff1c1a1,
+        I2400M_SBOOT_BARKER_6050 = 0x80000001,
         I2400M_ACK_BARKER = 0xfeedbabe,
         I2400M_D2H_MSG_BARKER = 0xbeefbabe,
 };
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 66ebddcff66..705f01fe413 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -49,6 +49,7 @@ struct writeback_control {
         unsigned nonblocking:1;         /* Don't get stuck on request queues */
         unsigned encountered_congestion:1; /* An output: a queue is full */
         unsigned for_kupdate:1;         /* A kupdate writeback */
+        unsigned for_background:1;      /* A background writeback */
         unsigned for_reclaim:1;         /* Invoked from the page allocator */
         unsigned range_cyclic:1;        /* range_start is cyclic */
         unsigned more_io:1;             /* more io to be dispatched */
diff --git a/include/linux/x25.h b/include/linux/x25.h
index d035e4e87d0..6450a7f1207 100644
--- a/include/linux/x25.h
+++ b/include/linux/x25.h
@@ -25,6 +25,7 @@
 #define SIOCX25SENDCALLACCPT    (SIOCPROTOPRIVATE + 9)
 #define SIOCX25GDTEFACILITIES (SIOCPROTOPRIVATE + 10)
 #define SIOCX25SDTEFACILITIES (SIOCPROTOPRIVATE + 11)
+#define SIOCX25SCAUSEDIAG       (SIOCPROTOPRIVATE + 12)
 
 /*
  *      Values for {get,set}sockopt.
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 2d4ec15abac..29e04beb1fc 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -10,8 +10,7 @@
 /* Structure to encapsulate addresses. I do not want to use
  * "standard" structure. My apologies.
  */
-typedef union
-{
+typedef union {
         __be32          a4;
         __be32          a6[4];
 } xfrm_address_t;
@@ -20,8 +19,7 @@ typedef union
  * the state by (spi,daddr,ah/esp) or to store information about
  * spi, protocol and tunnel address on output.
  */
-struct xfrm_id
-{
+struct xfrm_id {
         xfrm_address_t  daddr;
         __be32          spi;
         __u8            proto;
@@ -45,8 +43,7 @@ struct xfrm_sec_ctx {
 
 /* Selector, used as selector both on policy rules (SPD) and SAs. */
 
-struct xfrm_selector
-{
+struct xfrm_selector {
         xfrm_address_t  daddr;
         xfrm_address_t  saddr;
         __be16  dport;
@@ -63,8 +60,7 @@ struct xfrm_selector
 
 #define XFRM_INF (~(__u64)0)
 
-struct xfrm_lifetime_cfg
-{
+struct xfrm_lifetime_cfg {
         __u64   soft_byte_limit;
         __u64   hard_byte_limit;
         __u64   soft_packet_limit;
@@ -75,16 +71,14 @@ struct xfrm_lifetime_cfg
         __u64   hard_use_expires_seconds;
 };
 
-struct xfrm_lifetime_cur
-{
+struct xfrm_lifetime_cur {
         __u64   bytes;
         __u64   packets;
         __u64   add_time;
         __u64   use_time;
 };
 
-struct xfrm_replay_state
-{
+struct xfrm_replay_state {
         __u32   oseq;
         __u32   seq;
         __u32   bitmap;
@@ -96,6 +90,13 @@ struct xfrm_algo {
         char            alg_key[0];
 };
 
+struct xfrm_algo_auth {
+        char            alg_name[64];
+        unsigned int    alg_key_len;    /* in bits */
+        unsigned int    alg_trunc_len;  /* in bits */
+        char            alg_key[0];
+};
+
 struct xfrm_algo_aead {
         char            alg_name[64];
         unsigned int    alg_key_len;    /* in bits */
@@ -109,16 +110,14 @@ struct xfrm_stats {
         __u32   integrity_failed;
 };
 
-enum
-{
+enum {
         XFRM_POLICY_TYPE_MAIN   = 0,
         XFRM_POLICY_TYPE_SUB    = 1,
         XFRM_POLICY_TYPE_MAX    = 2,
         XFRM_POLICY_TYPE_ANY    = 255
 };
 
-enum
-{
+enum {
         XFRM_POLICY_IN  = 0,
         XFRM_POLICY_OUT = 1,
         XFRM_POLICY_FWD = 2,
@@ -126,8 +125,7 @@ enum
         XFRM_POLICY_MAX = 3
 };
 
-enum
-{
+enum {
         XFRM_SHARE_ANY,         /* No limitations */
         XFRM_SHARE_SESSION,     /* For this session only */
         XFRM_SHARE_USER,        /* For this user only */
@@ -283,6 +281,7 @@ enum xfrm_attr_type_t {
         XFRMA_MIGRATE,
         XFRMA_ALG_AEAD,         /* struct xfrm_algo_aead */
         XFRMA_KMADDRESS,        /* struct xfrm_user_kmaddress */
+        XFRMA_ALG_AUTH_TRUNC,   /* struct xfrm_algo_auth */
         __XFRMA_MAX
 
 #define XFRMA_MAX (__XFRMA_MAX - 1)
diff --git a/include/media/cx25840.h b/include/media/cx25840.h
index 2c3fbaa33f7..0b0cb177679 100644
--- a/include/media/cx25840.h
+++ b/include/media/cx25840.h
@@ -84,6 +84,7 @@ enum cx25840_video_input {
         CX25840_NONE0_CH3 = 0x80000080,
         CX25840_NONE1_CH3 = 0x800000c0,
         CX25840_SVIDEO_ON = 0x80000100,
+        CX25840_COMPONENT_ON = 0x80000200,
 };
 
 enum cx25840_audio_input {
diff --git a/include/media/davinci/vpfe_capture.h b/include/media/davinci/vpfe_capture.h
index 71d8982e13f..d863e5e8426 100644
--- a/include/media/davinci/vpfe_capture.h
+++ b/include/media/davinci/vpfe_capture.h
@@ -83,6 +83,8 @@ struct vpfe_subdev_info {
 struct vpfe_config {
         /* Number of sub devices connected to vpfe */
         int num_subdevs;
+        /* i2c bus adapter no */
+        int i2c_adapter_id;
         /* information about each subdev */
         struct vpfe_subdev_info *sub_devs;
         /* evm card info */
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 29f0e53cff9..e41a99ee353 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -26,14 +26,16 @@
 #include <linux/input.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
+#include <linux/spinlock.h>
+
+extern int media_ir_debug;    /* media_ir_debug level (0,1,2) */
+#define IR_dprintk(level, fmt, arg...)  if (media_ir_debug >= level) \
+        printk(KERN_DEBUG "%s: " fmt , __func__, ## arg)
 
 #define IR_TYPE_RC5     1
 #define IR_TYPE_PD      2 /* Pulse distance encoded IR */
 #define IR_TYPE_OTHER  99
 
-#define IR_KEYTAB_TYPE u32
-#define IR_KEYTAB_SIZE  128  /* enougth for rc5, probably need more some day */
-
 struct ir_scancode {
         u16     scancode;
         u32     keycode;
@@ -42,11 +44,9 @@ struct ir_scancode {
 struct ir_scancode_table {
         struct ir_scancode *scan;
         int size;
+        spinlock_t lock;
 };
 
-#define IR_KEYCODE(tab,code)    (((unsigned)code < IR_KEYTAB_SIZE) \
-                                 ? tab[code] : KEY_RESERVED)
-
 #define RC5_START(x)    (((x)>>12)&3)
 #define RC5_TOGGLE(x)   (((x)>>11)&1)
 #define RC5_ADDR(x)     (((x)>>6)&31)
@@ -55,11 +55,11 @@ struct ir_scancode_table {
 struct ir_input_state {
         /* configuration */
         int                ir_type;
-        IR_KEYTAB_TYPE     ir_codes[IR_KEYTAB_SIZE];
+
+        struct ir_scancode_table keytable;
 
         /* key info */
-        u32                ir_raw;      /* raw data */
-        u32                ir_key;      /* ir key code */
+        u32                ir_key;      /* ir scancode */
         u32                keycode;     /* linux key code */
         int                keypressed;  /* current state */
 };
@@ -102,20 +102,36 @@ struct card_ir {
         struct tasklet_struct   tlet;
 };
 
-void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
+/* Routines from ir-functions.c */
+
+int ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
                    int ir_type, struct ir_scancode_table *ir_codes);
 void ir_input_nokey(struct input_dev *dev, struct ir_input_state *ir);
 void ir_input_keydown(struct input_dev *dev, struct ir_input_state *ir,
-                      u32 ir_key, u32 ir_raw);
+                      u32 ir_key);
 u32  ir_extract_bits(u32 data, u32 mask);
 int  ir_dump_samples(u32 *samples, int count);
 int  ir_decode_biphase(u32 *samples, int count, int low, int high);
 int  ir_decode_pulsedistance(u32 *samples, int count, int low, int high);
+u32  ir_rc5_decode(unsigned int code);
 
 void ir_rc5_timer_end(unsigned long data);
 void ir_rc5_timer_keyup(unsigned long data);
 
-/* Keymaps to be used by other modules */
+/* Routines from ir-keytable.c */
+
+u32 ir_g_keycode_from_table(struct input_dev *input_dev,
+                            u32 scancode);
+
+int ir_set_keycode_table(struct input_dev *input_dev,
+                         struct ir_scancode_table *rc_tab);
+
+int ir_roundup_tablesize(int n_elems);
+int ir_copy_table(struct ir_scancode_table *destin,
+                 const struct ir_scancode_table *origin);
+void ir_input_free(struct input_dev *input_dev);
+
+/* scancode->keycode map tables from ir-keymaps.c */
 
 extern struct ir_scancode_table ir_codes_empty_table;
 extern struct ir_scancode_table ir_codes_avermedia_table;
@@ -150,6 +166,7 @@ extern struct ir_scancode_table ir_codes_rc5_tv_table;
 extern struct ir_scancode_table ir_codes_winfast_table;
 extern struct ir_scancode_table ir_codes_pinnacle_color_table;
 extern struct ir_scancode_table ir_codes_hauppauge_new_table;
+extern struct ir_scancode_table ir_codes_rc5_hauppauge_new_table;
 extern struct ir_scancode_table ir_codes_npgtech_table;
 extern struct ir_scancode_table ir_codes_norwood_table;
 extern struct ir_scancode_table ir_codes_proteus_2309_table;
@@ -172,6 +189,8 @@ extern struct ir_scancode_table ir_codes_ati_tv_wonder_hd_600_table;
 extern struct ir_scancode_table ir_codes_kworld_plus_tv_analog_table;
 extern struct ir_scancode_table ir_codes_kaiomy_table;
 extern struct ir_scancode_table ir_codes_dm1105_nec_table;
+extern struct ir_scancode_table ir_codes_tevii_nec_table;
+extern struct ir_scancode_table ir_codes_tbs_nec_table;
 extern struct ir_scancode_table ir_codes_evga_indtube_table;
 extern struct ir_scancode_table ir_codes_terratec_cinergy_xs_table;
 extern struct ir_scancode_table ir_codes_videomate_s350_table;
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index cf16689adba..91942dbe64e 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -64,6 +64,7 @@ enum {
         V4L2_IDENT_OV9650 = 254,
         V4L2_IDENT_OV9655 = 255,
         V4L2_IDENT_SOI968 = 256,
+        V4L2_IDENT_OV9640 = 257,
 
         /* module saa7146: reserved range 300-309 */
         V4L2_IDENT_SAA7146 = 300,
@@ -72,6 +73,7 @@ enum {
         V4L2_IDENT_CX23418_843 = 403, /* Integrated A/V Decoder on the '418 */
         V4L2_IDENT_CX23415 = 415,
         V4L2_IDENT_CX23416 = 416,
+        V4L2_IDENT_CX23417 = 417,
         V4L2_IDENT_CX23418 = 418,
 
         /* module au0828 */
@@ -129,6 +131,9 @@ enum {
         V4L2_IDENT_SAA6752HS = 6752,
         V4L2_IDENT_SAA6752HS_AC3 = 6753,
 
+        /* modules tef6862: just ident 6862 */
+        V4L2_IDENT_TEF6862 = 6862,
+
         /* module adv7170: just ident 7170 */
         V4L2_IDENT_ADV7170 = 7170,
 
@@ -165,12 +170,27 @@ enum {
         /* module mt9v011, just ident 8243 */
         V4L2_IDENT_MT9V011 = 8243,
 
+        /* module cx23885 and cx25840 */
+        V4L2_IDENT_CX23885    = 8850,
+        V4L2_IDENT_CX23885_AV = 8851, /* Integrated A/V decoder */
+        V4L2_IDENT_CX23887    = 8870,
+        V4L2_IDENT_CX23887_AV = 8871, /* Integrated A/V decoder */
+        V4L2_IDENT_CX23888    = 8880,
+        V4L2_IDENT_CX23888_AV = 8881, /* Integrated A/V decoder */
+        V4L2_IDENT_CX23888_IR = 8882, /* Integrated infrared controller */
+
         /* module tw9910: just ident 9910 */
         V4L2_IDENT_TW9910 = 9910,
 
         /* module sn9c20x: just ident 10000 */
         V4L2_IDENT_SN9C20X = 10000,
 
+        /* module cx231xx and cx25840 */
+        V4L2_IDENT_CX2310X_AV = 23099, /* Integrated A/V decoder; not in '100 */
+        V4L2_IDENT_CX23100    = 23100,
+        V4L2_IDENT_CX23101    = 23101,
+        V4L2_IDENT_CX23102    = 23102,
+
         /* module msp3400: reserved range 34000-34999 and 44000-44999 */
         V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
                                         use internally (tveeprom.c). */
@@ -264,6 +284,9 @@ enum {
 
         /* module m52790: just ident 52790 */
         V4L2_IDENT_M52790 = 52790,
+
+        /* Sharp RJ54N1CB0C, 0xCB0C = 51980 */
+        V4L2_IDENT_RJ54N1CB0C = 51980,
 };
 
 #endif
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index d411345f244..00bf1760845 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -23,6 +23,16 @@
 
 #include <media/v4l2-common.h>
 
+/* generic v4l2_device notify callback notification values */
+#define V4L2_SUBDEV_IR_RX_NOTIFY                _IOW('v', 0, u32)
+#define V4L2_SUBDEV_IR_RX_FIFO_SERVICE_REQ      0x00000001
+#define V4L2_SUBDEV_IR_RX_END_OF_RX_DETECTED    0x00000002
+#define V4L2_SUBDEV_IR_RX_HW_FIFO_OVERRUN       0x00000004
+#define V4L2_SUBDEV_IR_RX_SW_FIFO_OVERRUN       0x00000008
+
+#define V4L2_SUBDEV_IR_TX_NOTIFY                _IOW('v', 1, u32)
+#define V4L2_SUBDEV_IR_TX_FIFO_SERVICE_REQ      0x00000001
+
 struct v4l2_device;
 struct v4l2_subdev;
 struct tuner_setup;
@@ -96,6 +106,9 @@ struct v4l2_decode_vbi_line {
 
    s_gpio: set GPIO pins. Very simple right now, might need to be extended with
         a direction argument if needed.
+
+   s_power: puts subdevice in power saving mode (on == 0) or normal operation
+        mode (on == 1).
  */
 struct v4l2_subdev_core_ops {
         int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip);
@@ -118,6 +131,7 @@ struct v4l2_subdev_core_ops {
         int (*g_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);
         int (*s_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);
 #endif
+        int (*s_power)(struct v4l2_subdev *sd, int on);
 };
 
 /* s_mode: switch the tuner to a specific tuner mode. Replacement of s_radio.
@@ -127,8 +141,6 @@ struct v4l2_subdev_core_ops {
    s_type_addr: sets tuner type and its I2C addr.
 
    s_config: sets tda9887 specific stuff, like port1, port2 and qss
-
-   s_standby: puts tuner on powersaving state, disabling it, except for i2c.
  */
 struct v4l2_subdev_tuner_ops {
         int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type);
@@ -141,7 +153,6 @@ struct v4l2_subdev_tuner_ops {
         int (*s_modulator)(struct v4l2_subdev *sd, struct v4l2_modulator *vm);
         int (*s_type_addr)(struct v4l2_subdev *sd, struct tuner_setup *type);
         int (*s_config)(struct v4l2_subdev *sd, const struct v4l2_priv_tun_config *config);
-        int (*s_standby)(struct v4l2_subdev *sd);
 };
 
 /* s_clock_freq: set the frequency (in Hz) of the audio clock output.
@@ -231,11 +242,95 @@ struct v4l2_subdev_video_ops {
         int (*enum_frameintervals)(struct v4l2_subdev *sd, struct v4l2_frmivalenum *fival);
 };
 
+/*
+   interrupt_service_routine: Called by the bridge chip's interrupt service
+        handler, when an IR interrupt status has be raised due to this subdev,
+        so that this subdev can handle the details.  It may schedule work to be
+        performed later.  It must not sleep.  *Called from an IRQ context*.
+
+   [rt]x_g_parameters: Get the current operating parameters and state of the
+        the IR receiver or transmitter.
+
+   [rt]x_s_parameters: Set the current operating parameters and state of the
+        the IR receiver or transmitter.  It is recommended to call
+        [rt]x_g_parameters first to fill out the current state, and only change
+        the fields that need to be changed.  Upon return, the actual device
+        operating parameters and state will be returned.  Note that hardware
+        limitations may prevent the actual settings from matching the requested
+        settings - e.g. an actual carrier setting of 35,904 Hz when 36,000 Hz
+        was requested.  An exception is when the shutdown parameter is true.
+        The last used operational parameters will be returned, but the actual
+        state of the hardware be different to minimize power consumption and
+        processing when shutdown is true.
+
+   rx_read: Reads received codes or pulse width data.
+        The semantics are similar to a non-blocking read() call.
+
+   tx_write: Writes codes or pulse width data for transmission.
+        The semantics are similar to a non-blocking write() call.
+ */
+
+enum v4l2_subdev_ir_mode {
+        V4L2_SUBDEV_IR_MODE_PULSE_WIDTH, /* space & mark widths in nanosecs */
+};
+
+/* Data format of data read or written for V4L2_SUBDEV_IR_MODE_PULSE_WIDTH */
+#define V4L2_SUBDEV_IR_PULSE_MAX_WIDTH_NS       0x7fffffff
+#define V4L2_SUBDEV_IR_PULSE_LEVEL_MASK         0x80000000
+#define V4L2_SUBDEV_IR_PULSE_RX_SEQ_END         0xffffffff
+
+struct v4l2_subdev_ir_parameters {
+        /* Either Rx or Tx */
+        unsigned int bytes_per_data_element; /* of data in read or write call */
+        enum v4l2_subdev_ir_mode mode;
+
+        bool enable;
+        bool interrupt_enable;
+        bool shutdown; /* true: set hardware to low/no power, false: normal */
+
+        bool modulation;           /* true: uses carrier, false: baseband */
+        u32 max_pulse_width;       /* ns,      valid only for baseband signal */
+        unsigned int carrier_freq; /* Hz,      valid only for modulated signal*/
+        unsigned int duty_cycle;   /* percent, valid only for modulated signal*/
+        bool invert;               /* logically invert sense of mark/space */
+
+        /* Rx only */
+        u32 noise_filter_min_width;       /* ns, min time of a valid pulse */
+        unsigned int carrier_range_lower; /* Hz, valid only for modulated sig */
+        unsigned int carrier_range_upper; /* Hz, valid only for modulated sig */
+        u32 resolution;                   /* ns */
+};
+
+struct v4l2_subdev_ir_ops {
+        /* Common to receiver and transmitter */
+        int (*interrupt_service_routine)(struct v4l2_subdev *sd,
+                                                u32 status, bool *handled);
+
+        /* Receiver */
+        int (*rx_read)(struct v4l2_subdev *sd, u8 *buf, size_t count,
+                                ssize_t *num);
+
+        int (*rx_g_parameters)(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_ir_parameters *params);
+        int (*rx_s_parameters)(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_ir_parameters *params);
+
+        /* Transmitter */
+        int (*tx_write)(struct v4l2_subdev *sd, u8 *buf, size_t count,
+                                ssize_t *num);
+
+        int (*tx_g_parameters)(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_ir_parameters *params);
+        int (*tx_s_parameters)(struct v4l2_subdev *sd,
+                                struct v4l2_subdev_ir_parameters *params);
+};
+
 struct v4l2_subdev_ops {
         const struct v4l2_subdev_core_ops  *core;
         const struct v4l2_subdev_tuner_ops *tuner;
         const struct v4l2_subdev_audio_ops *audio;
         const struct v4l2_subdev_video_ops *video;
+        const struct v4l2_subdev_ir_ops    *ir;
 };
 
 #define V4L2_SUBDEV_NAME_SIZE 32
@@ -290,7 +385,7 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
    Example: err = v4l2_subdev_call(sd, core, g_chip_ident, &chip);
  */
 #define v4l2_subdev_call(sd, o, f, args...)                             \
-        (!(sd) ? -ENODEV : (((sd) && (sd)->ops->o && (sd)->ops->o->f) ? \
+        (!(sd) ? -ENODEV : (((sd)->ops->o && (sd)->ops->o->f) ? \
                 (sd)->ops->o->f((sd) , ##args) : -ENOIOCTLCMD))
 
 /* Send a notification to v4l2_device. */
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 1c5946c4475..316fdccdcaa 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -166,7 +166,7 @@ struct videobuf_queue {
         enum v4l2_field            field;
         enum v4l2_field            last;   /* for field=V4L2_FIELD_ALTERNATE */
         struct videobuf_buffer     *bufs[VIDEO_MAX_FRAME];
-        struct videobuf_queue_ops  *ops;
+        const struct videobuf_queue_ops  *ops;
         struct videobuf_qtype_ops  *int_ops;
 
         unsigned int               streaming:1;
@@ -195,7 +195,7 @@ void *videobuf_queue_to_vmalloc (struct videobuf_queue* q,
                                  struct videobuf_buffer *buf);
 
 void videobuf_queue_core_init(struct videobuf_queue *q,
-                         struct videobuf_queue_ops *ops,
+                         const struct videobuf_queue_ops *ops,
                          struct device *dev,
                          spinlock_t *irqlock,
                          enum v4l2_buf_type type,
diff --git a/include/media/videobuf-dma-contig.h b/include/media/videobuf-dma-contig.h
index 549386681aa..ebaa9bc1ee8 100644
--- a/include/media/videobuf-dma-contig.h
+++ b/include/media/videobuf-dma-contig.h
@@ -17,7 +17,7 @@
 #include <media/videobuf-core.h>
 
 void videobuf_queue_dma_contig_init(struct videobuf_queue *q,
-                                    struct videobuf_queue_ops *ops,
+                                    const struct videobuf_queue_ops *ops,
                                     struct device *dev,
                                     spinlock_t *irqlock,
                                     enum v4l2_buf_type type,
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index dda47f0082e..53e72f78717 100644
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -103,7 +103,7 @@ struct videobuf_dmabuf *videobuf_to_dma (struct videobuf_buffer *buf);
 void *videobuf_sg_alloc(size_t size);
 
 void videobuf_queue_sg_init(struct videobuf_queue* q,
-                         struct videobuf_queue_ops *ops,
+                         const struct videobuf_queue_ops *ops,
                          struct device *dev,
                          spinlock_t *irqlock,
                          enum v4l2_buf_type type,
diff --git a/include/media/videobuf-dvb.h b/include/media/videobuf-dvb.h
index 6ba4f1271d2..07cf4b9d0a6 100644
--- a/include/media/videobuf-dvb.h
+++ b/include/media/videobuf-dvb.h
@@ -42,7 +42,9 @@ int videobuf_dvb_register_bus(struct videobuf_dvb_frontends *f,
                           void *adapter_priv,
                           struct device *device,
                           short *adapter_nr,
-                          int mfe_shared);
+                          int mfe_shared,
+                          int (*fe_ioctl_override)(struct dvb_frontend *,
+                                        unsigned int, void *, unsigned int));
 
 void videobuf_dvb_unregister_bus(struct videobuf_dvb_frontends *f);
 
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
index e87222c6a12..4b419a257a7 100644
--- a/include/media/videobuf-vmalloc.h
+++ b/include/media/videobuf-vmalloc.h
@@ -30,8 +30,8 @@ struct videobuf_vmalloc_memory
 };
 
 void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
-                         struct videobuf_queue_ops *ops,
-                         void *dev,
+                         const struct videobuf_queue_ops *ops,
+                         struct device *dev,
                          spinlock_t *irqlock,
                          enum v4l2_buf_type type,
                          enum v4l2_field field,
diff --git a/include/net/ah.h b/include/net/ah.h
index ae1c322f424..f0129f79a31 100644
--- a/include/net/ah.h
+++ b/include/net/ah.h
@@ -1,43 +1,20 @@
 #ifndef _NET_AH_H
 #define _NET_AH_H
 
-#include <linux/crypto.h>
-#include <net/xfrm.h>
+#include <linux/skbuff.h>
 
 /* This is the maximum truncated ICV length that we know of. */
 #define MAX_AH_AUTH_LEN 12
 
-struct ah_data
-{
-        u8                      *work_icv;
+struct crypto_ahash;
+
+struct ah_data {
         int                     icv_full_len;
         int                     icv_trunc_len;
 
-        struct crypto_hash      *tfm;
+        struct crypto_ahash     *ahash;
 };
 
-static inline int ah_mac_digest(struct ah_data *ahp, struct sk_buff *skb,
-                                u8 *auth_data)
-{
-        struct hash_desc desc;
-        int err;
-
-        desc.tfm = ahp->tfm;
-        desc.flags = 0;
-
-        memset(auth_data, 0, ahp->icv_trunc_len);
-        err = crypto_hash_init(&desc);
-        if (unlikely(err))
-                goto out;
-        err = skb_icv_walk(skb, &desc, 0, skb->len, crypto_hash_update);
-        if (unlikely(err))
-                goto out;
-        err = crypto_hash_final(&desc, ahp->work_icv);
-
-out:
-        return err;
-}
-
 struct ip_auth_hdr;
 
 static inline struct ip_auth_hdr *ip_auth_hdr(const struct sk_buff *skb)
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 718394e2c01..04a6908e38d 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -121,7 +121,7 @@ struct bt_sock_list {
         rwlock_t          lock;
 };
 
-int  bt_sock_register(int proto, struct net_proto_family *ops);
+int  bt_sock_register(int proto, const struct net_proto_family *ops);
 int  bt_sock_unregister(int proto);
 void bt_sock_link(struct bt_sock_list *l, struct sock *s);
 void bt_sock_unlink(struct bt_sock_list *l, struct sock *s);
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 7b640aeddb6..7b86094a894 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -367,22 +367,6 @@ static inline void hci_conn_put(struct hci_conn *conn)
         }
 }
 
-/* ----- HCI tasks ----- */
-static inline void hci_sched_cmd(struct hci_dev *hdev)
-{
-        tasklet_schedule(&hdev->cmd_task);
-}
-
-static inline void hci_sched_rx(struct hci_dev *hdev)
-{
-        tasklet_schedule(&hdev->rx_task);
-}
-
-static inline void hci_sched_tx(struct hci_dev *hdev)
-{
-        tasklet_schedule(&hdev->tx_task);
-}
-
 /* ----- HCI Devices ----- */
 static inline void __hci_dev_put(struct hci_dev *d)
 {
@@ -437,28 +421,7 @@ int hci_inquiry(void __user *arg);
 
 void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);
 
-/* Receive frame from HCI drivers */
-static inline int hci_recv_frame(struct sk_buff *skb)
-{
-        struct hci_dev *hdev = (struct hci_dev *) skb->dev;
-        if (!hdev || (!test_bit(HCI_UP, &hdev->flags) 
-                        && !test_bit(HCI_INIT, &hdev->flags))) {
-                kfree_skb(skb);
-                return -ENXIO;
-        }
-
-        /* Incomming skb */
-        bt_cb(skb)->incoming = 1;
-
-        /* Time stamp */
-        __net_timestamp(skb);
-
-        /* Queue frame for rx task */
-        skb_queue_tail(&hdev->rx_q, skb);
-        hci_sched_rx(hdev);
-        return 0;
-}
-
+int hci_recv_frame(struct sk_buff *skb);
 int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count);
 
 int hci_register_sysfs(struct hci_dev *hdev);
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 9516f4b4a3c..17a689f27a6 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -324,7 +324,6 @@ struct l2cap_pinfo {
 
         __u8            next_tx_seq;
         __u8            expected_ack_seq;
-        __u8            req_seq;
         __u8            expected_tx_seq;
         __u8            buffer_seq;
         __u8            buffer_seq_srej;
@@ -375,6 +374,7 @@ struct l2cap_pinfo {
 #define L2CAP_CONN_SEND_PBIT       0x10
 #define L2CAP_CONN_REMOTE_BUSY     0x20
 #define L2CAP_CONN_LOCAL_BUSY      0x40
+#define L2CAP_CONN_REJ_ACT         0x80
 
 #define __mod_retrans_timer() mod_timer(&l2cap_pi(sk)->retrans_timer, \
                 jiffies +  msecs_to_jiffies(L2CAP_DEFAULT_RETRANS_TO));
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 3d874c62021..0884b9a0f77 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -206,10 +206,12 @@ struct ieee80211_supported_band {
  * struct vif_params - describes virtual interface parameters
  * @mesh_id: mesh ID to use
  * @mesh_id_len: length of the mesh ID
+ * @use_4addr: use 4-address frames
  */
 struct vif_params {
        u8 *mesh_id;
        int mesh_id_len;
+       int use_4addr;
 };
 
 /**
@@ -233,6 +235,35 @@ struct key_params {
 };
 
 /**
+ * enum survey_info_flags - survey information flags
+ *
+ * Used by the driver to indicate which info in &struct survey_info
+ * it has filled in during the get_survey().
+ */
+enum survey_info_flags {
+        SURVEY_INFO_NOISE_DBM = 1<<0,
+};
+
+/**
+ * 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
+ *
+ * This structure can later be expanded with things like
+ * channel duty cycle etc.
+ */
+struct survey_info {
+        struct ieee80211_channel *channel;
+        u32 filled;
+        s8 noise;
+};
+
+/**
  * struct beacon_parameters - beacon parameters
  *
  * Used to configure the beacon for an interface.
@@ -418,7 +449,7 @@ enum monitor_flags {
  * in during get_station() or dump_station().
  *
  * MPATH_INFO_FRAME_QLEN: @frame_qlen filled
- * MPATH_INFO_DSN: @dsn filled
+ * MPATH_INFO_SN: @sn filled
  * MPATH_INFO_METRIC: @metric filled
  * MPATH_INFO_EXPTIME: @exptime filled
  * MPATH_INFO_DISCOVERY_TIMEOUT: @discovery_timeout filled
@@ -427,7 +458,7 @@ enum monitor_flags {
  */
 enum mpath_info_flags {
         MPATH_INFO_FRAME_QLEN           = BIT(0),
-        MPATH_INFO_DSN                  = BIT(1),
+        MPATH_INFO_SN                   = BIT(1),
         MPATH_INFO_METRIC               = BIT(2),
         MPATH_INFO_EXPTIME              = BIT(3),
         MPATH_INFO_DISCOVERY_TIMEOUT    = BIT(4),
@@ -442,7 +473,7 @@ enum mpath_info_flags {
  *
  * @filled: bitfield of flags from &enum mpath_info_flags
  * @frame_qlen: number of queued frames for this destination
- * @dsn: destination sequence number
+ * @sn: target sequence number
  * @metric: metric (cost) of this mesh path
  * @exptime: expiration time for the mesh path from now, in msecs
  * @flags: mesh path flags
@@ -456,7 +487,7 @@ enum mpath_info_flags {
 struct mpath_info {
         u32 filled;
         u32 frame_qlen;
-        u32 dsn;
+        u32 sn;
         u32 metric;
         u32 exptime;
         u32 discovery_timeout;
@@ -506,6 +537,7 @@ struct mesh_config {
         u32 dot11MeshHWMPactivePathTimeout;
         u16 dot11MeshHWMPpreqMinInterval;
         u16 dot11MeshHWMPnetDiameterTraversalTime;
+        u8  dot11MeshHWMPRootMode;
 };
 
 /**
@@ -839,6 +871,19 @@ struct cfg80211_bitrate_mask {
         u32 fixed;   /* fixed bitrate, 0 == not fixed */
         u32 maxrate; /* in kbps, 0 == no limit */
 };
+/**
+ * struct cfg80211_pmksa - PMK Security Association
+ *
+ * This structure is passed to the set/del_pmksa() method for PMKSA
+ * caching.
+ *
+ * @bssid: The AP's BSSID.
+ * @pmkid: The PMK material itself.
+ */
+struct cfg80211_pmksa {
+        u8 *bssid;
+        u8 *pmkid;
+};
 
 /**
  * struct cfg80211_ops - backend description for wireless configuration
@@ -941,7 +986,16 @@ struct cfg80211_bitrate_mask {
  * @rfkill_poll: polls the hw rfkill line, use cfg80211 reporting
  *      functions to adjust rfkill hw state
  *
+ * @dump_survey: get site survey information.
+ *
  * @testmode_cmd: run a test mode command
+ *
+ * @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.
+ * @del_pmksa: Delete a cached PMKID.
+ * @flush_pmksa: Flush all cached PMKIDs.
+ *
  */
 struct cfg80211_ops {
         int     (*suspend)(struct wiphy *wiphy);
@@ -1060,6 +1114,15 @@ struct cfg80211_ops {
                                     const u8 *peer,
                                     const struct cfg80211_bitrate_mask *mask);
 
+        int     (*dump_survey)(struct wiphy *wiphy, struct net_device *netdev,
+                        int idx, struct survey_info *info);
+
+        int     (*set_pmksa)(struct wiphy *wiphy, struct net_device *netdev,
+                             struct cfg80211_pmksa *pmksa);
+        int     (*del_pmksa)(struct wiphy *wiphy, struct net_device *netdev,
+                             struct cfg80211_pmksa *pmksa);
+        int     (*flush_pmksa)(struct wiphy *wiphy, struct net_device *netdev);
+
         /* some temporary stuff to finish wext */
         int     (*set_power_mgmt)(struct wiphy *wiphy, struct net_device *dev,
                                   bool enabled, int timeout);
@@ -1071,27 +1134,50 @@ struct cfg80211_ops {
  */
 
 /**
- * struct wiphy - wireless hardware description
- * @idx: the wiphy index assigned to this item
- * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
- * @custom_regulatory: tells us the driver for this device
+ * enum wiphy_flags - wiphy capability flags
+ *
+ * @WIPHY_FLAG_CUSTOM_REGULATORY:  tells us the driver for this device
  *      has its own custom regulatory domain and cannot identify the
  *      ISO / IEC 3166 alpha2 it belongs to. When this is enabled
  *      we will disregard the first regulatory hint (when the
  *      initiator is %REGDOM_SET_BY_CORE).
- * @strict_regulatory: tells us the driver for this device will ignore
- *      regulatory domain settings until it gets its own regulatory domain
- *      via its regulatory_hint(). After its gets its own regulatory domain
- *      it will only allow further regulatory domain settings to further
- *      enhance compliance. For example if channel 13 and 14 are disabled
- *      by this regulatory domain no user regulatory domain can enable these
- *      channels at a later time. This can be used for devices which do not
- *      have calibration information gauranteed for frequencies or settings
- *      outside of its regulatory domain.
- * @disable_beacon_hints: enable this if your driver needs to ensure that
- *      passive scan flags and beaconing flags may not be lifted by cfg80211
- *      due to regulatory beacon hints. For more information on beacon
+ * @WIPHY_FLAG_STRICT_REGULATORY: tells us the driver for this device will
+ *      ignore regulatory domain settings until it gets its own regulatory
+ *      domain via its regulatory_hint(). After its gets its own regulatory
+ *      domain it will only allow further regulatory domain settings to
+ *      further enhance compliance. For example if channel 13 and 14 are
+ *      disabled by this regulatory domain no user regulatory domain can
+ *      enable these channels at a later time. This can be used for devices
+ *      which do not have calibration information gauranteed for frequencies
+ *      or settings outside of its regulatory domain.
+ * @WIPHY_FLAG_DISABLE_BEACON_HINTS: enable this if your driver needs to ensure
+ *      that passive scan flags and beaconing flags may not be lifted by
+ *      cfg80211 due to regulatory beacon hints. For more information on beacon
  *      hints read the documenation for regulatory_hint_found_beacon()
+ * @WIPHY_FLAG_NETNS_OK: if not set, do not allow changing the netns of this
+ *      wiphy at all
+ * @WIPHY_FLAG_PS_ON_BY_DEFAULT: if set to true, powersave will be enabled
+ *      by default -- this flag will be set depending on the kernel's default
+ *      on wiphy_new(), but can be changed by the driver if it has a good
+ *      reason to override the default
+ * @WIPHY_FLAG_4ADDR_AP: supports 4addr mode even on AP (with a single station
+ *      on a VLAN interface)
+ * @WIPHY_FLAG_4ADDR_STATION: supports 4addr mode even as a station
+ */
+enum wiphy_flags {
+        WIPHY_FLAG_CUSTOM_REGULATORY    = BIT(0),
+        WIPHY_FLAG_STRICT_REGULATORY    = BIT(1),
+        WIPHY_FLAG_DISABLE_BEACON_HINTS = BIT(2),
+        WIPHY_FLAG_NETNS_OK             = BIT(3),
+        WIPHY_FLAG_PS_ON_BY_DEFAULT     = BIT(4),
+        WIPHY_FLAG_4ADDR_AP             = BIT(5),
+        WIPHY_FLAG_4ADDR_STATION        = BIT(6),
+};
+
+/**
+ * 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
@@ -1106,11 +1192,6 @@ struct cfg80211_ops {
  *      -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
- * @netnsok: if set to false, do not allow changing the netns of this
- *      wiphy at all
- * @ps_default: default for powersave, will be set depending on the
- *      kernel's default on wiphy_new(), but can be changed by the
- *      driver if it has a good reason to override the default
  */
 struct wiphy {
         /* assign these fields before you register the wiphy */
@@ -1121,12 +1202,7 @@ struct wiphy {
         /* Supported interface modes, OR together BIT(NL80211_IFTYPE_...) */
         u16 interface_modes;
 
-        bool custom_regulatory;
-        bool strict_regulatory;
-        bool disable_beacon_hints;
-
-        bool netnsok;
-        bool ps_default;
+        u32 flags;
 
         enum cfg80211_signal_type signal_type;
 
@@ -1142,6 +1218,11 @@ struct wiphy {
         u32 frag_threshold;
         u32 rts_threshold;
 
+        char fw_version[ETHTOOL_BUSINFO_LEN];
+        u32 hw_version;
+
+        u8 max_num_pmkids;
+
         /* If multiple wiphys are registered and you're handed e.g.
          * a regular netdev with assigned ieee80211_ptr, you won't
          * know whether it points to a wiphy your driver has registered
@@ -1171,6 +1252,10 @@ struct wiphy {
         struct net *_net;
 #endif
 
+#ifdef CONFIG_CFG80211_WEXT
+        const struct iw_handler_def *wext;
+#endif
+
         char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
 };
 
@@ -1314,6 +1399,10 @@ struct cfg80211_cached_keys;
  * @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
  */
 struct wireless_dev {
         struct wiphy *wiphy;
@@ -1327,6 +1416,8 @@ struct wireless_dev {
 
         struct work_struct cleanup_work;
 
+        bool use_4addr;
+
         /* currently used for IBSS and SME - might be rearranged later */
         u8 ssid[IEEE80211_MAX_SSID_LEN];
         u8 ssid_len;
@@ -1345,7 +1436,7 @@ struct wireless_dev {
         struct cfg80211_internal_bss *auth_bsses[MAX_AUTH_BSSES];
         struct cfg80211_internal_bss *current_bss; /* associated / joined */
 
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_CFG80211_WEXT
         /* wext data */
         struct {
                 struct cfg80211_ibss_params ibss;
@@ -1776,6 +1867,18 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len);
 void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr);
 
 /**
+ * __cfg80211_auth_canceled - notify cfg80211 that authentication was canceled
+ * @dev: network device
+ * @addr: The MAC address of the device with which the authentication timed out
+ *
+ * When a pending authentication had no action yet, the driver may decide
+ * to not send a deauth frame, but in that case must calls this function
+ * to tell cfg80211 about this decision. It is only valid to call this
+ * function within the deauth() callback.
+ */
+void __cfg80211_auth_canceled(struct net_device *dev, const u8 *addr);
+
+/**
  * cfg80211_send_rx_assoc - notification of processed association
  * @dev: network device
  * @buf: (re)association response frame (header + body)
@@ -1802,30 +1905,45 @@ void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr);
  * @dev: network device
  * @buf: deauthentication frame (header + body)
  * @len: length of the frame data
- * @cookie: cookie from ->deauth if called within that callback,
- *      %NULL otherwise
  *
  * This function is called whenever deauthentication has been processed in
  * station mode. This includes both received deauthentication frames and
  * locally generated ones. This function may sleep.
  */
-void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len,
-                          void *cookie);
+void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len);
+
+/**
+ * __cfg80211_send_deauth - notification of processed deauthentication
+ * @dev: network device
+ * @buf: deauthentication frame (header + body)
+ * @len: length of the frame data
+ *
+ * Like cfg80211_send_deauth(), but doesn't take the wdev lock.
+ */
+void __cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len);
 
 /**
  * cfg80211_send_disassoc - notification of processed disassociation
  * @dev: network device
  * @buf: disassociation response frame (header + body)
  * @len: length of the frame data
- * @cookie: cookie from ->disassoc if called within that callback,
- *      %NULL otherwise
  *
  * This function is called whenever disassociation has been processed in
  * station mode. This includes both received disassociation frames and locally
  * generated ones. This function may sleep.
  */
-void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len,
-                            void *cookie);
+void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len);
+
+/**
+ * __cfg80211_send_disassoc - notification of processed disassociation
+ * @dev: network device
+ * @buf: disassociation response frame (header + body)
+ * @len: length of the frame data
+ *
+ * Like cfg80211_send_disassoc(), but doesn't take the wdev lock.
+ */
+void __cfg80211_send_disassoc(struct net_device *dev, const u8 *buf,
+        size_t len);
 
 /**
  * cfg80211_michael_mic_failure - notification of Michael MIC failure (TKIP)
diff --git a/include/net/compat.h b/include/net/compat.h
index 7c3002832d0..3c7d4e38fa1 100644
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@ -18,6 +18,11 @@ struct compat_msghdr {
         compat_uint_t   msg_flags;
 };
 
+struct compat_mmsghdr {
+        struct compat_msghdr msg_hdr;
+        compat_uint_t        msg_len;
+};
+
 struct compat_cmsghdr {
         compat_size_t   cmsg_len;
         compat_int_t    cmsg_level;
@@ -28,13 +33,20 @@ extern int compat_sock_get_timestamp(struct sock *, struct timeval __user *);
 extern int compat_sock_get_timestampns(struct sock *, struct timespec __user *);
 
 #else /* defined(CONFIG_COMPAT) */
-#define compat_msghdr   msghdr          /* to avoid compiler warnings */
+/*
+ * To avoid compiler warnings:
+ */
+#define compat_msghdr   msghdr
+#define compat_mmsghdr  mmsghdr
 #endif /* defined(CONFIG_COMPAT) */
 
 extern int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *);
 extern int verify_compat_iovec(struct msghdr *, struct iovec *, struct sockaddr *, int);
 extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned);
 extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned);
+extern asmlinkage long compat_sys_recvmmsg(int, struct compat_mmsghdr __user *,
+                                           unsigned, unsigned,
+                                           struct timespec __user *);
 extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
 extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
 
diff --git a/include/net/dn_dev.h b/include/net/dn_dev.h
index cee46821dc5..511a459ec10 100644
--- a/include/net/dn_dev.h
+++ b/include/net/dn_dev.h
@@ -75,7 +75,6 @@ struct dn_dev_parms {
         unsigned long t3;         /* Default value of t3                */
         int priority;             /* Priority to be a router            */
         char *name;               /* Name for sysctl                    */
-        int ctl_name;             /* Index for sysctl                   */
         int  (*up)(struct net_device *);
         void (*down)(struct net_device *);
         void (*timer3)(struct net_device *, struct dn_ifaddr *ifa);
@@ -97,16 +96,14 @@ struct dn_dev {
         unsigned long uptime;     /* Time device went up in jiffies */
 };
 
-struct dn_short_packet
-{
+struct dn_short_packet {
         __u8    msgflg;
         __le16 dstnode;
         __le16 srcnode;
         __u8   forward;
 } __attribute__((packed));
 
-struct dn_long_packet
-{
+struct dn_long_packet {
         __u8   msgflg;
         __u8   d_area;
         __u8   d_subarea;
@@ -122,8 +119,7 @@ struct dn_long_packet
 
 /*------------------------- DRP - Routing messages ---------------------*/
 
-struct endnode_hello_message
-{
+struct endnode_hello_message {
         __u8   msgflg;
         __u8   tiver[3];
         __u8   id[6];
@@ -138,8 +134,7 @@ struct endnode_hello_message
         __u8   data[2];
 } __attribute__((packed));
 
-struct rtnode_hello_message
-{
+struct rtnode_hello_message {
         __u8   msgflg;
         __u8   tiver[3];
         __u8   id[6];
diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h
index c378be7bf96..52da6c3dd50 100644
--- a/include/net/dn_fib.h
+++ b/include/net/dn_fib.h
@@ -4,8 +4,7 @@
 /* WARNING: The ordering of these elements must match ordering
  *          of RTA_* rtnetlink attribute numbers.
  */
-struct dn_kern_rta
-{
+struct dn_kern_rta {
         void            *rta_dst;
         void            *rta_src;
         int             *rta_iif;
diff --git a/include/net/dn_nsp.h b/include/net/dn_nsp.h
index 96e816b6974..17d43d2db5e 100644
--- a/include/net/dn_nsp.h
+++ b/include/net/dn_nsp.h
@@ -70,30 +70,26 @@ extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int nobl
 
 /* Data Messages    (data segment/interrupt/link service)               */
 
-struct nsp_data_seg_msg
-{
+struct nsp_data_seg_msg {
         __u8   msgflg;
         __le16 dstaddr;
         __le16 srcaddr;
 } __attribute__((packed));
 
-struct nsp_data_opt_msg
-{
+struct nsp_data_opt_msg {
         __le16 acknum;
         __le16 segnum;
         __le16 lsflgs;
 } __attribute__((packed));
 
-struct nsp_data_opt_msg1
-{
+struct nsp_data_opt_msg1 {
         __le16 acknum;
         __le16 segnum;
 } __attribute__((packed));
 
 
 /* Acknowledgment Message (data/other data)                             */
-struct nsp_data_ack_msg
-{
+struct nsp_data_ack_msg {
         __u8   msgflg;
         __le16 dstaddr;
         __le16 srcaddr;
@@ -101,16 +97,14 @@ struct nsp_data_ack_msg
 } __attribute__((packed));
 
 /* Connect Acknowledgment Message */
-struct  nsp_conn_ack_msg
-{
+struct  nsp_conn_ack_msg {
         __u8 msgflg;
         __le16 dstaddr;
 } __attribute__((packed));
 
 
 /* Connect Initiate/Retransmit Initiate/Connect Confirm */
-struct  nsp_conn_init_msg
-{
+struct  nsp_conn_init_msg {
         __u8   msgflg;
 #define NSP_CI      0x18            /* Connect Initiate     */
 #define NSP_RCI     0x68            /* Retrans. Conn Init   */
@@ -126,8 +120,7 @@ struct  nsp_conn_init_msg
 } __attribute__((packed));
 
 /* Disconnect Initiate/Disconnect Confirm */
-struct  nsp_disconn_init_msg
-{
+struct  nsp_disconn_init_msg {
         __u8   msgflg;
         __le16 dstaddr;
         __le16 srcaddr;
@@ -136,8 +129,7 @@ struct  nsp_disconn_init_msg
 
 
 
-struct  srcobj_fmt
-{
+struct  srcobj_fmt {
         __u8   format;
         __u8   task;
         __le16 grpcode;
diff --git a/include/net/dst.h b/include/net/dst.h
index 5a900ddcf10..387cb3cfde7 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -36,8 +36,7 @@
 
 struct sk_buff;
 
-struct dst_entry
-{
+struct dst_entry {
         struct rcu_head         rcu_head;
         struct dst_entry        *child;
         struct net_device       *dev;
@@ -111,6 +110,12 @@ dst_metric(const struct dst_entry *dst, int metric)
         return dst->metrics[metric-1];
 }
 
+static inline u32
+dst_feature(const struct dst_entry *dst, u32 feature)
+{
+        return (dst ? dst_metric(dst, RTAX_FEATURES) & feature : 0);
+}
+
 static inline u32 dst_mtu(const struct dst_entry *dst)
 {
         u32 mtu = dst_metric(dst, RTAX_MTU);
@@ -136,7 +141,7 @@ static inline void set_dst_metric_rtt(struct dst_entry *dst, int metric,
 static inline u32
 dst_allfrag(const struct dst_entry *dst)
 {
-        int ret = dst_metric(dst, RTAX_FEATURES) & RTAX_FEATURE_ALLFRAG;
+        int ret = dst_feature(dst,  RTAX_FEATURE_ALLFRAG);
         /* Yes, _exactly_. This is paranoia. */
         barrier();
         return ret;
@@ -222,11 +227,19 @@ static inline void dst_confirm(struct dst_entry *dst)
                 neigh_confirm(dst->neighbour);
 }
 
-static inline void dst_negative_advice(struct dst_entry **dst_p)
+static inline void dst_negative_advice(struct dst_entry **dst_p,
+                                       struct sock *sk)
 {
         struct dst_entry * dst = *dst_p;
-        if (dst && dst->ops->negative_advice)
+        if (dst && dst->ops->negative_advice) {
                 *dst_p = dst->ops->negative_advice(dst);
+
+                if (dst != *dst_p) {
+                        extern void sk_reset_txq(struct sock *sk);
+
+                        sk_reset_txq(sk);
+                }
+        }
 }
 
 static inline void dst_link_failure(struct sk_buff *skb)
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index ca4b2e84007..c07ac9650eb 100644
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -7,12 +7,11 @@
 #include <net/flow.h>
 #include <net/rtnetlink.h>
 
-struct fib_rule
-{
+struct fib_rule {
         struct list_head        list;
         atomic_t                refcnt;
-        int                     ifindex;
-        char                    ifname[IFNAMSIZ];
+        int                     iifindex;
+        int                     oifindex;
         u32                     mark;
         u32                     mark_mask;
         u32                     pref;
@@ -21,19 +20,19 @@ struct fib_rule
         u8                      action;
         u32                     target;
         struct fib_rule *       ctarget;
+        char                    iifname[IFNAMSIZ];
+        char                    oifname[IFNAMSIZ];
         struct rcu_head         rcu;
         struct net *            fr_net;
 };
 
-struct fib_lookup_arg
-{
+struct fib_lookup_arg {
         void                    *lookup_ptr;
         void                    *result;
         struct fib_rule         *rule;
 };
 
-struct fib_rules_ops
-{
+struct fib_rules_ops {
         int                     family;
         struct list_head        list;
         int                     rule_size;
@@ -67,10 +66,12 @@ struct fib_rules_ops
         struct list_head        rules_list;
         struct module           *owner;
         struct net              *fro_net;
+        struct rcu_head         rcu;
 };
 
 #define FRA_GENERIC_POLICY \
-        [FRA_IFNAME]    = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \
+        [FRA_IIFNAME]   = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \
+        [FRA_OIFNAME]   = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \
         [FRA_PRIORITY]  = { .type = NLA_U32 }, \
         [FRA_FWMARK]    = { .type = NLA_U32 }, \
         [FRA_FWMASK]    = { .type = NLA_U32 }, \
@@ -102,7 +103,7 @@ static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla)
         return frh->table;
 }
 
-extern int fib_rules_register(struct fib_rules_ops *);
+extern struct fib_rules_ops *fib_rules_register(struct fib_rules_ops *, struct net *);
 extern void fib_rules_unregister(struct fib_rules_ops *);
 extern void                     fib_rules_cleanup_ops(struct fib_rules_ops *);
 
diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
index c1488553e34..fa157712e98 100644
--- a/include/net/gen_stats.h
+++ b/include/net/gen_stats.h
@@ -6,8 +6,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/pkt_sched.h>
 
-struct gnet_dump
-{
+struct gnet_dump {
         spinlock_t *      lock;
         struct sk_buff *  skb;
         struct nlattr *   tail;
@@ -30,6 +29,7 @@ extern int gnet_stats_start_copy_compat(struct sk_buff *skb, int type,
 extern int gnet_stats_copy_basic(struct gnet_dump *d,
                                  struct gnet_stats_basic_packed *b);
 extern int gnet_stats_copy_rate_est(struct gnet_dump *d,
+                                    const struct gnet_stats_basic_packed *b,
                                     struct gnet_stats_rate_est *r);
 extern int gnet_stats_copy_queue(struct gnet_dump *d,
                                  struct gnet_stats_queue *q);
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index 2a1c06874c4..eb551baafc0 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -13,8 +13,7 @@
  * @list: list entry for linking
  * @family: pointer to family, need not be set before registering
  */
-struct genl_multicast_group
-{
+struct genl_multicast_group {
         struct genl_family      *family;        /* private */
         struct list_head        list;           /* private */
         char                    name[GENL_NAMSIZ];
@@ -35,8 +34,7 @@ struct genl_multicast_group
  * @family_list: family list
  * @mcast_groups: multicast groups list
  */
-struct genl_family
-{
+struct genl_family {
         unsigned int            id;
         unsigned int            hdrsize;
         char                    name[GENL_NAMSIZ];
@@ -58,8 +56,7 @@ struct genl_family
  * @userhdr: user specific header
  * @attrs: netlink attributes
  */
-struct genl_info
-{
+struct genl_info {
         u32                     snd_seq;
         u32                     snd_pid;
         struct nlmsghdr *       nlhdr;
@@ -102,8 +99,7 @@ static inline void genl_info_net_set(struct genl_info *info, struct net *net)
  * @done: completion callback for dumps
  * @ops_list: operations list
  */
-struct genl_ops
-{
+struct genl_ops {
         u8                      cmd;
         unsigned int            flags;
         const struct nla_policy *policy;
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index 23c3f3d9777..9d3d86aaccb 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -80,7 +80,7 @@ struct ieee80211_radiotap_header {
                                  * Additional extensions are made
                                  * by setting bit 31.
                                  */
-};
+} __packed;
 
 /* Name                                 Data type    Units
  * ----                                 ---------    -----
diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index 5dc6a61952d..57430555487 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -74,8 +74,12 @@ static inline int mac_cb_type(struct sk_buff *skb)
 #define IEEE802154_MAC_SCAN_PASSIVE     2
 #define IEEE802154_MAC_SCAN_ORPHAN      3
 
+struct wpan_phy;
 /*
  * This should be located at net_device->ml_priv
+ *
+ * get_phy should increment the reference counting on returned phy.
+ * Use wpan_wpy_put to put that reference.
  */
 struct ieee802154_mlme_ops {
         int (*assoc_req)(struct net_device *dev,
@@ -94,18 +98,20 @@ struct ieee802154_mlme_ops {
         int (*scan_req)(struct net_device *dev,
                         u8 type, u32 channels, u8 page, u8 duration);
 
+        struct wpan_phy *(*get_phy)(const struct net_device *dev);
+
         /*
          * FIXME: these should become the part of PIB/MIB interface.
          * However we still don't have IB interface of any kind
          */
-        u16 (*get_pan_id)(struct net_device *dev);
-        u16 (*get_short_addr)(struct net_device *dev);
-        u8 (*get_dsn)(struct net_device *dev);
-        u8 (*get_bsn)(struct net_device *dev);
+        u16 (*get_pan_id)(const struct net_device *dev);
+        u16 (*get_short_addr)(const struct net_device *dev);
+        u8 (*get_dsn)(const struct net_device *dev);
+        u8 (*get_bsn)(const struct net_device *dev);
 };
 
 static inline struct ieee802154_mlme_ops *ieee802154_mlme_ops(
-                struct net_device *dev)
+                const struct net_device *dev)
 {
         return dev->ml_priv;
 }
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 38b78132019..e9d69d19849 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -32,8 +32,7 @@
 
 #ifdef __KERNEL__
 
-struct inet6_ifaddr 
-{
+struct inet6_ifaddr {
         struct in6_addr         addr;
         __u32                   prefix_len;
         
@@ -67,8 +66,7 @@ struct inet6_ifaddr
         int                     dead;
 };
 
-struct ip6_sf_socklist
-{
+struct ip6_sf_socklist {
         unsigned int            sl_max;
         unsigned int            sl_count;
         struct in6_addr         sl_addr[0];
@@ -79,8 +77,7 @@ struct ip6_sf_socklist
 
 #define IP6_SFBLOCK     10      /* allocate this many at once */
 
-struct ipv6_mc_socklist
-{
+struct ipv6_mc_socklist {
         struct in6_addr         addr;
         int                     ifindex;
         struct ipv6_mc_socklist *next;
@@ -89,8 +86,7 @@ struct ipv6_mc_socklist
         struct ip6_sf_socklist  *sflist;
 };
 
-struct ip6_sf_list
-{
+struct ip6_sf_list {
         struct ip6_sf_list      *sf_next;
         struct in6_addr         sf_addr;
         unsigned long           sf_count[2];    /* include/exclude counts */
@@ -105,8 +101,7 @@ struct ip6_sf_list
 #define MAF_NOREPORT            0x08
 #define MAF_GSQUERY             0x10
 
-struct ifmcaddr6
-{
+struct ifmcaddr6 {
         struct in6_addr         mca_addr;
         struct inet6_dev        *idev;
         struct ifmcaddr6        *next;
@@ -126,15 +121,13 @@ struct ifmcaddr6
 
 /* Anycast stuff */
 
-struct ipv6_ac_socklist
-{
+struct ipv6_ac_socklist {
         struct in6_addr         acl_addr;
         int                     acl_ifindex;
         struct ipv6_ac_socklist *acl_next;
 };
 
-struct ifacaddr6
-{
+struct ifacaddr6 {
         struct in6_addr         aca_addr;
         struct inet6_dev        *aca_idev;
         struct rt6_info         *aca_rt;
@@ -157,8 +150,7 @@ struct ipv6_devstat {
         DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg);
 };
 
-struct inet6_dev 
-{
+struct inet6_dev {
         struct net_device               *dev;
 
         struct inet6_ifaddr     *addr_list;
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index 22c73a77cd9..92838d3a1ab 100644
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -46,8 +46,8 @@ static inline int inet6_sk_ehashfn(const struct sock *sk)
         const struct ipv6_pinfo *np = inet6_sk(sk);
         const struct in6_addr *laddr = &np->rcv_saddr;
         const struct in6_addr *faddr = &np->daddr;
-        const __u16 lport = inet->num;
-        const __be16 fport = inet->dport;
+        const __u16 lport = inet->inet_num;
+        const __be16 fport = inet->inet_dport;
         struct net *net = sock_net(sk);
 
         return inet6_ehashfn(net, laddr, lport, faddr, fport);
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index d522dcf3031..41cbddd25b7 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -92,8 +92,8 @@ static inline struct net *ib_net(struct inet_bind_bucket *ib)
         return read_pnet(&ib->ib_net);
 }
 
-#define inet_bind_bucket_for_each(tb, node, head) \
-        hlist_for_each_entry(tb, node, head, node)
+#define inet_bind_bucket_for_each(tb, pos, head) \
+        hlist_for_each_entry(tb, pos, head, node)
 
 struct inet_bind_hashbucket {
         spinlock_t              lock;
@@ -125,7 +125,7 @@ struct inet_hashinfo {
          */
         struct inet_ehash_bucket        *ehash;
         spinlock_t                      *ehash_locks;
-        unsigned int                    ehash_size;
+        unsigned int                    ehash_mask;
         unsigned int                    ehash_locks_mask;
 
         /* Ok, let's try this, I give up, we do need a local binding
@@ -158,7 +158,7 @@ static inline struct inet_ehash_bucket *inet_ehash_bucket(
         struct inet_hashinfo *hashinfo,
         unsigned int hash)
 {
-        return &hashinfo->ehash[hash & (hashinfo->ehash_size - 1)];
+        return &hashinfo->ehash[hash & hashinfo->ehash_mask];
 }
 
 static inline spinlock_t *inet_ehash_lockp(
@@ -241,7 +241,7 @@ static inline int inet_lhashfn(struct net *net, const unsigned short num)
 
 static inline int inet_sk_listen_hashfn(const struct sock *sk)
 {
-        return inet_lhashfn(sock_net(sk), inet_sk(sk)->num);
+        return inet_lhashfn(sock_net(sk), inet_sk(sk)->inet_num);
 }
 
 /* Caller must disable local BH processing. */
@@ -301,8 +301,8 @@ typedef __u64 __bitwise __addrpair;
 #endif /* __BIG_ENDIAN */
 #define INET_MATCH(__sk, __net, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
         (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net)) &&    \
-         ((*((__addrpair *)&(inet_sk(__sk)->daddr))) == (__cookie))     &&      \
-         ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))      &&      \
+         ((*((__addrpair *)&(inet_sk(__sk)->inet_daddr))) == (__cookie))  &&    \
+         ((*((__portpair *)&(inet_sk(__sk)->inet_dport))) == (__ports))   &&    \
          (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #define INET_TW_MATCH(__sk, __net, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
         (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net)) &&    \
@@ -313,9 +313,9 @@ typedef __u64 __bitwise __addrpair;
 #define INET_ADDR_COOKIE(__name, __saddr, __daddr)
 #define INET_MATCH(__sk, __net, __hash, __cookie, __saddr, __daddr, __ports, __dif)     \
         (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net))       &&      \
-         (inet_sk(__sk)->daddr          == (__saddr))           &&      \
-         (inet_sk(__sk)->rcv_saddr      == (__daddr))           &&      \
-         ((*((__portpair *)&(inet_sk(__sk)->dport))) == (__ports))      &&      \
+         (inet_sk(__sk)->inet_daddr     == (__saddr))           &&      \
+         (inet_sk(__sk)->inet_rcv_saddr == (__daddr))           &&      \
+         ((*((__portpair *)&(inet_sk(__sk)->inet_dport))) == (__ports)) &&      \
          (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #define INET_TW_MATCH(__sk, __net, __hash,__cookie, __saddr, __daddr, __ports, __dif)   \
         (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net))       &&      \
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 47004f35cc7..bd4c53f75ac 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -93,14 +93,14 @@ struct rtable;
  *
  * @sk - ancestor class
  * @pinet6 - pointer to IPv6 control block
- * @daddr - Foreign IPv4 addr
- * @rcv_saddr - Bound local IPv4 addr
- * @dport - Destination port
- * @num - Local port
- * @saddr - Sending source
+ * @inet_daddr - Foreign IPv4 addr
+ * @inet_rcv_saddr - Bound local IPv4 addr
+ * @inet_dport - Destination port
+ * @inet_num - Local port
+ * @inet_saddr - Sending source
  * @uc_ttl - Unicast TTL
- * @sport - Source port
- * @id - ID counter for DF pkts
+ * @inet_sport - Source port
+ * @inet_id - ID counter for DF pkts
  * @tos - TOS
  * @mc_ttl - Multicasting TTL
  * @is_icsk - is this an inet_connection_sock?
@@ -115,16 +115,16 @@ struct inet_sock {
         struct ipv6_pinfo       *pinet6;
 #endif
         /* Socket demultiplex comparisons on incoming packets. */
-        __be32                  daddr;
-        __be32                  rcv_saddr;
-        __be16                  dport;
-        __u16                   num;
-        __be32                  saddr;
+        __be32                  inet_daddr;
+        __be32                  inet_rcv_saddr;
+        __be16                  inet_dport;
+        __u16                   inet_num;
+        __be32                  inet_saddr;
         __s16                   uc_ttl;
         __u16                   cmsg_flags;
         struct ip_options       *opt;
-        __be16                  sport;
-        __u16                   id;
+        __be16                  inet_sport;
+        __u16                   inet_id;
         __u8                    tos;
         __u8                    mc_ttl;
         __u8                    pmtudisc;
@@ -190,10 +190,10 @@ static inline unsigned int inet_ehashfn(struct net *net,
 static inline int inet_sk_ehashfn(const struct sock *sk)
 {
         const struct inet_sock *inet = inet_sk(sk);
-        const __be32 laddr = inet->rcv_saddr;
-        const __u16 lport = inet->num;
-        const __be32 faddr = inet->daddr;
-        const __be16 fport = inet->dport;
+        const __be32 laddr = inet->inet_rcv_saddr;
+        const __u16 lport = inet->inet_num;
+        const __be32 faddr = inet->inet_daddr;
+        const __be16 fport = inet->inet_dport;
         struct net *net = sock_net(sk);
 
         return inet_ehashfn(net, laddr, lport, faddr, fport);
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index f93ad90a601..b801ade2295 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -194,11 +194,13 @@ static inline struct inet_timewait_sock *inet_twsk(const struct sock *sk)
 static inline __be32 inet_rcv_saddr(const struct sock *sk)
 {
         return likely(sk->sk_state != TCP_TIME_WAIT) ?
-                inet_sk(sk)->rcv_saddr : inet_twsk(sk)->tw_rcv_saddr;
+                inet_sk(sk)->inet_rcv_saddr : inet_twsk(sk)->tw_rcv_saddr;
 }
 
 extern void inet_twsk_put(struct inet_timewait_sock *tw);
 
+extern int inet_twsk_unhash(struct inet_timewait_sock *tw);
+
 extern struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,
                                                   const int state);
 
@@ -212,14 +214,14 @@ extern void inet_twsk_schedule(struct inet_timewait_sock *tw,
 extern void inet_twsk_deschedule(struct inet_timewait_sock *tw,
                                  struct inet_timewait_death_row *twdr);
 
-extern void inet_twsk_purge(struct net *net, struct inet_hashinfo *hashinfo,
+extern void inet_twsk_purge(struct inet_hashinfo *hashinfo,
                             struct inet_timewait_death_row *twdr, int family);
 
 static inline
 struct net *twsk_net(const struct inet_timewait_sock *twsk)
 {
 #ifdef CONFIG_NET_NS
-        return twsk->tw_net;
+        return rcu_dereference(twsk->tw_net);
 #else
         return &init_net;
 #endif
@@ -229,7 +231,7 @@ static inline
 void twsk_net_set(struct inet_timewait_sock *twsk, struct net *net)
 {
 #ifdef CONFIG_NET_NS
-        twsk->tw_net = net;
+        rcu_assign_pointer(twsk->tw_net, net);
 #endif
 }
 #endif  /* _INET_TIMEWAIT_SOCK_ */
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 15e1f8fe4c1..87b1df0d4d8 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -13,20 +13,19 @@
 #include <linux/spinlock.h>
 #include <asm/atomic.h>
 
-struct inet_peer
-{
+struct inet_peer {
         /* group together avl_left,avl_right,v4daddr to speedup lookups */
         struct inet_peer        *avl_left, *avl_right;
         __be32                  v4daddr;        /* peer's address */
-        __u16                   avl_height;
-        __u16                   ip_id_count;    /* IP ID for the next packet */
+        __u32                   avl_height;
         struct list_head        unused;
         __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 */
         __u32                   tcp_ts;
-        unsigned long           tcp_ts_stamp;
+        __u32                   tcp_ts_stamp;
 };
 
 void                    inet_initpeers(void) __init;
@@ -37,17 +36,11 @@ 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);
 
-extern spinlock_t inet_peer_idlock;
 /* can be called with or without local BH being disabled */
 static inline __u16     inet_getid(struct inet_peer *p, int more)
 {
-        __u16 id;
-
-        spin_lock_bh(&inet_peer_idlock);
-        id = p->ip_id_count;
-        p->ip_id_count += 1 + more;
-        spin_unlock_bh(&inet_peer_idlock);
-        return id;
+        more++;
+        return atomic_add_return(more, &p->ip_id_count) - more;
 }
 
 #endif /* _NET_INETPEER_H */
diff --git a/include/net/ip.h b/include/net/ip.h
index 2f47e5482b5..e6b9d12d5f6 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -33,8 +33,7 @@
 
 struct sock;
 
-struct inet_skb_parm
-{
+struct inet_skb_parm {
         struct ip_options       opt;            /* Compiled IP options          */
         unsigned char           flags;
 
@@ -50,8 +49,7 @@ static inline unsigned int ip_hdrlen(const struct sk_buff *skb)
         return ip_hdr(skb)->ihl * 4;
 }
 
-struct ipcm_cookie
-{
+struct ipcm_cookie {
         __be32                  addr;
         int                     oif;
         struct ip_options       *opt;
@@ -60,8 +58,7 @@ struct ipcm_cookie
 
 #define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb))
 
-struct ip_ra_chain
-{
+struct ip_ra_chain {
         struct ip_ra_chain      *next;
         struct sock             *sk;
         void                    (*destructor)(struct sock *);
@@ -159,8 +156,7 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg)
 void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg,
                    unsigned int len); 
 
-struct ipv4_config
-{
+struct ipv4_config {
         int     log_martians;
         int     no_pmtu_disc;
 };
@@ -240,8 +236,8 @@ static inline void ip_select_ident(struct iphdr *iph, struct dst_entry *dst, str
                  * does not change, they drop every other packet in
                  * a TCP stream using header compression.
                  */
-                iph->id = (sk && inet_sk(sk)->daddr) ?
-                                        htons(inet_sk(sk)->id++) : 0;
+                iph->id = (sk && inet_sk(sk)->inet_daddr) ?
+                                        htons(inet_sk(sk)->inet_id++) : 0;
         } else
                 __ip_select_ident(iph, dst, 0);
 }
@@ -249,9 +245,9 @@ static inline void ip_select_ident(struct iphdr *iph, struct dst_entry *dst, str
 static inline void ip_select_ident_more(struct iphdr *iph, struct dst_entry *dst, struct sock *sk, int more)
 {
         if (iph->frag_off & htons(IP_DF)) {
-                if (sk && inet_sk(sk)->daddr) {
-                        iph->id = htons(inet_sk(sk)->id);
-                        inet_sk(sk)->id += 1 + more;
+                if (sk && inet_sk(sk)->inet_daddr) {
+                        iph->id = htons(inet_sk(sk)->inet_id);
+                        inet_sk(sk)->inet_id += 1 + more;
                 } else
                         iph->id = 0;
         } else
@@ -317,7 +313,7 @@ static inline void ip_ib_mc_map(__be32 naddr, const unsigned char *broadcast, ch
 
 static __inline__ void inet_reset_saddr(struct sock *sk)
 {
-        inet_sk(sk)->rcv_saddr = inet_sk(sk)->saddr = 0;
+        inet_sk(sk)->inet_rcv_saddr = inet_sk(sk)->inet_saddr = 0;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         if (sk->sk_family == PF_INET6) {
                 struct ipv6_pinfo *np = inet6_sk(sk);
@@ -336,8 +332,7 @@ extern int	ip_call_ra_chain(struct sk_buff *skb);
  *      Functions provided by ip_fragment.c
  */
 
-enum ip_defrag_users
-{
+enum ip_defrag_users {
         IP_DEFRAG_LOCAL_DELIVER,
         IP_DEFRAG_CALL_RA_CHAIN,
         IP_DEFRAG_CONNTRACK_IN,
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 15b492a9aa7..257808188ad 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -30,8 +30,7 @@
 
 struct rt6_info;
 
-struct fib6_config
-{
+struct fib6_config {
         u32             fc_table;
         u32             fc_metric;
         int             fc_dst_len;
@@ -51,8 +50,7 @@ struct fib6_config
         struct nl_info  fc_nlinfo;
 };
 
-struct fib6_node
-{
+struct fib6_node {
         struct fib6_node        *parent;
         struct fib6_node        *left;
         struct fib6_node        *right;
@@ -78,16 +76,14 @@ struct fib6_node
  *
  */
 
-struct rt6key
-{
+struct rt6key {
         struct in6_addr addr;
         int             plen;
 };
 
 struct fib6_table;
 
-struct rt6_info
-{
+struct rt6_info {
         union {
                 struct dst_entry        dst;
         } u;
@@ -127,8 +123,7 @@ static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)
         return ((struct rt6_info *)dst)->rt6i_idev;
 }
 
-struct fib6_walker_t
-{
+struct fib6_walker_t {
         struct fib6_walker_t *prev, *next;
         struct fib6_node *root, *node;
         struct rt6_info *leaf;
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 0e1b8aebaff..4a808de7c0f 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -103,8 +103,7 @@ extern void			rt6_pmtu_discovery(struct in6_addr *daddr,
 
 struct netlink_callback;
 
-struct rt6_rtnl_dump_arg
-{
+struct rt6_rtnl_dump_arg {
         struct sk_buff *skb;
         struct netlink_callback *cb;
         struct net *net;
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 4d22fabc771..c93f94edc61 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -144,18 +144,21 @@ struct fib_table {
         struct hlist_node tb_hlist;
         u32             tb_id;
         int             tb_default;
-        int             (*tb_lookup)(struct fib_table *tb, const struct flowi *flp, struct fib_result *res);
-        int             (*tb_insert)(struct fib_table *, struct fib_config *);
-        int             (*tb_delete)(struct fib_table *, struct fib_config *);
-        int             (*tb_dump)(struct fib_table *table, struct sk_buff *skb,
-                                     struct netlink_callback *cb);
-        int             (*tb_flush)(struct fib_table *table);
-        void            (*tb_select_default)(struct fib_table *table,
-                                             const struct flowi *flp, struct fib_result *res);
-
         unsigned char   tb_data[0];
 };
 
+extern int fib_table_lookup(struct fib_table *tb, const struct flowi *flp,
+                            struct fib_result *res);
+extern int fib_table_insert(struct fib_table *, struct fib_config *);
+extern int fib_table_delete(struct fib_table *, struct fib_config *);
+extern int fib_table_dump(struct fib_table *table, struct sk_buff *skb,
+                          struct netlink_callback *cb);
+extern int fib_table_flush(struct fib_table *table);
+extern void fib_table_select_default(struct fib_table *table,
+                                     const struct flowi *flp,
+                                     struct fib_result *res);
+
+
 #ifndef CONFIG_IP_MULTIPLE_TABLES
 
 #define TABLE_LOCAL_INDEX       0
@@ -182,11 +185,11 @@ static inline int fib_lookup(struct net *net, const struct flowi *flp,
         struct fib_table *table;
 
         table = fib_get_table(net, RT_TABLE_LOCAL);
-        if (!table->tb_lookup(table, flp, res))
+        if (!fib_table_lookup(table, flp, res))
                 return 0;
 
         table = fib_get_table(net, RT_TABLE_MAIN);
-        if (!table->tb_lookup(table, flp, res))
+        if (!fib_table_lookup(table, flp, res))
                 return 0;
         return -ENETUNREACH;
 }
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 98978e73f66..8dc3296b7be 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -251,8 +251,7 @@ struct ip_vs_estimator {
         u32                     outbps;
 };
 
-struct ip_vs_stats
-{
+struct ip_vs_stats {
         struct ip_vs_stats_user ustats;         /* statistics */
         struct ip_vs_estimator  est;            /* estimator */
 
@@ -518,8 +517,7 @@ struct ip_vs_scheduler {
 /*
  *      The application module object (a.k.a. app incarnation)
  */
-struct ip_vs_app
-{
+struct ip_vs_app {
         struct list_head        a_list;         /* member in app list */
         int                     type;           /* IP_VS_APP_TYPE_xxx */
         char                    *name;          /* application module name */
diff --git a/include/net/ipip.h b/include/net/ipip.h
index 87acf8f3a15..11e8513d2d0 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -7,8 +7,15 @@
 /* Keep error state on tunnel for 30 sec */
 #define IPTUNNEL_ERR_TIMEO      (30*HZ)
 
-struct ip_tunnel
-{
+/* 6rd prefix/relay information */
+struct ip_tunnel_6rd_parm {
+        struct in6_addr         prefix;
+        __be32                  relay_prefix;
+        u16                     prefixlen;
+        u16                     relay_prefixlen;
+};
+
+struct ip_tunnel {
         struct ip_tunnel        *next;
         struct net_device       *dev;
 
@@ -23,15 +30,19 @@ struct ip_tunnel
 
         struct ip_tunnel_parm   parms;
 
+        /* for SIT */
+#ifdef CONFIG_IPV6_SIT_6RD
+        struct ip_tunnel_6rd_parm       ip6rd;
+#endif
         struct ip_tunnel_prl_entry      *prl;           /* potential router list */
         unsigned int                    prl_count;      /* # of entries in PRL */
 };
 
-struct ip_tunnel_prl_entry
-{
+struct ip_tunnel_prl_entry {
         struct ip_tunnel_prl_entry      *next;
         __be32                          addr;
         u16                             flags;
+        struct rcu_head                 rcu_head;
 };
 
 #define IPTUNNEL_XMIT() do {                                            \
@@ -42,9 +53,9 @@ struct ip_tunnel_prl_entry
         ip_select_ident(iph, &rt->u.dst, NULL);                         \
                                                                         \
         err = ip_local_out(skb);                                        \
-        if (net_xmit_eval(err) == 0) {                                  \
-                stats->tx_bytes += pkt_len;                             \
-                stats->tx_packets++;                                    \
+        if (likely(net_xmit_eval(err) == 0)) {                          \
+                txq->tx_bytes += pkt_len;                               \
+                txq->tx_packets++;                                      \
         } else {                                                        \
                 stats->tx_errors++;                                     \
                 stats->tx_aborted_errors++;                             \
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 8c31d8a0c1f..92db8617d18 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -160,8 +160,7 @@ extern struct ctl_path net_ipv6_ctl_path[];
 #define ICMP6MSGIN_INC_STATS_BH(net, idev, field)       \
         _DEVINC(net, icmpv6msg, _BH, idev, field)
 
-struct ip6_ra_chain
-{
+struct ip6_ra_chain {
         struct ip6_ra_chain     *next;
         struct sock             *sk;
         int                     sel;
@@ -176,8 +175,7 @@ extern rwlock_t ip6_ra_lock;
    ancillary data and passed to IPv6.
  */
 
-struct ipv6_txoptions
-{
+struct ipv6_txoptions {
         /* Length of this structure */
         int                     tot_len;
 
@@ -194,8 +192,7 @@ struct ipv6_txoptions
         /* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */
 };
 
-struct ip6_flowlabel
-{
+struct ip6_flowlabel {
         struct ip6_flowlabel    *next;
         __be32                  label;
         atomic_t                users;
@@ -212,8 +209,7 @@ struct ip6_flowlabel
 #define IPV6_FLOWINFO_MASK      cpu_to_be32(0x0FFFFFFF)
 #define IPV6_FLOWLABEL_MASK     cpu_to_be32(0x000FFFFF)
 
-struct ipv6_fl_socklist
-{
+struct ipv6_fl_socklist {
         struct ipv6_fl_socklist *next;
         struct ip6_flowlabel    *fl;
 };
diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h
index e9054a283fd..b2b98f3fa26 100644
--- a/include/net/iw_handler.h
+++ b/include/net/iw_handler.h
@@ -300,8 +300,7 @@
  * This struct is also my long term insurance. I can add new fields here
  * without breaking the prototype of iw_handler...
  */
-struct iw_request_info
-{
+struct iw_request_info {
         __u16           cmd;            /* Wireless Extension command */
         __u16           flags;          /* More to come ;-) */
 };
@@ -321,20 +320,20 @@ typedef int (*iw_handler)(struct net_device *dev, struct iw_request_info *info,
  * shared by all driver instances... Same for the members...
  * This will be linked from net_device in <linux/netdevice.h>
  */
-struct iw_handler_def
-{
-        /* Number of handlers defined (more precisely, index of the
-         * last defined handler + 1) */
-        __u16                   num_standard;
-        __u16                   num_private;
-        /* Number of private arg description */
-        __u16                   num_private_args;
+struct iw_handler_def {
 
         /* Array of handlers for standard ioctls
          * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWCOMMIT]
          */
         const iw_handler *      standard;
+        /* Number of handlers defined (more precisely, index of the
+         * last defined handler + 1) */
+        __u16                   num_standard;
 
+#ifdef CONFIG_WEXT_PRIV
+        __u16                   num_private;
+        /* Number of private arg description */
+        __u16                   num_private_args;
         /* Array of handlers for private ioctls
          * Will call dev->wireless_handlers->private[ioctl - SIOCIWFIRSTPRIV]
          */
@@ -344,6 +343,7 @@ struct iw_handler_def
          * can put it in any order you want and should not leave holes...
          * We will automatically export that to user space... */
         const struct iw_priv_args *     private_args;
+#endif
 
         /* New location of get_wireless_stats, to de-bloat struct net_device.
          * The old pointer in struct net_device will be gradually phased
@@ -370,8 +370,7 @@ struct iw_handler_def
 /*
  * Describe how a standard IOCTL looks like.
  */
-struct iw_ioctl_description
-{
+struct iw_ioctl_description {
         __u8    header_type;            /* NULL, iw_point or other */
         __u8    token_type;             /* Future */
         __u16   token_size;             /* Granularity of payload */
@@ -393,8 +392,7 @@ struct iw_ioctl_description
 /*
  * Instance specific spy data, i.e. addresses spied and quality for them.
  */
-struct iw_spy_data
-{
+struct iw_spy_data {
         /* --- Standard spy support --- */
         int                     spy_number;
         u_char                  spy_address[IW_MAX_SPY][ETH_ALEN];
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index c75b960c8ac..2aff4906b2a 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -219,7 +219,7 @@ struct ieee80211_bss_conf {
  *
  * These flags are used with the @flags member of &ieee80211_tx_info.
  *
- * @IEEE80211_TX_CTL_REQ_TX_STATUS: request TX status callback for this frame.
+ * @IEEE80211_TX_CTL_REQ_TX_STATUS: require TX status callback for this frame.
  * @IEEE80211_TX_CTL_ASSIGN_SEQ: The driver has to assign a sequence
  *      number to this frame, taking care of not overwriting the fragment
  *      number and increasing the sequence number only when the
@@ -390,10 +390,12 @@ struct ieee80211_tx_rate {
  * @control: union for control data
  * @status: union for status data
  * @driver_data: array of driver_data pointers
- * @ampdu_ack_len: number of aggregated frames.
+ * @ampdu_ack_len: number of acked aggregated frames.
  *      relevant only if IEEE80211_TX_STATUS_AMPDU was set.
  * @ampdu_ack_map: block ack bit map for the aggregation.
  *      relevant only if IEEE80211_TX_STATUS_AMPDU was set.
+ * @ampdu_len: number of aggregated frames.
+ *      relevant only if IEEE80211_TX_STATUS_AMPDU was set.
  * @ack_signal: signal strength of the ACK frame
  */
 struct ieee80211_tx_info {
@@ -428,7 +430,8 @@ struct ieee80211_tx_info {
                         u8 ampdu_ack_len;
                         u64 ampdu_ack_map;
                         int ack_signal;
-                        /* 8 bytes free */
+                        u8 ampdu_len;
+                        /* 7 bytes free */
                 } status;
                 struct {
                         struct ieee80211_tx_rate driver_rates[
@@ -494,7 +497,6 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
  * @RX_FLAG_MMIC_ERROR: Michael MIC error was reported on this frame.
  *      Use together with %RX_FLAG_MMIC_STRIPPED.
  * @RX_FLAG_DECRYPTED: This frame was decrypted in hardware.
- * @RX_FLAG_RADIOTAP: This frame starts with a radiotap header.
  * @RX_FLAG_MMIC_STRIPPED: the Michael MIC is stripped off this frame,
  *      verification has been done by the hardware.
  * @RX_FLAG_IV_STRIPPED: The IV/ICV are stripped from this frame.
@@ -511,11 +513,13 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
  * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index
  * @RX_FLAG_40MHZ: HT40 (40 MHz) was used
  * @RX_FLAG_SHORT_GI: Short guard interval was used
+ * @RX_FLAG_INTERNAL_CMTR: set internally after frame was reported
+ *      on cooked monitor to avoid double-reporting it for multiple
+ *      virtual interfaces
  */
 enum mac80211_rx_flags {
         RX_FLAG_MMIC_ERROR      = 1<<0,
         RX_FLAG_DECRYPTED       = 1<<1,
-        RX_FLAG_RADIOTAP        = 1<<2,
         RX_FLAG_MMIC_STRIPPED   = 1<<3,
         RX_FLAG_IV_STRIPPED     = 1<<4,
         RX_FLAG_FAILED_FCS_CRC  = 1<<5,
@@ -525,6 +529,7 @@ enum mac80211_rx_flags {
         RX_FLAG_HT              = 1<<9,
         RX_FLAG_40MHZ           = 1<<10,
         RX_FLAG_SHORT_GI        = 1<<11,
+        RX_FLAG_INTERNAL_CMTR   = 1<<12,
 };
 
 /**
@@ -554,7 +559,7 @@ struct ieee80211_rx_status {
         int freq;
         int signal;
         int noise;
-        int qual;
+        int __deprecated qual;
         int antenna;
         int rate_idx;
         int flag;
@@ -565,7 +570,9 @@ struct ieee80211_rx_status {
  *
  * Flags to define PHY configuration options
  *
- * @IEEE80211_CONF_RADIOTAP: add radiotap header at receive time (if supported)
+ * @IEEE80211_CONF_MONITOR: there's a monitor interface present -- use this
+ *      to determine for example whether to calculate timestamps for packets
+ *      or not, do not use instead of filter flags!
  * @IEEE80211_CONF_PS: Enable 802.11 power save mode (managed mode only)
  * @IEEE80211_CONF_IDLE: The device is running, but idle; if the flag is set
  *      the driver should be prepared to handle configuration requests but
@@ -574,7 +581,7 @@ struct ieee80211_rx_status {
  *      it can also be unset in that case when monitor interfaces are active.
  */
 enum ieee80211_conf_flags {
-        IEEE80211_CONF_RADIOTAP         = (1<<0),
+        IEEE80211_CONF_MONITOR          = (1<<0),
         IEEE80211_CONF_PS               = (1<<1),
         IEEE80211_CONF_IDLE             = (1<<2),
 };
@@ -584,7 +591,7 @@ enum ieee80211_conf_flags {
  * enum ieee80211_conf_changed - denotes which configuration changed
  *
  * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed
- * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed
+ * @IEEE80211_CONF_CHANGE_MONITOR: the monitor flag changed
  * @IEEE80211_CONF_CHANGE_PS: the PS flag or dynamic PS timeout changed
  * @IEEE80211_CONF_CHANGE_POWER: the TX power changed
  * @IEEE80211_CONF_CHANGE_CHANNEL: the channel/channel_type changed
@@ -593,7 +600,7 @@ enum ieee80211_conf_flags {
  */
 enum ieee80211_conf_changed {
         IEEE80211_CONF_CHANGE_LISTEN_INTERVAL   = BIT(2),
-        IEEE80211_CONF_CHANGE_RADIOTAP          = BIT(3),
+        IEEE80211_CONF_CHANGE_MONITOR           = BIT(3),
         IEEE80211_CONF_CHANGE_PS                = BIT(4),
         IEEE80211_CONF_CHANGE_POWER             = BIT(5),
         IEEE80211_CONF_CHANGE_CHANNEL           = BIT(6),
@@ -852,6 +859,19 @@ enum ieee80211_tkip_key_type {
  * any particular flags. There are some exceptions to this rule,
  * however, so you are advised to review these flags carefully.
  *
+ * @IEEE80211_HW_HAS_RATE_CONTROL:
+ *      The hardware or firmware includes rate control, and cannot be
+ *      controlled by the stack. As such, no rate control algorithm
+ *      should be instantiated, and the TX rate reported to userspace
+ *      will be taken from the TX status instead of the rate control
+ *      algorithm.
+ *      Note that this requires that the driver implement a number of
+ *      callbacks so it has the correct information, it needs to have
+ *      the @set_rts_threshold callback and must look at the BSS config
+ *      @use_cts_prot for G/N protection, @use_short_slot for slot
+ *      timing in 2.4 GHz and @use_short_preamble for preambles for
+ *      CCK frames.
+ *
  * @IEEE80211_HW_RX_INCLUDES_FCS:
  *      Indicates that received frames passed to the stack include
  *      the FCS at the end.
@@ -910,6 +930,7 @@ enum ieee80211_tkip_key_type {
  *      avoid waking up cpu.
  */
 enum ieee80211_hw_flags {
+        IEEE80211_HW_HAS_RATE_CONTROL                   = 1<<0,
         IEEE80211_HW_RX_INCLUDES_FCS                    = 1<<1,
         IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING        = 1<<2,
         IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE          = 1<<3,
@@ -1283,6 +1304,12 @@ enum ieee80211_filter_flags {
  *
  * These flags are used with the ampdu_action() callback in
  * &struct ieee80211_ops to indicate which action is needed.
+ *
+ * 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
+ * might receive the addBA frame and send a delBA right away!
+ *
  * @IEEE80211_AMPDU_RX_START: start Rx aggregation
  * @IEEE80211_AMPDU_RX_STOP: stop Rx aggregation
  * @IEEE80211_AMPDU_TX_START: start Tx aggregation
@@ -1505,6 +1532,7 @@ struct ieee80211_ops {
         void (*reset_tsf)(struct ieee80211_hw *hw);
         int (*tx_last_beacon)(struct ieee80211_hw *hw);
         int (*ampdu_action)(struct ieee80211_hw *hw,
+                            struct ieee80211_vif *vif,
                             enum ieee80211_ampdu_mlme_action action,
                             struct ieee80211_sta *sta, u16 tid, u16 *ssn);
 
@@ -1661,15 +1689,14 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw);
  * ieee80211_rx - receive frame
  *
  * Use this function to hand received frames to mac80211. The receive
- * buffer in @skb must start with an IEEE 802.11 header or a radiotap
- * header if %RX_FLAG_RADIOTAP is set in the @status flags.
+ * buffer in @skb must start with an IEEE 802.11 header.
  *
  * This function may not be called in IRQ context. Calls to this function
- * for a single hardware must be synchronized against each other. Calls
- * to this function and ieee80211_rx_irqsafe() may not be mixed for a
- * single hardware.
+ * for a single hardware must be synchronized against each other. Calls to
+ * this function, ieee80211_rx_ni() and ieee80211_rx_irqsafe() may not be
+ * mixed for a single hardware.
  *
- * Note that right now, this function must be called with softirqs disabled.
+ * In process context use instead ieee80211_rx_ni().
  *
  * @hw: the hardware this frame came in on
  * @skb: the buffer to receive, owned by mac80211 after this call
@@ -1682,8 +1709,8 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb);
  * Like ieee80211_rx() but can be called in IRQ context
  * (internally defers to a tasklet.)
  *
- * Calls to this function and ieee80211_rx() may not be mixed for a
- * single hardware.
+ * Calls to this function, ieee80211_rx() or ieee80211_rx_ni() may not
+ * be mixed for a single hardware.
  *
  * @hw: the hardware this frame came in on
  * @skb: the buffer to receive, owned by mac80211 after this call
@@ -1691,6 +1718,26 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb);
 void ieee80211_rx_irqsafe(struct ieee80211_hw *hw, struct sk_buff *skb);
 
 /**
+ * ieee80211_rx_ni - receive frame (in process context)
+ *
+ * Like ieee80211_rx() but can be called in process context
+ * (internally disables bottom halves).
+ *
+ * Calls to this function, ieee80211_rx() and ieee80211_rx_irqsafe() may
+ * not be mixed for a single hardware.
+ *
+ * @hw: the hardware this frame came in on
+ * @skb: the buffer to receive, owned by mac80211 after this call
+ */
+static inline void ieee80211_rx_ni(struct ieee80211_hw *hw,
+                                   struct sk_buff *skb)
+{
+        local_bh_disable();
+        ieee80211_rx(hw, skb);
+        local_bh_enable();
+}
+
+/**
  * ieee80211_tx_status - transmit status callback
  *
  * Call this function for all transmitted frames after they have been
@@ -1724,19 +1771,45 @@ void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
                                  struct sk_buff *skb);
 
 /**
- * ieee80211_beacon_get - beacon generation function
+ * ieee80211_beacon_get_tim - beacon generation function
  * @hw: pointer obtained from ieee80211_alloc_hw().
  * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf.
+ * @tim_offset: pointer to variable that will receive the TIM IE offset.
+ *      Set to 0 if invalid (in non-AP modes).
+ * @tim_length: pointer to variable that will receive the TIM IE length,
+ *      (including the ID and length bytes!).
+ *      Set to 0 if invalid (in non-AP modes).
+ *
+ * If the driver implements beaconing modes, it must use this function to
+ * obtain the beacon frame/template.
  *
  * If the beacon frames are generated by the host system (i.e., not in
- * hardware/firmware), the low-level driver uses this function to receive
- * the next beacon frame from the 802.11 code. The low-level is responsible
- * for calling this function before beacon data is needed (e.g., based on
- * hardware interrupt). Returned skb is used only once and low-level driver
- * is responsible for freeing it.
+ * hardware/firmware), the driver uses this function to get each beacon
+ * frame from mac80211 -- it is responsible for calling this function
+ * before the beacon is needed (e.g. based on hardware interrupt).
+ *
+ * If the beacon frames are generated by the device, then the driver
+ * must use the returned beacon as the template and change the TIM IE
+ * according to the current DTIM parameters/TIM bitmap.
+ *
+ * The driver is responsible for freeing the returned skb.
  */
-struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
-                                     struct ieee80211_vif *vif);
+struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
+                                         struct ieee80211_vif *vif,
+                                         u16 *tim_offset, u16 *tim_length);
+
+/**
+ * ieee80211_beacon_get - beacon generation function
+ * @hw: pointer obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf.
+ *
+ * See ieee80211_beacon_get_tim().
+ */
+static inline struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
+                                                   struct ieee80211_vif *vif)
+{
+        return ieee80211_beacon_get_tim(hw, vif, NULL, NULL);
+}
 
 /**
  * ieee80211_rts_get - RTS frame generation function
@@ -1981,8 +2054,7 @@ void ieee80211_queue_delayed_work(struct ieee80211_hw *hw,
 
 /**
  * ieee80211_start_tx_ba_session - Start a tx Block Ack session.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
- * @ra: receiver address of the BA session recipient
+ * @sta: the station for which to start a BA session
  * @tid: the TID to BA on.
  *
  * Return: success if addBA request was sent, failure otherwise
@@ -1991,22 +2063,22 @@ void ieee80211_queue_delayed_work(struct ieee80211_hw *hw,
  * the need to start aggregation on a certain RA/TID, the session level
  * will be managed by the mac80211.
  */
-int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid);
+int ieee80211_start_tx_ba_session(struct ieee80211_sta *sta, u16 tid);
 
 /**
  * ieee80211_start_tx_ba_cb - low level driver ready to aggregate.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf
  * @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_hw *hw, u8 *ra, u16 tid);
+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.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf
  * @ra: receiver address of the BA session recipient.
  * @tid: the TID to BA on.
  *
@@ -2014,13 +2086,12 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u16 tid);
  * finished with preparations for the BA session.
  * This version of the function is IRQ-safe.
  */
-void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra,
+void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, const u8 *ra,
                                       u16 tid);
 
 /**
  * ieee80211_stop_tx_ba_session - Stop a Block Ack session.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
- * @ra: receiver address of the BA session recipient
+ * @sta: the station whose BA session to stop
  * @tid: the TID to stop BA.
  * @initiator: if indicates initiator DELBA frame will be sent.
  *
@@ -2030,24 +2101,23 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra,
  * 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_hw *hw,
-                                 u8 *ra, 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.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf
  * @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_hw *hw, u8 *ra, u8 tid);
+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.
- * @hw: pointer as obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf
  * @ra: receiver address of the BA session recipient.
  * @tid: the desired TID to BA on.
  *
@@ -2055,22 +2125,75 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid);
  * finished with preparations for the BA session tear down.
  * This version of the function is IRQ-safe.
  */
-void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra,
+void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_vif *vif, const u8 *ra,
                                      u16 tid);
 
 /**
  * ieee80211_find_sta - find a station
  *
- * @hw: pointer as obtained from ieee80211_alloc_hw()
+ * @vif: virtual interface to look for station on
  * @addr: station's address
  *
  * This function must be called under RCU lock and the
  * resulting pointer is only valid under RCU lock as well.
  */
-struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_hw *hw,
+struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_vif *vif,
                                          const u8 *addr);
 
 /**
+ * ieee80211_find_sta_by_hw - find a station on hardware
+ *
+ * @hw: pointer as obtained from ieee80211_alloc_hw()
+ * @addr: station's address
+ *
+ * This function must be called under RCU lock and the
+ * resulting pointer is only valid under RCU lock as well.
+ *
+ * NOTE: This function should not be used! When mac80211 is converted
+ *       internally to properly keep track of stations on multiple
+ *       virtual interfaces, it will not always know which station to
+ *       return here since a single address might be used by multiple
+ *       logical stations (e.g. consider a station connecting to another
+ *       BSSID on the same AP hardware without disconnecting first).
+ *
+ * DO NOT USE THIS FUNCTION.
+ */
+struct ieee80211_sta *ieee80211_find_sta_by_hw(struct ieee80211_hw *hw,
+                                               const u8 *addr);
+
+/**
+ * ieee80211_sta_block_awake - block station from waking up
+ * @hw: the hardware
+ * @pubsta: the station
+ * @block: whether to block or unblock
+ *
+ * Some devices require that all frames that are on the queues
+ * for a specific station that went to sleep are flushed before
+ * a poll response or frames after the station woke up can be
+ * delivered to that it. Note that such frames must be rejected
+ * by the driver as filtered, with the appropriate status flag.
+ *
+ * This function allows implementing this mode in a race-free
+ * manner.
+ *
+ * To do this, a driver must keep track of the number of frames
+ * still enqueued for a specific station. If this number is not
+ * zero when the station goes to sleep, the driver must call
+ * this function to force mac80211 to consider the station to
+ * be asleep regardless of the station's actual state. Once the
+ * number of outstanding frames reaches zero, the driver must
+ * call this function again to unblock the station. That will
+ * cause mac80211 to be able to send ps-poll responses, and if
+ * the station queried in the meantime then frames will also
+ * be sent out as a result of this. Additionally, the driver
+ * will be notified that the station woke up some time after
+ * it is unblocked, regardless of whether the station actually
+ * woke up while blocked or not.
+ */
+void ieee80211_sta_block_awake(struct ieee80211_hw *hw,
+                               struct ieee80211_sta *pubsta, bool block);
+
+/**
  * ieee80211_beacon_loss - inform hardware does not receive beacons
  *
  * @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf.
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 3817fda82a8..0302f31a2fb 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -37,8 +37,7 @@
 
 struct neighbour;
 
-struct neigh_parms
-{
+struct neigh_parms {
 #ifdef CONFIG_NET_NS
         struct net *net;
 #endif
@@ -70,8 +69,7 @@ struct neigh_parms
         int     locktime;
 };
 
-struct neigh_statistics
-{
+struct neigh_statistics {
         unsigned long allocs;           /* number of allocated neighs */
         unsigned long destroys;         /* number of destroyed neighs */
         unsigned long hash_grows;       /* number of hash resizes */
@@ -97,8 +95,7 @@ struct neigh_statistics
                 preempt_enable();                                       \
         } while (0)
 
-struct neighbour
-{
+struct neighbour {
         struct neighbour        *next;
         struct neigh_table      *tbl;
         struct neigh_parms      *parms;
@@ -122,8 +119,7 @@ struct neighbour
         u8                      primary_key[0];
 };
 
-struct neigh_ops
-{
+struct neigh_ops {
         int                     family;
         void                    (*solicit)(struct neighbour *, struct sk_buff*);
         void                    (*error_report)(struct neighbour *, struct sk_buff*);
@@ -133,8 +129,7 @@ struct neigh_ops
         int                     (*queue_xmit)(struct sk_buff*);
 };
 
-struct pneigh_entry
-{
+struct pneigh_entry {
         struct pneigh_entry     *next;
 #ifdef CONFIG_NET_NS
         struct net              *net;
@@ -149,8 +144,7 @@ struct pneigh_entry
  */
 
 
-struct neigh_table
-{
+struct neigh_table {
         struct neigh_table      *next;
         int                     family;
         int                     entry_size;
@@ -264,8 +258,7 @@ extern int			neigh_sysctl_register(struct net_device *dev,
                                                       struct neigh_parms *p,
                                                       int p_id, int pdev_id,
                                                       char *p_name,
-                                                      proc_handler *proc_handler,
-                                                      ctl_handler *strategy);
+                                                      proc_handler *proc_handler);
 extern void                     neigh_sysctl_unregister(struct neigh_parms *p);
 
 static inline void __neigh_parms_put(struct neigh_parms *parms)
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index a1202841aad..f307e133d14 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -28,6 +28,10 @@ struct ctl_table_header;
 struct net_generic;
 struct sock;
 
+
+#define NETDEV_HASHBITS    8
+#define NETDEV_HASHENTRIES (1 << NETDEV_HASHBITS)
+
 struct net {
         atomic_t                count;          /* To decided when the network
                                                  *  namespace should be freed.
@@ -38,7 +42,8 @@ struct net {
                                                  */
 #endif
         struct list_head        list;           /* list of network namespaces */
-        struct work_struct      work;           /* work struct for freeing */
+        struct list_head        cleanup_list;   /* namespaces on death row */
+        struct list_head        exit_list;      /* Use only net_mutex */
 
         struct proc_dir_entry   *proc_net;
         struct proc_dir_entry   *proc_net_stat;
@@ -80,7 +85,7 @@ struct net {
 #ifdef CONFIG_XFRM
         struct netns_xfrm       xfrm;
 #endif
-#ifdef CONFIG_WIRELESS_EXT
+#ifdef CONFIG_WEXT_CORE
         struct sk_buff_head     wext_nlevents;
 #endif
         struct net_generic      *gen;
@@ -232,6 +237,9 @@ struct pernet_operations {
         struct list_head list;
         int (*init)(struct net *net);
         void (*exit)(struct net *net);
+        void (*exit_batch)(struct list_head *net_exit_list);
+        int *id;
+        size_t size;
 };
 
 /*
@@ -255,12 +263,8 @@ struct pernet_operations {
  */
 extern int register_pernet_subsys(struct pernet_operations *);
 extern void unregister_pernet_subsys(struct pernet_operations *);
-extern int register_pernet_gen_subsys(int *id, struct pernet_operations *);
-extern void unregister_pernet_gen_subsys(int id, struct pernet_operations *);
 extern int register_pernet_device(struct pernet_operations *);
 extern void unregister_pernet_device(struct pernet_operations *);
-extern int register_pernet_gen_device(int *id, struct pernet_operations *);
-extern void unregister_pernet_gen_device(int id, struct pernet_operations *);
 
 struct ctl_path;
 struct ctl_table;
diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h
index 4f20d58e2ab..475facc3051 100644
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/include/net/netfilter/nf_conntrack_ecache.h
@@ -13,8 +13,7 @@
 #include <net/netfilter/nf_conntrack_extend.h>
 
 /* Connection tracking event types */
-enum ip_conntrack_events
-{
+enum ip_conntrack_events {
         IPCT_NEW                = 0,    /* new conntrack */
         IPCT_RELATED            = 1,    /* related conntrack */
         IPCT_DESTROY            = 2,    /* destroyed conntrack */
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index a9652806d0d..9a2b9cb5227 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -9,8 +9,7 @@
 extern unsigned int nf_ct_expect_hsize;
 extern unsigned int nf_ct_expect_max;
 
-struct nf_conntrack_expect
-{
+struct nf_conntrack_expect {
         /* Conntrack expectation list member */
         struct hlist_node lnode;
 
@@ -64,8 +63,7 @@ static inline struct net *nf_ct_exp_net(struct nf_conntrack_expect *exp)
 #endif
 }
 
-struct nf_conntrack_expect_policy
-{
+struct nf_conntrack_expect_policy {
         unsigned int    max_expected;
         unsigned int    timeout;
 };
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
index 7f8fc5d123c..e192dc17c58 100644
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
@@ -3,8 +3,7 @@
 
 #include <net/netfilter/nf_conntrack.h>
 
-enum nf_ct_ext_id
-{
+enum nf_ct_ext_id {
         NF_CT_EXT_HELPER,
         NF_CT_EXT_NAT,
         NF_CT_EXT_ACCT,
@@ -65,8 +64,7 @@ __nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp);
 
 #define NF_CT_EXT_F_PREALLOC    0x0001
 
-struct nf_ct_ext_type
-{
+struct nf_ct_ext_type {
         /* Destroys relationships (can be NULL). */
         void (*destroy)(struct nf_conn *ct);
         /* Called when realloacted (can be NULL).
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index 1b706800092..d015de92e03 100644
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -16,8 +16,7 @@ struct module;
 
 #define NF_CT_HELPER_NAME_LEN   16
 
-struct nf_conntrack_helper
-{
+struct nf_conntrack_helper {
         struct hlist_node hnode;        /* Internal use. */
 
         const char *name;               /* name of the module */
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 9f99d36d5de..a7547611e8f 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -16,8 +16,7 @@
 #include <linux/seq_file.h>
 #include <net/netfilter/nf_conntrack.h>
 
-struct nf_conntrack_l3proto
-{
+struct nf_conntrack_l3proto {
         /* L3 Protocol Family number. ex) PF_INET */
         u_int16_t l3proto;
 
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 3767fb41e54..ca6dcf3445a 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -15,8 +15,7 @@
 
 struct seq_file;
 
-struct nf_conntrack_l4proto
-{
+struct nf_conntrack_l4proto {
         /* L3 Protocol number. */
         u_int16_t l3proto;
 
diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h
index 2628c154d40..4ee44c84a30 100644
--- a/include/net/netfilter/nf_conntrack_tuple.h
+++ b/include/net/netfilter/nf_conntrack_tuple.h
@@ -26,8 +26,7 @@
 
 /* The protocol-specific manipulable parts of the tuple: always in
    network order! */
-union nf_conntrack_man_proto
-{
+union nf_conntrack_man_proto {
         /* Add other protocols here. */
         __be16 all;
 
@@ -52,8 +51,7 @@ union nf_conntrack_man_proto
 };
 
 /* The manipulable part of the tuple. */
-struct nf_conntrack_man
-{
+struct nf_conntrack_man {
         union nf_inet_addr u3;
         union nf_conntrack_man_proto u;
         /* Layer 3 protocol */
@@ -61,8 +59,7 @@ struct nf_conntrack_man
 };
 
 /* This contains the information to distinguish a connection. */
-struct nf_conntrack_tuple
-{
+struct nf_conntrack_tuple {
         struct nf_conntrack_man src;
 
         /* These are the parts of the tuple which are fixed. */
@@ -100,8 +97,7 @@ struct nf_conntrack_tuple
         } dst;
 };
 
-struct nf_conntrack_tuple_mask
-{
+struct nf_conntrack_tuple_mask {
         struct {
                 union nf_inet_addr u3;
                 union nf_conntrack_man_proto u;
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
index 8df0b7f7fc6..f5f09f032a9 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -5,8 +5,7 @@
 
 #define NF_NAT_MAPPING_TYPE_MAX_NAMELEN 16
 
-enum nf_nat_manip_type
-{
+enum nf_nat_manip_type {
         IP_NAT_MANIP_SRC,
         IP_NAT_MANIP_DST
 };
@@ -30,8 +29,7 @@ struct nf_nat_seq {
 };
 
 /* Single range specification. */
-struct nf_nat_range
-{
+struct nf_nat_range {
         /* Set to OR of flags above. */
         unsigned int flags;
 
@@ -43,8 +41,7 @@ struct nf_nat_range
 };
 
 /* For backwards compat: don't use in modern code. */
-struct nf_nat_multi_range_compat
-{
+struct nf_nat_multi_range_compat {
         unsigned int rangesize; /* Must be 1. */
 
         /* hangs off end. */
@@ -57,8 +54,7 @@ struct nf_nat_multi_range_compat
 #include <net/netfilter/nf_conntrack_extend.h>
 
 /* per conntrack: nat application helper private data */
-union nf_conntrack_nat_help
-{
+union nf_conntrack_nat_help {
         /* insert nat helper private data here */
         struct nf_nat_pptp nat_pptp_info;
 };
@@ -66,8 +62,7 @@ union nf_conntrack_nat_help
 struct nf_conn;
 
 /* The structure embedded in the conntrack structure. */
-struct nf_conn_nat
-{
+struct nf_conn_nat {
         struct hlist_node bysource;
         struct nf_nat_seq seq[IP_CT_DIR_MAX];
         struct nf_conn *ct;
diff --git a/include/net/netfilter/nf_nat_protocol.h b/include/net/netfilter/nf_nat_protocol.h
index f3662c4394e..c398017ccfa 100644
--- a/include/net/netfilter/nf_nat_protocol.h
+++ b/include/net/netfilter/nf_nat_protocol.h
@@ -6,8 +6,7 @@
 
 struct nf_nat_range;
 
-struct nf_nat_protocol
-{
+struct nf_nat_protocol {
         /* Protocol number. */
         unsigned int protonum;
 
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h
index 0c04fd2a700..ff4982ab84b 100644
--- a/include/net/netns/generic.h
+++ b/include/net/netns/generic.h
@@ -12,9 +12,11 @@
  * stuff on the struct net without explicit struct net modification
  *
  * The rules are simple:
- * 1. register the ops with register_pernet_gen_device to get the id
- *    of your private pointer;
- * 2. call net_assign_generic() to put the private data on the struct
+ * 1. set pernet_operations->id.  After register_pernet_device you
+ *    will have the id of your private pointer.
+ * 2. Either set pernet_operations->size (to have the code allocate and
+ *    free a private structure pointed to from struct net ) or 
+ *    call net_assign_generic() to put the private data on the struct
  *    net (most preferably this should be done in the ->init callback
  *    of the ops registered);
  * 3. do not change this pointer while the net is alive;
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
index 1ba912749ca..56f8e5585df 100644
--- a/include/net/netns/xfrm.h
+++ b/include/net/netns/xfrm.h
@@ -43,6 +43,7 @@ struct netns_xfrm {
         struct work_struct      policy_hash_work;
 
         struct sock             *nlsk;
+        struct sock             *nlsk_stash;
 
         u32                     sysctl_aevent_etime;
         u32                     sysctl_aevent_rseqth;
diff --git a/include/net/phonet/phonet.h b/include/net/phonet/phonet.h
index d43f71b5ec0..7b114079a51 100644
--- a/include/net/phonet/phonet.h
+++ b/include/net/phonet/phonet.h
@@ -46,7 +46,9 @@ static inline struct pn_sock *pn_sk(struct sock *sk)
 
 extern const struct proto_ops phonet_dgram_ops;
 
+void pn_sock_init(void);
 struct sock *pn_find_sock_by_sa(struct net *net, const struct sockaddr_pn *sa);
+void pn_deliver_sock_broadcast(struct net *net, struct sk_buff *skb);
 void phonet_get_local_port_range(int *min, int *max);
 void pn_sock_hash(struct sock *sk);
 void pn_sock_unhash(struct sock *sk);
diff --git a/include/net/phonet/pn_dev.h b/include/net/phonet/pn_dev.h
index 44c923c9e21..d7b989ca3d6 100644
--- a/include/net/phonet/pn_dev.h
+++ b/include/net/phonet/pn_dev.h
@@ -25,7 +25,7 @@
 
 struct phonet_device_list {
         struct list_head list;
-        spinlock_t lock;
+        struct mutex lock;
 };
 
 struct phonet_device_list *phonet_device_list(struct net *net);
@@ -47,6 +47,12 @@ u8 phonet_address_get(struct net_device *dev, u8 addr);
 int phonet_address_lookup(struct net *net, u8 addr);
 void phonet_address_notify(int event, struct net_device *dev, u8 addr);
 
+int phonet_route_add(struct net_device *dev, u8 daddr);
+int phonet_route_del(struct net_device *dev, u8 daddr);
+void rtm_phonet_notify(int event, struct net_device *dev, u8 dst);
+struct net_device *phonet_route_get(struct net *net, u8 daddr);
+struct net_device *phonet_route_output(struct net *net, u8 daddr);
+
 #define PN_NO_ADDR      0xff
 
 extern const struct file_operations pn_sock_seq_fops;
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index d1ca3144464..dd3031aed9d 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -7,8 +7,7 @@
 
 /* Basic packet classifier frontend definitions. */
 
-struct tcf_walker
-{
+struct tcf_walker {
         int     stop;
         int     skip;
         int     count;
@@ -61,8 +60,7 @@ tcf_unbind_filter(struct tcf_proto *tp, struct tcf_result *r)
                 tp->q->ops->cl_ops->unbind_tcf(tp->q, cl);
 }
 
-struct tcf_exts
-{
+struct tcf_exts {
 #ifdef CONFIG_NET_CLS_ACT
         struct tc_action *action;
 #endif
@@ -71,8 +69,7 @@ struct tcf_exts
 /* Map to export classifier specific extension TLV types to the
  * generic extensions API. Unsupported extensions must be set to 0.
  */
-struct tcf_ext_map
-{
+struct tcf_ext_map {
         int action;
         int police;
 };
@@ -143,8 +140,7 @@ extern int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts,
 /**
  * struct tcf_pkt_info - packet information
  */
-struct tcf_pkt_info
-{
+struct tcf_pkt_info {
         unsigned char *         ptr;
         int                     nexthdr;
 };
@@ -162,8 +158,7 @@ struct tcf_ematch_ops;
  * @datalen: length of the ematch specific configuration data
  * @data: ematch specific data
  */
-struct tcf_ematch
-{
+struct tcf_ematch {
         struct tcf_ematch_ops * ops;
         unsigned long           data;
         unsigned int            datalen;
@@ -211,8 +206,7 @@ static inline int tcf_em_early_end(struct tcf_ematch *em, int result)
  * @hdr: ematch tree header supplied by userspace
  * @matches: array of ematches
  */
-struct tcf_ematch_tree
-{
+struct tcf_ematch_tree {
         struct tcf_ematch_tree_hdr hdr;
         struct tcf_ematch *     matches;
         
@@ -230,8 +224,7 @@ struct tcf_ematch_tree
  * @owner: owner, must be set to THIS_MODULE
  * @link: link to previous/next ematch module (internal use)
  */
-struct tcf_ematch_ops
-{
+struct tcf_ematch_ops {
         int                     kind;
         int                     datalen;
         int                     (*change)(struct tcf_proto *, void *,
@@ -302,8 +295,7 @@ static inline int tcf_em_tree_match(struct sk_buff *skb,
 
 #else /* CONFIG_NET_EMATCH */
 
-struct tcf_ematch_tree
-{
+struct tcf_ematch_tree {
 };
 
 #define tcf_em_tree_validate(tp, tb, t) ((void)(t), 0)
@@ -351,9 +343,9 @@ tcf_match_indev(struct sk_buff *skb, char *indev)
         struct net_device *dev;
 
         if (indev[0]) {
-                if  (!skb->iif)
+                if  (!skb->skb_iif)
                         return 0;
-                dev = __dev_get_by_index(dev_net(skb->dev), skb->iif);
+                dev = __dev_get_by_index(dev_net(skb->dev), skb->skb_iif);
                 if (!dev || strcmp(indev, dev->name))
                         return 0;
         }
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index f911ec7598e..2d567265363 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -5,8 +5,7 @@
 #include <linux/ktime.h>
 #include <net/sch_generic.h>
 
-struct qdisc_walker
-{
+struct qdisc_walker {
         int     stop;
         int     skip;
         int     count;
diff --git a/include/net/protocol.h b/include/net/protocol.h
index 60249e51b66..f1effdd3c26 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -47,8 +47,7 @@ struct net_protocol {
 };
 
 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
-struct inet6_protocol 
-{
+struct inet6_protocol {
         int     (*handler)(struct sk_buff *skb);
 
         void    (*err_handler)(struct sk_buff *skb,
@@ -83,10 +82,6 @@ struct inet_protosw {
         struct proto     *prot;
         const struct proto_ops *ops;
   
-        int              capability; /* Which (if any) capability do
-                                      * we need to use this socket
-                                      * interface?
-                                      */
         char             no_check;   /* checksum on rcv/xmit/none? */
         unsigned char    flags;      /* See INET_PROTOSW_* below.  */
 };
diff --git a/include/net/red.h b/include/net/red.h
index 3cf31d466a8..995108e54d9 100644
--- a/include/net/red.h
+++ b/include/net/red.h
@@ -90,8 +90,7 @@
 #define RED_STAB_SIZE   256
 #define RED_STAB_MASK   (RED_STAB_SIZE - 1)
 
-struct red_stats
-{
+struct red_stats {
         u32             prob_drop;      /* Early probability drops */
         u32             prob_mark;      /* Early probability marks */
         u32             forced_drop;    /* Forced drops, qavg > max_thresh */
@@ -101,8 +100,7 @@ struct red_stats
         u32             backlog;
 };
 
-struct red_parms
-{
+struct red_parms {
         /* Parameters */
         u32             qth_min;        /* Min avg length threshold: A scaled */
         u32             qth_max;        /* Max avg length threshold: A scaled */
diff --git a/include/net/request_sock.h b/include/net/request_sock.h
index c7190846e12..c9b50ebd9ce 100644
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
@@ -27,13 +27,19 @@ struct sk_buff;
 struct dst_entry;
 struct proto;
 
+/* empty to "strongly type" an otherwise void parameter.
+ */
+struct request_values {
+};
+
 struct request_sock_ops {
         int             family;
         int             obj_size;
         struct kmem_cache       *slab;
         char            *slab_name;
         int             (*rtx_syn_ack)(struct sock *sk,
-                                       struct request_sock *req);
+                                       struct request_sock *req,
+                                       struct request_values *rvp);
         void            (*send_ack)(struct sock *sk, struct sk_buff *skb,
                                     struct request_sock *req);
         void            (*send_reset)(struct sock *sk,
diff --git a/include/net/route.h b/include/net/route.h
index 40f6346ef49..bce6dd68d27 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -49,10 +49,8 @@
 
 struct fib_nh;
 struct inet_peer;
-struct rtable
-{
-        union
-        {
+struct rtable {
+        union {
                 struct dst_entry        dst;
         } u;
 
@@ -77,16 +75,14 @@ struct rtable
         struct inet_peer        *peer; /* long-living peer info */
 };
 
-struct ip_rt_acct
-{
+struct ip_rt_acct {
         __u32   o_bytes;
         __u32   o_packets;
         __u32   i_bytes;
         __u32   i_packets;
 };
 
-struct rt_cache_stat 
-{
+struct rt_cache_stat {
         unsigned int in_hit;
         unsigned int in_slow_tot;
         unsigned int in_slow_mc;
@@ -112,6 +108,7 @@ extern int		ip_rt_init(void);
 extern void             ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw,
                                        __be32 src, struct net_device *dev);
 extern void             rt_cache_flush(struct net *net, int how);
+extern void             rt_cache_flush_batch(void);
 extern int              __ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp);
 extern int              ip_route_output_key(struct net *, struct rtable **, struct flowi *flp);
 extern int              ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, int flags);
diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index c3aa044d3fc..48d3efcb088 100644
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -55,13 +55,15 @@ struct rtnl_link_ops {
         int                     (*validate)(struct nlattr *tb[],
                                             struct nlattr *data[]);
 
-        int                     (*newlink)(struct net_device *dev,
+        int                     (*newlink)(struct net *src_net,
+                                           struct net_device *dev,
                                            struct nlattr *tb[],
                                            struct nlattr *data[]);
         int                     (*changelink)(struct net_device *dev,
                                               struct nlattr *tb[],
                                               struct nlattr *data[]);
-        void                    (*dellink)(struct net_device *dev);
+        void                    (*dellink)(struct net_device *dev,
+                                           struct list_head *head);
 
         size_t                  (*get_size)(const struct net_device *dev);
         int                     (*fill_info)(struct sk_buff *skb,
@@ -82,8 +84,9 @@ extern void	rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops);
 extern int      rtnl_link_register(struct rtnl_link_ops *ops);
 extern void     rtnl_link_unregister(struct rtnl_link_ops *ops);
 
-extern struct net_device *rtnl_create_link(struct net *net, char *ifname,
-                const struct rtnl_link_ops *ops, struct nlattr *tb[]);
+extern struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]);
+extern struct net_device *rtnl_create_link(struct net *src_net, struct net *net,
+        char *ifname, const struct rtnl_link_ops *ops, struct nlattr *tb[]);
 extern const struct nla_policy ifla_policy[IFLA_MAX+1];
 
 #define MODULE_ALIAS_RTNL_LINK(kind) MODULE_ALIAS("rtnl-link-" kind)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index c33180dd42b..dad558bc06f 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -15,16 +15,14 @@ struct qdisc_walker;
 struct tcf_walker;
 struct module;
 
-struct qdisc_rate_table
-{
+struct qdisc_rate_table {
         struct tc_ratespec rate;
         u32             data[256];
         struct qdisc_rate_table *next;
         int             refcnt;
 };
 
-enum qdisc_state_t
-{
+enum qdisc_state_t {
         __QDISC_STATE_RUNNING,
         __QDISC_STATE_SCHED,
         __QDISC_STATE_DEACTIVATED,
@@ -37,8 +35,7 @@ struct qdisc_size_table {
         u16                     data[];
 };
 
-struct Qdisc
-{
+struct Qdisc {
         int                     (*enqueue)(struct sk_buff *skb, struct Qdisc *dev);
         struct sk_buff *        (*dequeue)(struct Qdisc *dev);
         unsigned                flags;
@@ -78,8 +75,7 @@ struct Qdisc
         struct gnet_stats_queue qstats;
 };
 
-struct Qdisc_class_ops
-{
+struct Qdisc_class_ops {
         /* Child qdisc manipulation */
         struct netdev_queue *   (*select_queue)(struct Qdisc *, struct tcmsg *);
         int                     (*graft)(struct Qdisc *, unsigned long cl,
@@ -108,8 +104,7 @@ struct Qdisc_class_ops
                                         struct gnet_dump *);
 };
 
-struct Qdisc_ops
-{
+struct Qdisc_ops {
         struct Qdisc_ops        *next;
         const struct Qdisc_class_ops    *cl_ops;
         char                    id[IFNAMSIZ];
@@ -133,14 +128,12 @@ struct Qdisc_ops
 };
 
 
-struct tcf_result
-{
+struct tcf_result {
         unsigned long   class;
         u32             classid;
 };
 
-struct tcf_proto_ops
-{
+struct tcf_proto_ops {
         struct tcf_proto_ops    *next;
         char                    kind[IFNAMSIZ];
 
@@ -164,8 +157,7 @@ struct tcf_proto_ops
         struct module           *owner;
 };
 
-struct tcf_proto
-{
+struct tcf_proto {
         /* Fast access part */
         struct tcf_proto        *next;
         void                    *root;
@@ -261,14 +253,12 @@ extern struct Qdisc_ops noop_qdisc_ops;
 extern struct Qdisc_ops pfifo_fast_ops;
 extern struct Qdisc_ops mq_qdisc_ops;
 
-struct Qdisc_class_common
-{
+struct Qdisc_class_common {
         u32                     classid;
         struct hlist_node       hnode;
 };
 
-struct Qdisc_class_hash
-{
+struct Qdisc_class_hash {
         struct hlist_head       *hash;
         unsigned int            hashsize;
         unsigned int            hashmask;
diff --git a/include/net/scm.h b/include/net/scm.h
index cf48c800e92..8360e47aa7e 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -12,15 +12,13 @@
  */
 #define SCM_MAX_FD      255
 
-struct scm_fp_list
-{
+struct scm_fp_list {
         struct list_head        list;
         int                     count;
         struct file             *fp[SCM_MAX_FD];
 };
 
-struct scm_cookie
-{
+struct scm_cookie {
         struct ucred            creds;          /* Skb credentials      */
         struct scm_fp_list      *fp;            /* Passed files         */
 #ifdef CONFIG_SECURITY_NETWORK
@@ -88,8 +86,7 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct sc
 static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg,
                                 struct scm_cookie *scm, int flags)
 {
-        if (!msg->msg_control)
-        {
+        if (!msg->msg_control) {
                 if (test_bit(SOCK_PASSCRED, &sock->flags) || scm->fp)
                         msg->msg_flags |= MSG_CTRUNC;
                 scm_destroy(scm);
diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
index 58f714a3b67..63908840eef 100644
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -308,6 +308,10 @@ enum { SCTP_MAX_GABS = 16 };
 
 #define SCTP_DEFAULT_MINWINDOW  1500    /* default minimum rwnd size */
 #define SCTP_DEFAULT_MAXWINDOW  65535   /* default rwnd size */
+#define SCTP_DEFAULT_RWND_SHIFT  4      /* by default, update on 1/16 of
+                                         * rcvbuf, which is 1/8 of initial
+                                         * window
+                                         */
 #define SCTP_DEFAULT_MAXSEGMENT 1500    /* MTU size, this is the limit
                                          * to which we will raise the P-MTU.
                                          */
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 8a6d5297de1..78740ec57d5 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -227,8 +227,7 @@ DECLARE_SNMP_STAT(struct sctp_mib, sctp_statistics);
 #endif /* !TEST_FRAME */
 
 /* sctp mib definitions */
-enum
-{
+enum {
         SCTP_MIB_NUM = 0,
         SCTP_MIB_CURRESTAB,                     /* CurrEstab */
         SCTP_MIB_ACTIVEESTABS,                  /* ActiveEstabs */
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index c1dd8936583..851c813adb3 100644
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -243,7 +243,8 @@ struct sctp_chunk *sctp_make_op_error(const struct sctp_association *,
                                  const struct sctp_chunk *chunk,
                                  __be16 cause_code,
                                  const void *payload,
-                                 size_t paylen);
+                                 size_t paylen,
+                                 size_t reserve_tail);
 
 struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *,
                                               union sctp_addr *,
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 6e5f0e0c796..ff301774471 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -231,6 +231,11 @@ extern struct sctp_globals {
         /* Flag to indicate whether computing and verifying checksum
          * is disabled. */
         int checksum_disable;
+
+        /* Threshold for rwnd update SACKS.  Receive buffer shifted this many
+         * bits is an indicator of when to send and window update SACK.
+         */
+        int rwnd_update_shift;
 } sctp_globals;
 
 #define sctp_rto_initial                (sctp_globals.rto_initial)
@@ -267,6 +272,7 @@ extern struct sctp_globals {
 #define sctp_prsctp_enable              (sctp_globals.prsctp_enable)
 #define sctp_auth_enable                (sctp_globals.auth_enable)
 #define sctp_checksum_disable           (sctp_globals.checksum_disable)
+#define sctp_rwnd_upd_shift             (sctp_globals.rwnd_update_shift)
 
 /* SCTP Socket type: UDP or TCP style. */
 typedef enum {
@@ -893,7 +899,6 @@ struct sctp_transport {
          */
         /* RTO         : The current retransmission timeout value.  */
         unsigned long rto;
-        unsigned long last_rto;
 
         __u32 rtt;              /* This is the most recent RTT.  */
 
@@ -936,6 +941,8 @@ struct sctp_transport {
         /* Data that has been sent, but not acknowledged. */
         __u32 flight_size;
 
+        __u32 burst_limited;    /* Holds old cwnd when max.burst is applied */
+
         /* TSN marking the fast recovery exit point */
         __u32 fast_recovery_exit;
 
@@ -944,12 +951,6 @@ struct sctp_transport {
         /* Source address. */
         union sctp_addr saddr;
 
-        /* When was the last time(in jiffies) that a data packet was sent on
-         * this transport?  This is used to adjust the cwnd when the transport
-         * becomes inactive.
-         */
-        unsigned long last_time_used;
-
         /* Heartbeat interval: The endpoint sends out a Heartbeat chunk to
          * the destination address every heartbeat interval.
          */
@@ -988,7 +989,7 @@ struct sctp_transport {
         int init_sent_count;
 
         /* state       : The current state of this destination,
-         *             : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKOWN.
+         *             : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKNOWN.
          */
         int state;
 
@@ -1070,6 +1071,8 @@ void sctp_transport_put(struct sctp_transport *);
 void sctp_transport_update_rto(struct sctp_transport *, __u32);
 void sctp_transport_raise_cwnd(struct sctp_transport *, __u32, __u32);
 void sctp_transport_lower_cwnd(struct sctp_transport *, sctp_lower_cwnd_t);
+void sctp_transport_burst_limited(struct sctp_transport *);
+void sctp_transport_burst_reset(struct sctp_transport *);
 unsigned long sctp_transport_timeout(struct sctp_transport *);
 void sctp_transport_reset(struct sctp_transport *);
 void sctp_transport_update_pmtu(struct sctp_transport *, u32);
@@ -1980,7 +1983,7 @@ void sctp_assoc_set_primary(struct sctp_association *,
 void sctp_assoc_del_nonprimary_peers(struct sctp_association *,
                                     struct sctp_transport *);
 int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *,
-                                     gfp_t);
+                                     sctp_scope_t, gfp_t);
 int sctp_assoc_set_bind_addr_from_cookie(struct sctp_association *,
                                          struct sctp_cookie*,
                                          gfp_t gfp);
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index be2334aaf52..2b2769c5ca9 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -60,96 +60,49 @@ typedef __s32 sctp_assoc_t;
 /* The following symbols come from the Sockets API Extensions for
  * SCTP <draft-ietf-tsvwg-sctpsocket-07.txt>.
  */
-enum sctp_optname {
-        SCTP_RTOINFO,
-#define SCTP_RTOINFO SCTP_RTOINFO
-        SCTP_ASSOCINFO,
-#define SCTP_ASSOCINFO SCTP_ASSOCINFO
-        SCTP_INITMSG,
-#define SCTP_INITMSG SCTP_INITMSG
-        SCTP_NODELAY,   /* Get/set nodelay option. */
-#define SCTP_NODELAY    SCTP_NODELAY
-        SCTP_AUTOCLOSE,
-#define SCTP_AUTOCLOSE SCTP_AUTOCLOSE
-        SCTP_SET_PEER_PRIMARY_ADDR, 
-#define SCTP_SET_PEER_PRIMARY_ADDR SCTP_SET_PEER_PRIMARY_ADDR
-        SCTP_PRIMARY_ADDR,
-#define SCTP_PRIMARY_ADDR SCTP_PRIMARY_ADDR
-        SCTP_ADAPTATION_LAYER,
-#define SCTP_ADAPTATION_LAYER SCTP_ADAPTATION_LAYER
-        SCTP_DISABLE_FRAGMENTS,
-#define SCTP_DISABLE_FRAGMENTS SCTP_DISABLE_FRAGMENTS
-        SCTP_PEER_ADDR_PARAMS,
-#define SCTP_PEER_ADDR_PARAMS SCTP_PEER_ADDR_PARAMS
-        SCTP_DEFAULT_SEND_PARAM,
-#define SCTP_DEFAULT_SEND_PARAM SCTP_DEFAULT_SEND_PARAM
-        SCTP_EVENTS,
-#define SCTP_EVENTS SCTP_EVENTS
-        SCTP_I_WANT_MAPPED_V4_ADDR,  /* Turn on/off mapped v4 addresses  */
-#define SCTP_I_WANT_MAPPED_V4_ADDR SCTP_I_WANT_MAPPED_V4_ADDR
-        SCTP_MAXSEG,    /* Get/set maximum fragment. */
-#define SCTP_MAXSEG     SCTP_MAXSEG
-        SCTP_STATUS,
-#define SCTP_STATUS SCTP_STATUS
-        SCTP_GET_PEER_ADDR_INFO,
-#define SCTP_GET_PEER_ADDR_INFO SCTP_GET_PEER_ADDR_INFO
-        SCTP_DELAYED_ACK,
-#define SCTP_DELAYED_ACK_TIME SCTP_DELAYED_ACK
-#define SCTP_DELAYED_ACK SCTP_DELAYED_ACK
-        SCTP_CONTEXT,   /* Receive Context */
-#define SCTP_CONTEXT SCTP_CONTEXT
-        SCTP_FRAGMENT_INTERLEAVE,
-#define SCTP_FRAGMENT_INTERLEAVE SCTP_FRAGMENT_INTERLEAVE
-        SCTP_PARTIAL_DELIVERY_POINT,    /* Set/Get partial delivery point */
-#define SCTP_PARTIAL_DELIVERY_POINT SCTP_PARTIAL_DELIVERY_POINT
-        SCTP_MAX_BURST,         /* Set/Get max burst */
-#define SCTP_MAX_BURST SCTP_MAX_BURST
-        SCTP_AUTH_CHUNK,        /* Set only: add a chunk type to authenticat */
-#define SCTP_AUTH_CHUNK SCTP_AUTH_CHUNK
-        SCTP_HMAC_IDENT,
-#define SCTP_HMAC_IDENT SCTP_HMAC_IDENT
-        SCTP_AUTH_KEY,
-#define SCTP_AUTH_KEY SCTP_AUTH_KEY
-        SCTP_AUTH_ACTIVE_KEY,
-#define SCTP_AUTH_ACTIVE_KEY SCTP_AUTH_ACTIVE_KEY
-        SCTP_AUTH_DELETE_KEY,
-#define SCTP_AUTH_DELETE_KEY SCTP_AUTH_DELETE_KEY
-        SCTP_PEER_AUTH_CHUNKS,          /* Read only */
-#define SCTP_PEER_AUTH_CHUNKS SCTP_PEER_AUTH_CHUNKS
-        SCTP_LOCAL_AUTH_CHUNKS,         /* Read only */
-#define SCTP_LOCAL_AUTH_CHUNKS SCTP_LOCAL_AUTH_CHUNKS
-        SCTP_GET_ASSOC_NUMBER,          /* Read only */
-#define SCTP_GET_ASSOC_NUMBER SCTP_GET_ASSOC_NUMBER
-
-
-        /* Internal Socket Options. Some of the sctp library functions are 
-         * implemented using these socket options.
-         */
-        SCTP_SOCKOPT_BINDX_ADD = 100,/* BINDX requests for adding addresses. */
-#define SCTP_SOCKOPT_BINDX_ADD  SCTP_SOCKOPT_BINDX_ADD
-        SCTP_SOCKOPT_BINDX_REM, /* BINDX requests for removing addresses. */
-#define SCTP_SOCKOPT_BINDX_REM  SCTP_SOCKOPT_BINDX_REM
-        SCTP_SOCKOPT_PEELOFF,   /* peel off association. */
-#define SCTP_SOCKOPT_PEELOFF    SCTP_SOCKOPT_PEELOFF
-        SCTP_GET_PEER_ADDRS_NUM_OLD,    /* Get number of peer addresss. */
-#define SCTP_GET_PEER_ADDRS_NUM_OLD     SCTP_GET_PEER_ADDRS_NUM_OLD
-        SCTP_GET_PEER_ADDRS_OLD,        /* Get all peer addresss. */
-#define SCTP_GET_PEER_ADDRS_OLD SCTP_GET_PEER_ADDRS_OLD
-        SCTP_GET_LOCAL_ADDRS_NUM_OLD,   /* Get number of local addresss. */
-#define SCTP_GET_LOCAL_ADDRS_NUM_OLD    SCTP_GET_LOCAL_ADDRS_NUM_OLD
-        SCTP_GET_LOCAL_ADDRS_OLD,       /* Get all local addresss. */
-#define SCTP_GET_LOCAL_ADDRS_OLD        SCTP_GET_LOCAL_ADDRS_OLD
-        SCTP_SOCKOPT_CONNECTX_OLD, /* CONNECTX old requests. */
-#define SCTP_SOCKOPT_CONNECTX_OLD       SCTP_SOCKOPT_CONNECTX_OLD
-        SCTP_GET_PEER_ADDRS,    /* Get all peer addresss. */
-#define SCTP_GET_PEER_ADDRS     SCTP_GET_PEER_ADDRS
-        SCTP_GET_LOCAL_ADDRS,   /* Get all local addresss. */
-#define SCTP_GET_LOCAL_ADDRS    SCTP_GET_LOCAL_ADDRS
-        SCTP_SOCKOPT_CONNECTX, /* CONNECTX requests. */
-#define SCTP_SOCKOPT_CONNECTX   SCTP_SOCKOPT_CONNECTX
-        SCTP_SOCKOPT_CONNECTX3, /* CONNECTX requests. (new implementation) */
-#define SCTP_SOCKOPT_CONNECTX3  SCTP_SOCKOPT_CONNECTX3
-};
+#define SCTP_RTOINFO    0
+#define SCTP_ASSOCINFO  1
+#define SCTP_INITMSG    2
+#define SCTP_NODELAY    3               /* Get/set nodelay option. */
+#define SCTP_AUTOCLOSE  4
+#define SCTP_SET_PEER_PRIMARY_ADDR 5
+#define SCTP_PRIMARY_ADDR       6
+#define SCTP_ADAPTATION_LAYER   7
+#define SCTP_DISABLE_FRAGMENTS  8
+#define SCTP_PEER_ADDR_PARAMS   9
+#define SCTP_DEFAULT_SEND_PARAM 10
+#define SCTP_EVENTS     11
+#define SCTP_I_WANT_MAPPED_V4_ADDR 12   /* Turn on/off mapped v4 addresses  */
+#define SCTP_MAXSEG     13              /* Get/set maximum fragment. */
+#define SCTP_STATUS     14
+#define SCTP_GET_PEER_ADDR_INFO 15
+#define SCTP_DELAYED_ACK_TIME   16
+#define SCTP_DELAYED_ACK SCTP_DELAYED_ACK_TIME
+#define SCTP_CONTEXT    17
+#define SCTP_FRAGMENT_INTERLEAVE        18
+#define SCTP_PARTIAL_DELIVERY_POINT     19 /* Set/Get partial delivery point */
+#define SCTP_MAX_BURST  20              /* Set/Get max burst */
+#define SCTP_AUTH_CHUNK 21      /* Set only: add a chunk type to authenticate */
+#define SCTP_HMAC_IDENT 22
+#define SCTP_AUTH_KEY   23
+#define SCTP_AUTH_ACTIVE_KEY    24
+#define SCTP_AUTH_DELETE_KEY    25
+#define SCTP_PEER_AUTH_CHUNKS   26      /* Read only */
+#define SCTP_LOCAL_AUTH_CHUNKS  27      /* Read only */
+#define SCTP_GET_ASSOC_NUMBER   28      /* Read only */
+
+/* Internal Socket Options. Some of the sctp library functions are
+ * implemented using these socket options.
+ */
+#define SCTP_SOCKOPT_BINDX_ADD  100     /* BINDX requests for adding addrs */
+#define SCTP_SOCKOPT_BINDX_REM  101     /* BINDX requests for removing addrs. */
+#define SCTP_SOCKOPT_PEELOFF    102     /* peel off association. */
+/* Options 104-106 are deprecated and removed. Do not use this space */
+#define SCTP_SOCKOPT_CONNECTX_OLD       107     /* CONNECTX old requests. */
+#define SCTP_GET_PEER_ADDRS     108             /* Get all peer addresss. */
+#define SCTP_GET_LOCAL_ADDRS    109             /* Get all local addresss. */
+#define SCTP_SOCKOPT_CONNECTX   110             /* CONNECTX requests. */
+#define SCTP_SOCKOPT_CONNECTX3  111     /* CONNECTX requests (updated) */
 
 /*
  * 5.2.1 SCTP Initiation Structure (SCTP_INIT)
@@ -206,6 +159,7 @@ enum sctp_sinfo_flags {
         SCTP_UNORDERED = 1,  /* Send/receive message unordered. */
         SCTP_ADDR_OVER = 2,  /* Override the primary destination. */
         SCTP_ABORT=4,        /* Send an ABORT message to the peer. */
+        SCTP_SACK_IMMEDIATELY = 8,      /* SACK should be sent without delay */
         SCTP_EOF=MSG_FIN,    /* Initiate graceful shutdown process. */  
 };
 
diff --git a/include/net/sock.h b/include/net/sock.h
index 9f96394f694..3f1a4804bb3 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -105,14 +105,17 @@ struct net;
 /**
  *      struct sock_common - minimal network layer representation of sockets
  *      @skc_node: main hash linkage for various protocol lookup tables
- *      @skc_nulls_node: main hash linkage for UDP/UDP-Lite protocol
+ *      @skc_nulls_node: main hash linkage for TCP/UDP/UDP-Lite protocol
  *      @skc_refcnt: reference count
+ *      @skc_tx_queue_mapping: tx queue number for this connection
  *      @skc_hash: hash value used with various protocol lookup tables
+ *      @skc_u16hashes: two u16 hash values used by UDP lookup tables
  *      @skc_family: network address family
  *      @skc_state: Connection state
  *      @skc_reuse: %SO_REUSEADDR setting
  *      @skc_bound_dev_if: bound device index if != 0
  *      @skc_bind_node: bind hash linkage for various protocol lookup tables
+ *      @skc_portaddr_node: second hash linkage for UDP/UDP-Lite protocol
  *      @skc_prot: protocol handlers inside a network family
  *      @skc_net: reference to the network namespace of this socket
  *
@@ -128,13 +131,20 @@ struct sock_common {
                 struct hlist_nulls_node skc_nulls_node;
         };
         atomic_t                skc_refcnt;
+        int                     skc_tx_queue_mapping;
 
-        unsigned int            skc_hash;
+        union  {
+                unsigned int    skc_hash;
+                __u16           skc_u16hashes[2];
+        };
         unsigned short          skc_family;
         volatile unsigned char  skc_state;
         unsigned char           skc_reuse;
         int                     skc_bound_dev_if;
-        struct hlist_node       skc_bind_node;
+        union {
+                struct hlist_node       skc_bind_node;
+                struct hlist_nulls_node skc_portaddr_node;
+        };
         struct proto            *skc_prot;
 #ifdef CONFIG_NET_NS
         struct net              *skc_net;
@@ -215,6 +225,7 @@ struct sock {
 #define sk_node                 __sk_common.skc_node
 #define sk_nulls_node           __sk_common.skc_nulls_node
 #define sk_refcnt               __sk_common.skc_refcnt
+#define sk_tx_queue_mapping     __sk_common.skc_tx_queue_mapping
 
 #define sk_copy_start           __sk_common.skc_hash
 #define sk_hash                 __sk_common.skc_hash
@@ -504,6 +515,8 @@ enum sock_flags {
         SOCK_TIMESTAMPING_SOFTWARE,     /* %SOF_TIMESTAMPING_SOFTWARE */
         SOCK_TIMESTAMPING_RAW_HARDWARE, /* %SOF_TIMESTAMPING_RAW_HARDWARE */
         SOCK_TIMESTAMPING_SYS_HARDWARE, /* %SOF_TIMESTAMPING_SYS_HARDWARE */
+        SOCK_FASYNC, /* fasync() active */
+        SOCK_RXQ_OVFL,
 };
 
 static inline void sock_copy_flags(struct sock *nsk, struct sock *osk)
@@ -1092,8 +1105,29 @@ static inline void sock_put(struct sock *sk)
 extern int sk_receive_skb(struct sock *sk, struct sk_buff *skb,
                           const int nested);
 
+static inline void sk_tx_queue_set(struct sock *sk, int tx_queue)
+{
+        sk->sk_tx_queue_mapping = tx_queue;
+}
+
+static inline void sk_tx_queue_clear(struct sock *sk)
+{
+        sk->sk_tx_queue_mapping = -1;
+}
+
+static inline int sk_tx_queue_get(const struct sock *sk)
+{
+        return sk->sk_tx_queue_mapping;
+}
+
+static inline bool sk_tx_queue_recorded(const struct sock *sk)
+{
+        return (sk && sk->sk_tx_queue_mapping >= 0);
+}
+
 static inline void sk_set_socket(struct sock *sk, struct socket *sock)
 {
+        sk_tx_queue_clear(sk);
         sk->sk_socket = sock;
 }
 
@@ -1150,6 +1184,7 @@ __sk_dst_set(struct sock *sk, struct dst_entry *dst)
 {
         struct dst_entry *old_dst;
 
+        sk_tx_queue_clear(sk);
         old_dst = sk->sk_dst_cache;
         sk->sk_dst_cache = dst;
         dst_release(old_dst);
@@ -1168,6 +1203,7 @@ __sk_dst_reset(struct sock *sk)
 {
         struct dst_entry *old_dst;
 
+        sk_tx_queue_clear(sk);
         old_dst = sk->sk_dst_cache;
         sk->sk_dst_cache = NULL;
         dst_release(old_dst);
@@ -1396,7 +1432,7 @@ static inline unsigned long sock_wspace(struct sock *sk)
 
 static inline void sk_wake_async(struct sock *sk, int how, int band)
 {
-        if (sk->sk_socket && sk->sk_socket->fasync_list)
+        if (sock_flag(sk, SOCK_FASYNC))
                 sock_wake_async(sk->sk_socket, how, band);
 }
 
@@ -1492,6 +1528,8 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
                 sk->sk_stamp = kt;
 }
 
+extern void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk, struct sk_buff *skb);
+
 /**
  * sock_tx_timestamp - checks whether the outgoing packet is to be time stamped
  * @msg:        outgoing packet
diff --git a/include/net/tc_act/tc_skbedit.h b/include/net/tc_act/tc_skbedit.h
index 6abb3ed3ebf..e103fe02f37 100644
--- a/include/net/tc_act/tc_skbedit.h
+++ b/include/net/tc_act/tc_skbedit.h
@@ -26,7 +26,9 @@ struct tcf_skbedit {
         struct tcf_common       common;
         u32                     flags;
         u32                     priority;
+        u32                     mark;
         u16                     queue_mapping;
+        /* XXX: 16-bit pad here? */
 };
 #define to_skbedit(pc) \
         container_of(pc, struct tcf_skbedit, common)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 03a49c70337..5740b85bc5a 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -30,6 +30,7 @@
 #include <linux/dmaengine.h>
 #include <linux/crypto.h>
 #include <linux/cryptohash.h>
+#include <linux/kref.h>
 
 #include <net/inet_connection_sock.h>
 #include <net/inet_timewait_sock.h>
@@ -62,9 +63,6 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 /* Minimal accepted MSS. It is (60+60+8) - (20+20). */
 #define TCP_MIN_MSS             88U
 
-/* Minimal RCV_MSS. */
-#define TCP_MIN_RCVMSS          536U
-
 /* The least MTU to use for probing */
 #define TCP_BASE_MSS            512
 
@@ -167,6 +165,7 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define TCPOPT_SACK             5       /* SACK Block */
 #define TCPOPT_TIMESTAMP        8       /* Better RTT estimations/PAWS */
 #define TCPOPT_MD5SIG           19      /* MD5 Signature (RFC2385) */
+#define TCPOPT_COOKIE           253     /* Cookie extension (experimental) */
 
 /*
  *     TCP option lengths
@@ -177,6 +176,10 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define TCPOLEN_SACK_PERM      2
 #define TCPOLEN_TIMESTAMP      10
 #define TCPOLEN_MD5SIG         18
+#define TCPOLEN_COOKIE_BASE    2        /* Cookie-less header extension */
+#define TCPOLEN_COOKIE_PAIR    3        /* Cookie pair header extension */
+#define TCPOLEN_COOKIE_MIN     (TCPOLEN_COOKIE_BASE+TCP_COOKIE_MIN)
+#define TCPOLEN_COOKIE_MAX     (TCPOLEN_COOKIE_BASE+TCP_COOKIE_MAX)
 
 /* But this is what stacks really send out. */
 #define TCPOLEN_TSTAMP_ALIGNED          12
@@ -237,6 +240,7 @@ extern int sysctl_tcp_base_mss;
 extern int sysctl_tcp_workaround_signed_windows;
 extern int sysctl_tcp_slow_start_after_idle;
 extern int sysctl_tcp_max_ssthresh;
+extern int sysctl_tcp_cookie_size;
 
 extern atomic_t tcp_memory_allocated;
 extern struct percpu_counter tcp_sockets_allocated;
@@ -343,11 +347,6 @@ static inline void tcp_dec_quickack_mode(struct sock *sk,
 
 extern void tcp_enter_quickack_mode(struct sock *sk);
 
-static inline void tcp_clear_options(struct tcp_options_received *rx_opt)
-{
-        rx_opt->tstamp_ok = rx_opt->sack_ok = rx_opt->wscale_ok = rx_opt->snd_wscale = 0;
-}
-
 #define TCP_ECN_OK              1
 #define TCP_ECN_QUEUE_CWR       2
 #define TCP_ECN_DEMAND_CWR      4
@@ -359,8 +358,7 @@ TCP_ECN_create_request(struct request_sock *req, struct tcphdr *th)
                 inet_rsk(req)->ecn_ok = 1;
 }
 
-enum tcp_tw_status
-{
+enum tcp_tw_status {
         TCP_TW_SUCCESS = 0,
         TCP_TW_RST = 1,
         TCP_TW_ACK = 2,
@@ -409,7 +407,9 @@ extern int			tcp_recvmsg(struct kiocb *iocb, struct sock *sk,
 
 extern void                     tcp_parse_options(struct sk_buff *skb,
                                                   struct tcp_options_received *opt_rx,
-                                                  int estab);
+                                                  u8 **hvpp,
+                                                  int estab,
+                                                  struct dst_entry *dst);
 
 extern u8                       *tcp_parse_md5sig_option(struct tcphdr *th);
 
@@ -443,7 +443,8 @@ extern int			tcp_connect(struct sock *sk);
 
 extern struct sk_buff *         tcp_make_synack(struct sock *sk,
                                                 struct dst_entry *dst,
-                                                struct request_sock *req);
+                                                struct request_sock *req,
+                                                struct request_values *rvp);
 
 extern int                      tcp_disconnect(struct sock *sk, int flags);
 
@@ -1228,6 +1229,7 @@ static inline void tcp_write_queue_purge(struct sock *sk)
         while ((skb = __skb_dequeue(&sk->sk_write_queue)) != NULL)
                 sk_wmem_free_skb(sk, skb);
         sk_mem_reclaim(sk);
+        tcp_clear_all_retrans_hints(tcp_sk(sk));
 }
 
 static inline struct sk_buff *tcp_write_queue_head(struct sock *sk)
@@ -1260,7 +1262,7 @@ static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_bu
         skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp)
 
 /* This function calculates a "timeout" which is equivalent to the timeout of a
- * TCP connection after "boundary" unsucessful, exponentially backed-off
+ * TCP connection after "boundary" unsuccessful, exponentially backed-off
  * retransmissions with an initial RTO of TCP_RTO_MIN.
  */
 static inline bool retransmits_timed_out(const struct sock *sk,
@@ -1480,6 +1482,91 @@ struct tcp_request_sock_ops {
 #endif
 };
 
+/* Using SHA1 for now, define some constants.
+ */
+#define COOKIE_DIGEST_WORDS (SHA_DIGEST_WORDS)
+#define COOKIE_MESSAGE_WORDS (SHA_MESSAGE_BYTES / 4)
+#define COOKIE_WORKSPACE_WORDS (COOKIE_DIGEST_WORDS + COOKIE_MESSAGE_WORDS)
+
+extern int tcp_cookie_generator(u32 *bakery);
+
+/**
+ *      struct tcp_cookie_values - each socket needs extra space for the
+ *      cookies, together with (optional) space for any SYN data.
+ *
+ *      A tcp_sock contains a pointer to the current value, and this is
+ *      cloned to the tcp_timewait_sock.
+ *
+ * @cookie_pair:        variable data from the option exchange.
+ *
+ * @cookie_desired:     user specified tcpct_cookie_desired.  Zero
+ *                      indicates default (sysctl_tcp_cookie_size).
+ *                      After cookie sent, remembers size of cookie.
+ *                      Range 0, TCP_COOKIE_MIN to TCP_COOKIE_MAX.
+ *
+ * @s_data_desired:     user specified tcpct_s_data_desired.  When the
+ *                      constant payload is specified (@s_data_constant),
+ *                      holds its length instead.
+ *                      Range 0 to TCP_MSS_DESIRED.
+ *
+ * @s_data_payload:     constant data that is to be included in the
+ *                      payload of SYN or SYNACK segments when the
+ *                      cookie option is present.
+ */
+struct tcp_cookie_values {
+        struct kref     kref;
+        u8              cookie_pair[TCP_COOKIE_PAIR_SIZE];
+        u8              cookie_pair_size;
+        u8              cookie_desired;
+        u16             s_data_desired:11,
+                        s_data_constant:1,
+                        s_data_in:1,
+                        s_data_out:1,
+                        s_data_unused:2;
+        u8              s_data_payload[0];
+};
+
+static inline void tcp_cookie_values_release(struct kref *kref)
+{
+        kfree(container_of(kref, struct tcp_cookie_values, kref));
+}
+
+/* The length of constant payload data.  Note that s_data_desired is
+ * overloaded, depending on s_data_constant: either the length of constant
+ * data (returned here) or the limit on variable data.
+ */
+static inline int tcp_s_data_size(const struct tcp_sock *tp)
+{
+        return (tp->cookie_values != NULL && tp->cookie_values->s_data_constant)
+                ? tp->cookie_values->s_data_desired
+                : 0;
+}
+
+/**
+ *      struct tcp_extend_values - tcp_ipv?.c to tcp_output.c workspace.
+ *
+ *      As tcp_request_sock has already been extended in other places, the
+ *      only remaining method is to pass stack values along as function
+ *      parameters.  These parameters are not needed after sending SYNACK.
+ *
+ * @cookie_bakery:      cryptographic secret and message workspace.
+ *
+ * @cookie_plus:        bytes in authenticator/cookie option, copied from
+ *                      struct tcp_options_received (above).
+ */
+struct tcp_extend_values {
+        struct request_values           rv;
+        u32                             cookie_bakery[COOKIE_WORKSPACE_WORDS];
+        u8                              cookie_plus:6,
+                                        cookie_out_never:1,
+                                        cookie_in_always:1;
+};
+
+static inline struct tcp_extend_values *tcp_xv(struct request_values *rvp)
+{
+        return (struct tcp_extend_values *)rvp;
+}
+
 extern void tcp_v4_init(void);
 extern void tcp_init(void);
 
diff --git a/include/net/udp.h b/include/net/udp.h
index f98abd2ce70..5348d80b25b 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -50,16 +50,49 @@ struct udp_skb_cb {
 };
 #define UDP_SKB_CB(__skb)       ((struct udp_skb_cb *)((__skb)->cb))
 
+/**
+ *      struct udp_hslot - UDP hash slot
+ *
+ *      @head:  head of list of sockets
+ *      @count: number of sockets in 'head' list
+ *      @lock:  spinlock protecting changes to head/count
+ */
 struct udp_hslot {
         struct hlist_nulls_head head;
+        int                     count;
         spinlock_t              lock;
 } __attribute__((aligned(2 * sizeof(long))));
+
+/**
+ *      struct udp_table - UDP table
+ *
+ *      @hash:  hash table, sockets are hashed on (local port)
+ *      @hash2: hash table, sockets are hashed on (local port, local address)
+ *      @mask:  number of slots in hash tables, minus 1
+ *      @log:   log2(number of slots in hash table)
+ */
 struct udp_table {
-        struct udp_hslot        hash[UDP_HTABLE_SIZE];
+        struct udp_hslot        *hash;
+        struct udp_hslot        *hash2;
+        unsigned int            mask;
+        unsigned int            log;
 };
 extern struct udp_table udp_table;
-extern void udp_table_init(struct udp_table *);
-
+extern void udp_table_init(struct udp_table *, const char *);
+static inline struct udp_hslot *udp_hashslot(struct udp_table *table,
+                                             struct net *net, unsigned num)
+{
+        return &table->hash[udp_hashfn(net, num, table->mask)];
+}
+/*
+ * For secondary hash, net_hash_mix() is performed before calling
+ * udp_hashslot2(), this explains difference with udp_hashslot()
+ */
+static inline struct udp_hslot *udp_hashslot2(struct udp_table *table,
+                                              unsigned int hash)
+{
+        return &table->hash2[hash & table->mask];
+}
 
 /* Note: this must match 'valbool' in sock_setsockopt */
 #define UDP_CSUM_NOXMIT         1
@@ -125,7 +158,8 @@ static inline void udp_lib_close(struct sock *sk, long timeout)
 }
 
 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);
 
 /* net/ipv4/udp.c */
 extern int      udp_get_port(struct sock *sk, unsigned short snum,
diff --git a/include/net/wext.h b/include/net/wext.h
index 3f2b94de2cf..4f6e7423174 100644
--- a/include/net/wext.h
+++ b/include/net/wext.h
@@ -1,29 +1,19 @@
 #ifndef __NET_WEXT_H
 #define __NET_WEXT_H
 
-/*
- * wireless extensions interface to the core code
- */
+#include <net/iw_handler.h>
 
 struct net;
 
-#ifdef CONFIG_WIRELESS_EXT
-extern int wext_proc_init(struct net *net);
-extern void wext_proc_exit(struct net *net);
+#ifdef CONFIG_WEXT_CORE
 extern int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
                              void __user *arg);
 extern int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,
                                     unsigned long arg);
+
 extern struct iw_statistics *get_wireless_stats(struct net_device *dev);
+extern int call_commit_handler(struct net_device *dev);
 #else
-static inline int wext_proc_init(struct net *net)
-{
-        return 0;
-}
-static inline void wext_proc_exit(struct net *net)
-{
-        return;
-}
 static inline int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
                                     void __user *arg)
 {
@@ -36,4 +26,35 @@ static inline int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,
 }
 #endif
 
+#ifdef CONFIG_WEXT_PROC
+extern int wext_proc_init(struct net *net);
+extern void wext_proc_exit(struct net *net);
+#else
+static inline int wext_proc_init(struct net *net)
+{
+        return 0;
+}
+static inline void wext_proc_exit(struct net *net)
+{
+        return;
+}
+#endif
+
+#ifdef CONFIG_WEXT_PRIV
+int ioctl_private_call(struct net_device *dev, struct iwreq *iwr,
+                       unsigned int cmd, struct iw_request_info *info,
+                       iw_handler handler);
+int compat_private_call(struct net_device *dev, struct iwreq *iwr,
+                        unsigned int cmd, struct iw_request_info *info,
+                        iw_handler handler);
+int iw_handler_get_private(struct net_device *          dev,
+                           struct iw_request_info *     info,
+                           union iwreq_data *           wrqu,
+                           char *                       extra);
+#else
+#define ioctl_private_call NULL
+#define compat_private_call NULL
+#endif
+
+
 #endif /* __NET_WEXT_H */
diff --git a/include/net/wimax.h b/include/net/wimax.h
index 2af7bf839f2..3461aa1df1e 100644
--- a/include/net/wimax.h
+++ b/include/net/wimax.h
@@ -79,7 +79,7 @@
  * drivers have to only report state changes due to external
  * conditions.
  *
- * All API operations are 'atomic', serialized thorough a mutex in the
+ * All API operations are 'atomic', serialized through a mutex in the
  * `struct wimax_dev`.
  *
  * EXPORTING TO USER SPACE THROUGH GENERIC NETLINK
@@ -195,6 +195,12 @@
  *    defining the `struct nla_policy` for each message, it has to have
  *    an array size of WIMAX_GNL_ATTR_MAX+1.
  *
+ * The op_*() function pointers will not be called if the wimax_dev is
+ * in a state <= %WIMAX_ST_UNINITIALIZED. The exception is:
+ *
+ * - op_reset: can be called at any time after wimax_dev_add() has
+ *   been called.
+ *
  * THE PIPE INTERFACE:
  *
  * This interface is kept intentionally simple. The driver can send
diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h
index 547b1e271ac..85926231c07 100644
--- a/include/net/wpan-phy.h
+++ b/include/net/wpan-phy.h
@@ -34,20 +34,32 @@ struct wpan_phy {
          */
         u8 current_channel;
         u8 current_page;
-        u32 channels_supported;
+        u32 channels_supported[32];
         u8 transmit_power;
         u8 cca_mode;
 
         struct device dev;
         int idx;
 
+        struct net_device *(*add_iface)(struct wpan_phy *phy,
+                        const char *name);
+        void (*del_iface)(struct wpan_phy *phy, struct net_device *dev);
+
         char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
 };
 
+#define to_phy(_dev)    container_of(_dev, struct wpan_phy, dev)
+
 struct wpan_phy *wpan_phy_alloc(size_t priv_size);
-int wpan_phy_register(struct device *parent, struct wpan_phy *phy);
+static inline void wpan_phy_set_dev(struct wpan_phy *phy, struct device *dev)
+{
+        phy->dev.parent = dev;
+}
+int wpan_phy_register(struct wpan_phy *phy);
 void wpan_phy_unregister(struct wpan_phy *phy);
 void wpan_phy_free(struct wpan_phy *phy);
+/* Same semantics as for class_for_each_device */
+int wpan_phy_for_each(int (*fn)(struct wpan_phy *phy, void *data), void *data);
 
 static inline void *wpan_phy_priv(struct wpan_phy *phy)
 {
@@ -56,6 +68,12 @@ static inline void *wpan_phy_priv(struct wpan_phy *phy)
 }
 
 struct wpan_phy *wpan_phy_find(const char *str);
+
+static inline void wpan_phy_put(struct wpan_phy *phy)
+{
+        put_device(&phy->dev);
+}
+
 static inline const char *wpan_phy_name(struct wpan_phy *phy)
 {
         return dev_name(&phy->dev);
diff --git a/include/net/x25.h b/include/net/x25.h
index 2cda0401156..9baa07dc7d1 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -287,8 +287,14 @@ extern unsigned long x25_display_timer(struct sock *);
 extern void x25_check_rbuf(struct sock *);
 
 /* sysctl_net_x25.c */
+#ifdef CONFIG_SYSCTL
 extern void x25_register_sysctl(void);
 extern void x25_unregister_sysctl(void);
+#else
+static inline void x25_register_sysctl(void) {};
+static inline void x25_unregister_sysctl(void) {};
+#endif /* CONFIG_SYSCTL */
+
 struct x25_skb_cb {
         unsigned flags;
 };
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 223e90a4482..6d85861ab99 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -19,6 +19,9 @@
 #include <net/route.h>
 #include <net/ipv6.h>
 #include <net/ip6_fib.h>
+
+#include <linux/interrupt.h>
+
 #ifdef CONFIG_XFRM_STATISTICS
 #include <net/snmp.h>
 #endif
@@ -121,8 +124,7 @@ struct xfrm_state_walk {
 };
 
 /* Full description of state of transformer. */
-struct xfrm_state
-{
+struct xfrm_state {
 #ifdef CONFIG_NET_NS
         struct net              *xs_net;
 #endif
@@ -160,7 +162,7 @@ struct xfrm_state
         struct xfrm_lifetime_cfg lft;
 
         /* Data for transformer */
-        struct xfrm_algo        *aalg;
+        struct xfrm_algo_auth   *aalg;
         struct xfrm_algo        *ealg;
         struct xfrm_algo        *calg;
         struct xfrm_algo_aead   *aead;
@@ -199,7 +201,7 @@ struct xfrm_state
         struct xfrm_stats       stats;
 
         struct xfrm_lifetime_cur curlft;
-        struct timer_list       timer;
+        struct tasklet_hrtimer  mtimer;
 
         /* Last used time */
         unsigned long           lastused;
@@ -237,8 +239,7 @@ enum {
 };
 
 /* callback structure passed from either netlink or pfkey */
-struct km_event
-{
+struct km_event {
         union {
                 u32 hard;
                 u32 proto;
@@ -313,8 +314,7 @@ extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
 
 extern void xfrm_state_delete_tunnel(struct xfrm_state *x);
 
-struct xfrm_type
-{
+struct xfrm_type {
         char                    *description;
         struct module           *owner;
         __u8                    proto;
@@ -420,8 +420,7 @@ static inline struct xfrm_mode *xfrm_ip2inner_mode(struct xfrm_state *x, int ipp
                 return x->inner_mode_iaf;
 }
 
-struct xfrm_tmpl
-{
+struct xfrm_tmpl {
 /* id in template is interpreted as:
  * daddr - destination of tunnel, may be zero for transport mode.
  * spi   - zero to acquire spi. Not zero if spi is static, then
@@ -468,8 +467,7 @@ struct xfrm_policy_walk {
         u32 seq;
 };
 
-struct xfrm_policy
-{
+struct xfrm_policy {
 #ifdef CONFIG_NET_NS
         struct net              *xp_net;
 #endif
@@ -538,8 +536,7 @@ struct xfrm_migrate {
 /* default seq threshold size */
 #define XFRM_AE_SEQT_SIZE               2
 
-struct xfrm_mgr
-{
+struct xfrm_mgr {
         struct list_head        list;
         char                    *id;
         int                     (*notify)(struct xfrm_state *x, struct km_event *c);
@@ -626,8 +623,7 @@ struct xfrm_spi_skb_cb {
 #define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0]))
 
 /* Audit Information */
-struct xfrm_audit
-{
+struct xfrm_audit {
         u32     secid;
         uid_t   loginuid;
         u32     sessionid;
@@ -871,8 +867,7 @@ static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ct
  * bundles differing by session id. All the bundles grow from a parent
  * policy rule.
  */
-struct xfrm_dst
-{
+struct xfrm_dst {
         union {
                 struct dst_entry        dst;
                 struct rtable           rt;
@@ -907,8 +902,7 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)
 
 extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev);
 
-struct sec_path
-{
+struct sec_path {
         atomic_t                refcnt;
         int                     len;
         struct xfrm_state       *xvec[XFRM_MAX_DEPTH];
@@ -1500,9 +1494,6 @@ struct scatterlist;
 typedef int (icv_update_fn_t)(struct hash_desc *, struct scatterlist *,
                               unsigned int);
 
-extern int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *tfm,
-                        int offset, int len, icv_update_fn_t icv_update);
-
 static inline int xfrm_addr_cmp(xfrm_address_t *a, xfrm_address_t *b,
                                 int family)
 {
@@ -1541,12 +1532,22 @@ static inline int xfrm_alg_len(struct xfrm_algo *alg)
         return sizeof(*alg) + ((alg->alg_key_len + 7) / 8);
 }
 
+static inline int xfrm_alg_auth_len(struct xfrm_algo_auth *alg)
+{
+        return sizeof(*alg) + ((alg->alg_key_len + 7) / 8);
+}
+
 #ifdef CONFIG_XFRM_MIGRATE
 static inline struct xfrm_algo *xfrm_algo_clone(struct xfrm_algo *orig)
 {
         return kmemdup(orig, xfrm_alg_len(orig), GFP_KERNEL);
 }
 
+static inline struct xfrm_algo_auth *xfrm_algo_auth_clone(struct xfrm_algo_auth *orig)
+{
+        return kmemdup(orig, xfrm_alg_auth_len(orig), GFP_KERNEL);
+}
+
 static inline void xfrm_states_put(struct xfrm_state **states, int n)
 {
         int i;
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 904468a191e..afc2bfb9e91 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -15,6 +15,10 @@
 #ifndef _LINUX_CS_H
 #define _LINUX_CS_H
 
+#ifdef __KERNEL__
+#include <linux/interrupt.h>
+#endif
+
 /* For AccessConfigurationRegister */
 typedef struct conf_reg_t {
     u_char      Function;
@@ -111,11 +115,9 @@ typedef struct io_req_t {
 
 /* For RequestIRQ and ReleaseIRQ */
 typedef struct irq_req_t {
-    u_int       Attributes;
-    u_int       AssignedIRQ;
-    u_int       IRQInfo1, IRQInfo2; /* IRQInfo2 is ignored */
-    void        *Handler;
-    void        *Instance;
+        u_int           Attributes;
+        u_int           AssignedIRQ;
+        irq_handler_t   Handler;
 } irq_req_t;
 
 /* Attributes for RequestIRQ and ReleaseIRQ */
@@ -125,7 +127,7 @@ typedef struct irq_req_t {
 #define IRQ_TYPE_DYNAMIC_SHARING        0x02
 #define IRQ_FORCED_PULSE                0x04
 #define IRQ_FIRST_SHARED                0x08
-#define IRQ_HANDLE_PRESENT              0x10
+//#define IRQ_HANDLE_PRESENT            0x10
 #define IRQ_PULSE_ALLOCATED             0x100
 
 /* Bits in IRQInfo1 field */
diff --git a/include/pcmcia/cs_types.h b/include/pcmcia/cs_types.h
index 315965a3793..f5e3b8386c8 100644
--- a/include/pcmcia/cs_types.h
+++ b/include/pcmcia/cs_types.h
@@ -26,8 +26,7 @@ typedef u_int	event_t;
 typedef u_char  cisdata_t;
 typedef u_short page_t;
 
-struct window_t;
-typedef struct window_t *window_handle_t;
+typedef unsigned long window_handle_t;
 
 struct region_t;
 typedef struct region_t *memory_handle_t;
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index a2be80b9a09..d403c12f797 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -34,6 +34,7 @@
 struct pcmcia_socket;
 struct pcmcia_device;
 struct config_t;
+struct net_device;
 
 /* dynamic device IDs for PCMCIA device drivers. See
  * Documentation/pcmcia/driver.txt for details.
@@ -137,65 +138,39 @@ struct pcmcia_device {
 #define to_pcmcia_dev(n) container_of(n, struct pcmcia_device, dev)
 #define to_pcmcia_drv(n) container_of(n, struct pcmcia_driver, drv)
 
-/* deprecated -- don't use! */
-#define handle_to_dev(handle) (handle->dev)
 
-
-/* (deprecated) error reporting by PCMCIA devices. Use dev_printk()
- * or dev_dbg() directly in the driver, without referring to pcmcia_error_func()
- * and/or pcmcia_error_ret() for those functions will go away soon.
- */
-enum service {
-    AccessConfigurationRegister, AddSocketServices,
-    AdjustResourceInfo, CheckEraseQueue, CloseMemory, CopyMemory,
-    DeregisterClient, DeregisterEraseQueue, GetCardServicesInfo,
-    GetClientInfo, GetConfigurationInfo, GetEventMask,
-    GetFirstClient, GetFirstPartion, GetFirstRegion, GetFirstTuple,
-    GetNextClient, GetNextPartition, GetNextRegion, GetNextTuple,
-    GetStatus, GetTupleData, MapLogSocket, MapLogWindow, MapMemPage,
-    MapPhySocket, MapPhyWindow, ModifyConfiguration, ModifyWindow,
-    OpenMemory, ParseTuple, ReadMemory, RegisterClient,
-    RegisterEraseQueue, RegisterMTD, RegisterTimer,
-    ReleaseConfiguration, ReleaseExclusive, ReleaseIO, ReleaseIRQ,
-    ReleaseSocketMask, ReleaseWindow, ReplaceSocketServices,
-    RequestConfiguration, RequestExclusive, RequestIO, RequestIRQ,
-    RequestSocketMask, RequestWindow, ResetCard, ReturnSSEntry,
-    SetEventMask, SetRegion, ValidateCIS, VendorSpecific,
-    WriteMemory, BindDevice, BindMTD, ReportError,
-    SuspendCard, ResumeCard, EjectCard, InsertCard, ReplaceCIS,
-    GetFirstWindow, GetNextWindow, GetMemPage
-};
-const char *pcmcia_error_func(int func);
-const char *pcmcia_error_ret(int ret);
-
-#define cs_error(p_dev, func, ret)                      \
-        {                                               \
-                dev_printk(KERN_NOTICE, &p_dev->dev,    \
-                           "%s : %s\n",                 \
-                           pcmcia_error_func(func),     \
-                           pcmcia_error_ret(ret));      \
-        }
-
-/* CIS access.
- * Use the pcmcia_* versions in PCMCIA drivers
+/*
+ * CIS access.
+ *
+ * Please use the following functions to access CIS tuples:
+ * - pcmcia_get_tuple()
+ * - pcmcia_loop_tuple()
+ * - pcmcia_get_mac_from_cis()
+ *
+ * To parse a tuple_t, pcmcia_parse_tuple() exists. Its interface
+ * might change in future.
  */
-int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse);
 
-int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function,
-                           tuple_t *tuple);
-#define pcmcia_get_first_tuple(p_dev, tuple) \
-                pccard_get_first_tuple(p_dev->socket, p_dev->func, tuple)
+/* get the very first CIS entry of type @code. Note that buf is pointer
+ * to u8 *buf; and that you need to kfree(buf) afterwards. */
+size_t pcmcia_get_tuple(struct pcmcia_device *p_dev, cisdata_t code,
+                        u8 **buf);
 
-int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function,
-                          tuple_t *tuple);
-#define pcmcia_get_next_tuple(p_dev, tuple) \
-                pccard_get_next_tuple(p_dev->socket, p_dev->func, tuple)
+/* loop over CIS entries */
+int pcmcia_loop_tuple(struct pcmcia_device *p_dev, cisdata_t code,
+                      int (*loop_tuple) (struct pcmcia_device *p_dev,
+                                         tuple_t *tuple,
+                                         void *priv_data),
+                      void *priv_data);
 
-int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple);
-#define pcmcia_get_tuple_data(p_dev, tuple) \
-                pccard_get_tuple_data(p_dev->socket, tuple)
+/* get the MAC address from CISTPL_FUNCE */
+int pcmcia_get_mac_from_cis(struct pcmcia_device *p_dev,
+                            struct net_device *dev);
 
 
+/* parse a tuple_t */
+int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse);
+
 /* loop CIS entries for valid configuration */
 int pcmcia_loop_config(struct pcmcia_device *p_dev,
                        int      (*conf_check)   (struct pcmcia_device *p_dev,
@@ -221,12 +196,11 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req);
 int pcmcia_request_configuration(struct pcmcia_device *p_dev,
                                  config_req_t *req);
 
-int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req,
+int pcmcia_request_window(struct pcmcia_device *p_dev, win_req_t *req,
                           window_handle_t *wh);
-int pcmcia_release_window(window_handle_t win);
-
-int pcmcia_get_mem_page(window_handle_t win, memreq_t *req);
-int pcmcia_map_mem_page(window_handle_t win, memreq_t *req);
+int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t win);
+int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t win,
+                        memreq_t *req);
 
 int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod);
 void pcmcia_disable_device(struct pcmcia_device *p_dev);
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index e0f6feb8588..7c23be706f1 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -107,15 +107,6 @@ typedef struct io_window_t {
         struct resource         *res;
 } io_window_t;
 
-#define WINDOW_MAGIC    0xB35C
-typedef struct window_t {
-        u_short                 magic;
-        u_short                 index;
-        struct pcmcia_device    *handle;
-        struct pcmcia_socket    *sock;
-        pccard_mem_map          ctl;
-} window_t;
-
 /* Maximum number of IO windows per socket */
 #define MAX_IO_WIN 2
 
@@ -155,7 +146,7 @@ struct pcmcia_socket {
                 u_int                   Config;
         } irq;
         io_window_t                     io[MAX_IO_WIN];
-        window_t                        win[MAX_WIN];
+        pccard_mem_map                  win[MAX_WIN];
         struct list_head                cis_cache;
         size_t                          fake_cis_len;
         u8                              *fake_cis;
@@ -172,7 +163,7 @@ struct pcmcia_socket {
         u_int                           irq_mask;
         u_int                           map_size;
         u_int                           io_offset;
-        u_char                          pci_irq;
+        u_int                           pci_irq;
         struct pci_dev *                cb_dev;
 
 
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild
index 33b2750e928..b3a0ee6b2f1 100644
--- a/include/scsi/Kbuild
+++ b/include/scsi/Kbuild
@@ -2,3 +2,4 @@ header-y += scsi.h
 header-y += scsi_netlink.h
 header-y += scsi_netlink_fc.h
 header-y += scsi_bsg_fc.h
+header-y += fc/
diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild
new file mode 100644
index 00000000000..56603813c6c
--- /dev/null
+++ b/include/scsi/fc/Kbuild
@@ -0,0 +1,4 @@
+header-y += fc_els.h
+header-y += fc_fs.h
+header-y += fc_gs.h
+header-y += fc_ns.h
diff --git a/include/scsi/fc/fc_els.h b/include/scsi/fc/fc_els.h
index 195ca014d3c..f94328132a2 100644
--- a/include/scsi/fc/fc_els.h
+++ b/include/scsi/fc/fc_els.h
@@ -20,6 +20,8 @@
 #ifndef _FC_ELS_H_
 #define _FC_ELS_H_
 
+#include <linux/types.h>
+
 /*
  * Fibre Channel Switch - Enhanced Link Services definitions.
  * From T11 FC-LS Rev 1.2 June 7, 2005.
@@ -248,10 +250,12 @@ struct fc_els_csp {
 /*
  * sp_features
  */
-#define FC_SP_FT_CIRO   0x8000  /* continuously increasing rel. off. */
+#define FC_SP_FT_NPIV   0x8000  /* multiple N_Port_ID support (FLOGI) */
+#define FC_SP_FT_CIRO   0x8000  /* continuously increasing rel off (PLOGI) */
 #define FC_SP_FT_CLAD   0x8000  /* clean address (in FLOGI LS_ACC) */
 #define FC_SP_FT_RAND   0x4000  /* random relative offset */
 #define FC_SP_FT_VAL    0x2000  /* valid vendor version level */
+#define FC_SP_FT_NPIV_ACC       0x2000  /* NPIV assignment (FLOGI LS_ACC) */
 #define FC_SP_FT_FPORT  0x1000  /* F port (1) vs. N port (0) */
 #define FC_SP_FT_ABB    0x0800  /* alternate BB_credit management */
 #define FC_SP_FT_EDTR   0x0400  /* E_D_TOV Resolution is nanoseconds */
diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h
index ccb3dbe9046..e6ad3d2ae47 100644
--- a/include/scsi/fc/fc_fcoe.h
+++ b/include/scsi/fc/fc_fcoe.h
@@ -86,6 +86,18 @@ struct fcoe_crc_eof {
 #define FCOE_MIN_FRAME 46
 
 /*
+ * FCoE Link Error Status Block: T11 FC-BB-5 Rev2.0, Clause 7.10.
+ */
+struct fcoe_fc_els_lesb {
+        __be32          lesb_link_fail; /* link failure count */
+        __be32          lesb_vlink_fail; /* virtual link failure count */
+        __be32          lesb_miss_fka;  /* missing FIP keep-alive count */
+        __be32          lesb_symb_err;  /* symbol error during carrier count */
+        __be32          lesb_err_block; /* errored block count */
+        __be32          lesb_fcs_error; /* frame check sequence error count */
+};
+
+/*
  * fc_fcoe_set_mac - Store OUI + DID into MAC address field.
  * @mac: mac address to be set
  * @did: fc dest id to use
diff --git a/include/scsi/fc/fc_fcp.h b/include/scsi/fc/fc_fcp.h
index 5d38f1989f3..747e2c7d88d 100644
--- a/include/scsi/fc/fc_fcp.h
+++ b/include/scsi/fc/fc_fcp.h
@@ -83,6 +83,8 @@ struct fcp_cmnd32 {
  * fc_tm_flags - task management flags field.
  */
 #define FCP_TMF_CLR_ACA         0x40    /* clear ACA condition */
+#define FCP_TMF_TGT_RESET       0x20    /* target reset task management,
+                                           deprecated as of FCP-3 */
 #define FCP_TMF_LUN_RESET       0x10    /* logical unit reset task management */
 #define FCP_TMF_CLR_TASK_SET    0x04    /* clear task set */
 #define FCP_TMF_ABT_TASK_SET    0x02    /* abort task set */
@@ -196,4 +198,10 @@ struct fcp_srr {
         __u8            srr_resvd2[3];  /* reserved */
 };
 
+/*
+ * Feature bits in name server FC-4 Features object.
+ */
+#define FCP_FEAT_TARG   (1 << 0)        /* target function supported */
+#define FCP_FEAT_INIT   (1 << 1)        /* initiator function supported */
+
 #endif /* _FC_FCP_H_ */
diff --git a/include/scsi/fc/fc_fip.h b/include/scsi/fc/fc_fip.h
index 3d138c1fcf8..17baa19380f 100644
--- a/include/scsi/fc/fc_fip.h
+++ b/include/scsi/fc/fc_fip.h
@@ -214,11 +214,21 @@ struct fip_vn_desc {
  */
 struct fip_fka_desc {
         struct fip_desc fd_desc;
-        __u8            fd_resvd[2];
+        __u8            fd_resvd;
+        __u8            fd_flags;       /* bit0 is fka disable flag */
         __be32          fd_fka_period;  /* adv./keep-alive period in mS */
 } __attribute__((packed));
 
 /*
+ * flags for fip_fka_desc.fd_flags
+ */
+enum fip_fka_flags {
+        FIP_FKA_ADV_D = 0x01,           /* no need for FKA from ENode */
+};
+
+/* FIP_DT_FKA flags */
+
+/*
  * FIP_DT_VENDOR descriptor.
  */
 struct fip_vendor_desc {
diff --git a/include/scsi/fc/fc_fs.h b/include/scsi/fc/fc_fs.h
index ac4cd38c860..50f28b14345 100644
--- a/include/scsi/fc/fc_fs.h
+++ b/include/scsi/fc/fc_fs.h
@@ -20,6 +20,8 @@
 #ifndef _FC_FS_H_
 #define _FC_FS_H_
 
+#include <linux/types.h>
+
 /*
  * Fibre Channel Framing and Signalling definitions.
  * From T11 FC-FS-2 Rev 0.90 - 9 August 2005.
diff --git a/include/scsi/fc/fc_gs.h b/include/scsi/fc/fc_gs.h
index 324dd0e3c62..a37346d47eb 100644
--- a/include/scsi/fc/fc_gs.h
+++ b/include/scsi/fc/fc_gs.h
@@ -20,6 +20,8 @@
 #ifndef _FC_GS_H_
 #define _FC_GS_H_
 
+#include <linux/types.h>
+
 /*
  * Fibre Channel Services - Common Transport.
  * From T11.org FC-GS-2 Rev 5.3 November 1998.
diff --git a/include/scsi/fc/fc_ns.h b/include/scsi/fc/fc_ns.h
index 790d7b97d4b..e7d3ac497d7 100644
--- a/include/scsi/fc/fc_ns.h
+++ b/include/scsi/fc/fc_ns.h
@@ -20,6 +20,8 @@
 #ifndef _FC_NS_H_
 #define _FC_NS_H_
 
+#include <linux/types.h>
+
 /*
  * Fibre Channel Services - Name Service (dNS)
  * From T11.org FC-GS-2 Rev 5.3 November 1998.
@@ -44,9 +46,12 @@ enum fc_ns_req {
         FC_NS_GID_FT =  0x0171,         /* get IDs by FC4 type */
         FC_NS_GPN_FT =  0x0172,         /* get port names by FC4 type */
         FC_NS_GID_PT =  0x01a1,         /* get IDs by port type */
-        FC_NS_RFT_ID =  0x0217,         /* reg FC4 type for ID */
         FC_NS_RPN_ID =  0x0212,         /* reg port name for ID */
         FC_NS_RNN_ID =  0x0213,         /* reg node name for ID */
+        FC_NS_RFT_ID =  0x0217,         /* reg FC4 type for ID */
+        FC_NS_RSPN_ID = 0x0218,         /* reg symbolic port name */
+        FC_NS_RFF_ID =  0x021f,         /* reg FC4 Features for ID */
+        FC_NS_RSNN_NN = 0x0239,         /* reg symbolic node name */
 };
 
 /*
@@ -156,4 +161,32 @@ struct fc_ns_rn_id {
         __be64          fr_wwn;         /* node name or port name */
 } __attribute__((__packed__));
 
+/*
+ * RSNN_NN request - register symbolic node name
+ */
+struct fc_ns_rsnn {
+        __be64          fr_wwn;         /* node name */
+        __u8            fr_name_len;
+        char            fr_name[];
+} __attribute__((__packed__));
+
+/*
+ * RSPN_ID request - register symbolic port name
+ */
+struct fc_ns_rspn {
+        struct fc_ns_fid fr_fid;        /* port ID object */
+        __u8            fr_name_len;
+        char            fr_name[];
+} __attribute__((__packed__));
+
+/*
+ * RFF_ID request - register FC-4 Features for ID.
+ */
+struct fc_ns_rff_id {
+        struct fc_ns_fid fr_fid;        /* port ID object */
+        __u8            fr_resvd[2];
+        __u8            fr_feat;        /* FC-4 Feature bits */
+        __u8            fr_type;        /* FC-4 type */
+} __attribute__((__packed__));
+
 #endif /* _FC_NS_H_ */
diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h
index 27dad703824..8eb0a0fc0a7 100644
--- a/include/scsi/fc_encode.h
+++ b/include/scsi/fc_encode.h
@@ -32,7 +32,10 @@ struct fc_ct_req {
                 struct fc_ns_gid_ft gid;
                 struct fc_ns_rn_id  rn;
                 struct fc_ns_rft rft;
+                struct fc_ns_rff_id rff;
                 struct fc_ns_fid fid;
+                struct fc_ns_rsnn snn;
+                struct fc_ns_rspn spn;
         } payload;
 };
 
@@ -109,6 +112,7 @@ static inline int fc_ct_fill(struct fc_lport *lport,
                       enum fc_fh_type *fh_type)
 {
         struct fc_ct_req *ct;
+        size_t len;
 
         switch (op) {
         case FC_NS_GPN_FT:
@@ -128,12 +132,41 @@ static inline int fc_ct_fill(struct fc_lport *lport,
                 ct->payload.rft.fts = lport->fcts;
                 break;
 
-        case FC_NS_RPN_ID:
+        case FC_NS_RFF_ID:
+                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rff_id));
+                hton24(ct->payload.rff.fr_fid.fp_fid,
+                       fc_host_port_id(lport->host));
+                ct->payload.rff.fr_type = FC_TYPE_FCP;
+                if (lport->service_params & FCP_SPPF_INIT_FCN)
+                        ct->payload.rff.fr_feat = FCP_FEAT_INIT;
+                if (lport->service_params & FCP_SPPF_TARG_FCN)
+                        ct->payload.rff.fr_feat |= FCP_FEAT_TARG;
+                break;
+
+        case FC_NS_RNN_ID:
                 ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rn_id));
                 hton24(ct->payload.rn.fr_fid.fp_fid,
                        fc_host_port_id(lport->host));
-                ct->payload.rft.fts = lport->fcts;
-                put_unaligned_be64(lport->wwpn, &ct->payload.rn.fr_wwn);
+                put_unaligned_be64(lport->wwnn, &ct->payload.rn.fr_wwn);
+                break;
+
+        case FC_NS_RSPN_ID:
+                len = strnlen(fc_host_symbolic_name(lport->host), 255);
+                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rspn) + len);
+                hton24(ct->payload.spn.fr_fid.fp_fid,
+                       fc_host_port_id(lport->host));
+                strncpy(ct->payload.spn.fr_name,
+                        fc_host_symbolic_name(lport->host), len);
+                ct->payload.spn.fr_name_len = len;
+                break;
+
+        case FC_NS_RSNN_NN:
+                len = strnlen(fc_host_symbolic_name(lport->host), 255);
+                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rsnn) + len);
+                put_unaligned_be64(lport->wwnn, &ct->payload.snn.fr_wwn);
+                strncpy(ct->payload.snn.fr_name,
+                        fc_host_symbolic_name(lport->host), len);
+                ct->payload.snn.fr_name_len = len;
                 break;
 
         default:
@@ -198,6 +231,31 @@ static inline void fc_flogi_fill(struct fc_lport *lport, struct fc_frame *fp)
         sp->sp_bb_data = htons((u16) lport->mfs);
         cp = &flogi->fl_cssp[3 - 1];    /* class 3 parameters */
         cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
+        if (lport->does_npiv)
+                sp->sp_features = htons(FC_SP_FT_NPIV);
+}
+
+/**
+ * fc_fdisc_fill - Fill in a fdisc request frame.
+ */
+static inline void fc_fdisc_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+        struct fc_els_csp *sp;
+        struct fc_els_cssp *cp;
+        struct fc_els_flogi *fdisc;
+
+        fdisc = fc_frame_payload_get(fp, sizeof(*fdisc));
+        memset(fdisc, 0, sizeof(*fdisc));
+        fdisc->fl_cmd = (u8) ELS_FDISC;
+        put_unaligned_be64(lport->wwpn, &fdisc->fl_wwpn);
+        put_unaligned_be64(lport->wwnn, &fdisc->fl_wwnn);
+        sp = &fdisc->fl_csp;
+        sp->sp_hi_ver = 0x20;
+        sp->sp_lo_ver = 0x20;
+        sp->sp_bb_cred = htons(10);     /* this gets set by gateway */
+        sp->sp_bb_data = htons((u16) lport->mfs);
+        cp = &fdisc->fl_cssp[3 - 1];    /* class 3 parameters */
+        cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
 }
 
 /**
@@ -296,6 +354,10 @@ static inline int fc_els_fill(struct fc_lport *lport,
                 fc_flogi_fill(lport, fp);
                 break;
 
+        case ELS_FDISC:
+                fc_fdisc_fill(lport, fp);
+                break;
+
         case ELS_LOGO:
                 fc_logo_fill(lport, fp);
                 break;
diff --git a/include/scsi/fc_frame.h b/include/scsi/fc_frame.h
index c35d2383cc2..4d3e9c7b7c5 100644
--- a/include/scsi/fc_frame.h
+++ b/include/scsi/fc_frame.h
@@ -28,6 +28,8 @@
 #include <scsi/fc/fc_fcp.h>
 #include <scsi/fc/fc_encaps.h>
 
+#include <linux/if_ether.h>
+
 /*
  * The fc_frame interface is used to pass frame data between functions.
  * The frame includes the data buffer, length, and SOF / EOF delimiter types.
@@ -37,6 +39,9 @@
 #define FC_FRAME_HEADROOM       32      /* headroom for VLAN + FCoE headers */
 #define FC_FRAME_TAILROOM       8       /* trailer space for FCoE */
 
+/* Max number of skb frags allowed, reserving one for fcoe_crc_eof page */
+#define FC_FRAME_SG_LEN         (MAX_SKB_FRAGS - 1)
+
 #define fp_skb(fp)      (&((fp)->skb))
 #define fr_hdr(fp)      ((fp)->skb.data)
 #define fr_len(fp)      ((fp)->skb.len)
@@ -64,6 +69,7 @@ struct fcoe_rcv_info {
         enum fc_sof     fr_sof;         /* start of frame delimiter */
         enum fc_eof     fr_eof;         /* end of frame delimiter */
         u8              fr_flags;       /* flags - see below */
+        u8              granted_mac[ETH_ALEN]; /* FCoE MAC address */
 };
 
 
@@ -94,17 +100,7 @@ static inline void fc_frame_init(struct fc_frame *fp)
 }
 
 struct fc_frame *fc_frame_alloc_fill(struct fc_lport *, size_t payload_len);
-
-struct fc_frame *__fc_frame_alloc(size_t payload_len);
-
-/*
- * Get frame for sending via port.
- */
-static inline struct fc_frame *_fc_frame_alloc(struct fc_lport *dev,
-                                               size_t payload_len)
-{
-        return __fc_frame_alloc(payload_len);
-}
+struct fc_frame *_fc_frame_alloc(size_t payload_len);
 
 /*
  * Allocate fc_frame structure and buffer.  Set the initial length to
@@ -118,10 +114,10 @@ static inline struct fc_frame *fc_frame_alloc(struct fc_lport *dev, size_t len)
          * Note: Since len will often be a constant multiple of 4,
          * this check will usually be evaluated and eliminated at compile time.
          */
-        if ((len % 4) != 0)
+        if (len && len % 4)
                 fp = fc_frame_alloc_fill(dev, len);
         else
-                fp = _fc_frame_alloc(dev, len);
+                fp = _fc_frame_alloc(len);
         return fp;
 }
 
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index d67dda2b6aa..66d377b9c72 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -311,6 +311,8 @@ enum iscsi_param {
         ISCSI_PARAM_IFACE_NAME,
         ISCSI_PARAM_ISID,
         ISCSI_PARAM_INITIATOR_NAME,
+
+        ISCSI_PARAM_TGT_RESET_TMO,
         /* must always be last */
         ISCSI_PARAM_MAX,
 };
@@ -350,6 +352,7 @@ enum iscsi_param {
 #define ISCSI_IFACE_NAME                (1ULL << ISCSI_PARAM_IFACE_NAME)
 #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)
 
 /* iSCSI HBA params */
 enum iscsi_host_param {
diff --git a/include/scsi/iscsi_proto.h b/include/scsi/iscsi_proto.h
index f2a2c116948..dd0a52cea95 100644
--- a/include/scsi/iscsi_proto.h
+++ b/include/scsi/iscsi_proto.h
@@ -279,6 +279,8 @@ struct iscsi_tm {
 #define ISCSI_TM_FUNC_TARGET_COLD_RESET         7
 #define ISCSI_TM_FUNC_TASK_REASSIGN             8
 
+#define ISCSI_TM_FUNC_VALUE(hdr) ((hdr)->flags & ISCSI_FLAG_TM_FUNC_MASK)
+
 /* SCSI Task Management Response Header */
 struct iscsi_tm_rsp {
         uint8_t opcode;
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 65dc9aacbf7..4b912eee33e 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -26,6 +26,7 @@
 
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>
+#include <scsi/scsi_bsg_fc.h>
 
 #include <scsi/fc/fc_fcp.h>
 #include <scsi/fc/fc_ns.h>
@@ -34,67 +35,6 @@
 
 #include <scsi/fc_frame.h>
 
-#define FC_LIBFC_LOGGING 0x01 /* General logging, not categorized */
-#define FC_LPORT_LOGGING 0x02 /* lport layer logging */
-#define FC_DISC_LOGGING  0x04 /* discovery layer logging */
-#define FC_RPORT_LOGGING 0x08 /* rport layer logging */
-#define FC_FCP_LOGGING   0x10 /* I/O path logging */
-#define FC_EM_LOGGING    0x20 /* Exchange Manager logging */
-#define FC_EXCH_LOGGING  0x40 /* Exchange/Sequence logging */
-#define FC_SCSI_LOGGING  0x80 /* SCSI logging (mostly error handling) */
-
-extern unsigned int fc_debug_logging;
-
-#define FC_CHECK_LOGGING(LEVEL, CMD)                            \
-do {                                                            \
-        if (unlikely(fc_debug_logging & LEVEL))                 \
-                do {                                            \
-                        CMD;                                    \
-                } while (0);                                    \
-} while (0)
-
-#define FC_LIBFC_DBG(fmt, args...)                                      \
-        FC_CHECK_LOGGING(FC_LIBFC_LOGGING,                              \
-                         printk(KERN_INFO "libfc: " fmt, ##args))
-
-#define FC_LPORT_DBG(lport, fmt, args...)                               \
-        FC_CHECK_LOGGING(FC_LPORT_LOGGING,                              \
-                         printk(KERN_INFO "host%u: lport %6x: " fmt,    \
-                                (lport)->host->host_no,                 \
-                                fc_host_port_id((lport)->host), ##args))
-
-#define FC_DISC_DBG(disc, fmt, args...)                                 \
-        FC_CHECK_LOGGING(FC_DISC_LOGGING,                               \
-                         printk(KERN_INFO "host%u: disc: " fmt,         \
-                                (disc)->lport->host->host_no,           \
-                                ##args))
-
-#define FC_RPORT_ID_DBG(lport, port_id, fmt, args...)                   \
-        FC_CHECK_LOGGING(FC_RPORT_LOGGING,                              \
-                         printk(KERN_INFO "host%u: rport %6x: " fmt,    \
-                                (lport)->host->host_no,                 \
-                                (port_id), ##args))
-
-#define FC_RPORT_DBG(rdata, fmt, args...)                               \
-        FC_RPORT_ID_DBG((rdata)->local_port, (rdata)->ids.port_id, fmt, ##args)
-
-#define FC_FCP_DBG(pkt, fmt, args...)                                   \
-        FC_CHECK_LOGGING(FC_FCP_LOGGING,                                \
-                         printk(KERN_INFO "host%u: fcp: %6x: " fmt,     \
-                                (pkt)->lp->host->host_no,               \
-                                pkt->rport->port_id, ##args))
-
-#define FC_EXCH_DBG(exch, fmt, args...)                                 \
-        FC_CHECK_LOGGING(FC_EXCH_LOGGING,                               \
-                         printk(KERN_INFO "host%u: xid %4x: " fmt,      \
-                                (exch)->lp->host->host_no,              \
-                                exch->xid, ##args))
-
-#define FC_SCSI_DBG(lport, fmt, args...)                                \
-        FC_CHECK_LOGGING(FC_SCSI_LOGGING,                               \
-                         printk(KERN_INFO "host%u: scsi: " fmt,         \
-                                (lport)->host->host_no, ##args))
-
 /*
  * libfc error codes
  */
@@ -115,15 +55,28 @@ do {								\
                 p[2] = ((v) & 0xFF);            \
         } while (0)
 
-/*
- * FC HBA status
+/**
+ * enum fc_lport_state - Local port states
+ * @LPORT_ST_DISABLED: Disabled
+ * @LPORT_ST_FLOGI:    Fabric login (FLOGI) sent
+ * @LPORT_ST_DNS:      Waiting for name server remote port to become ready
+ * @LPORT_ST_RPN_ID:   Register port name by ID (RPN_ID) sent
+ * @LPORT_ST_RFT_ID:   Register Fibre Channel types by ID (RFT_ID) sent
+ * @LPORT_ST_RFF_ID:   Register FC-4 Features by ID (RFF_ID) sent
+ * @LPORT_ST_SCR:      State Change Register (SCR) sent
+ * @LPORT_ST_READY:    Ready for use
+ * @LPORT_ST_LOGO:     Local port logout (LOGO) sent
+ * @LPORT_ST_RESET:    Local port reset
  */
 enum fc_lport_state {
         LPORT_ST_DISABLED = 0,
         LPORT_ST_FLOGI,
         LPORT_ST_DNS,
-        LPORT_ST_RPN_ID,
+        LPORT_ST_RNN_ID,
+        LPORT_ST_RSNN_NN,
+        LPORT_ST_RSPN_ID,
         LPORT_ST_RFT_ID,
+        LPORT_ST_RFF_ID,
         LPORT_ST_SCR,
         LPORT_ST_READY,
         LPORT_ST_LOGO,
@@ -136,15 +89,28 @@ enum fc_disc_event {
         DISC_EV_FAILED
 };
 
+/**
+ * enum fc_rport_state - Remote port states
+ * @RPORT_ST_INIT:    Initialized
+ * @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,          /* initialized */
-        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,          /* port logout sent */
-        RPORT_ST_ADISC,         /* Discover Address sent */
-        RPORT_ST_DELETE,        /* port being deleted */
+        RPORT_ST_INIT,
+        RPORT_ST_PLOGI,
+        RPORT_ST_PRLI,
+        RPORT_ST_RTV,
+        RPORT_ST_READY,
+        RPORT_ST_LOGO,
+        RPORT_ST_ADISC,
+        RPORT_ST_DELETE,
+        RPORT_ST_RESTART,
 };
 
 /**
@@ -155,12 +121,20 @@ enum fc_rport_state {
  * @port_id:    Port ID of the discovered port
  */
 struct fc_disc_port {
-        struct fc_lport             *lp;
-        struct list_head            peers;
-        struct work_struct          rport_work;
-        u32                         port_id;
+        struct fc_lport    *lp;
+        struct list_head   peers;
+        struct work_struct rport_work;
+        u32                port_id;
 };
 
+/**
+ * enum fc_rport_event - Remote port events
+ * @RPORT_EV_NONE:   No event
+ * @RPORT_EV_READY:  Remote port is ready for use
+ * @RPORT_EV_FAILED: State machine failed, remote port is not ready
+ * @RPORT_EV_STOP:   Remote port has been stopped
+ * @RPORT_EV_LOGO:   Remote port logout (LOGO) sent
+ */
 enum fc_rport_event {
         RPORT_EV_NONE = 0,
         RPORT_EV_READY,
@@ -171,6 +145,10 @@ enum fc_rport_event {
 
 struct fc_rport_priv;
 
+/**
+ * struct fc_rport_operations - Operations for a remote port
+ * @event_callback: Function to be called for remote port events
+ */
 struct fc_rport_operations {
         void (*event_callback)(struct fc_lport *, struct fc_rport_priv *,
                                enum fc_rport_event);
@@ -178,11 +156,11 @@ struct fc_rport_operations {
 
 /**
  * struct fc_rport_libfc_priv - libfc internal information about a remote port
- * @local_port: Fibre Channel host port instance
- * @rp_state: indicates READY for I/O or DELETE when blocked.
- * @flags: REC and RETRY supported flags
- * @e_d_tov: error detect timeout value (in msec)
- * @r_a_tov: resource allocation timeout value (in msec)
+ * @local_port: The associated local port
+ * @rp_state:   Indicates READY for I/O or DELETE when blocked
+ * @flags:      REC and RETRY supported flags
+ * @e_d_tov:    Error detect timeout value (in msec)
+ * @r_a_tov:    Resource allocation timeout value (in msec)
  */
 struct fc_rport_libfc_priv {
         struct fc_lport            *local_port;
@@ -195,47 +173,66 @@ struct fc_rport_libfc_priv {
 };
 
 /**
- * struct fc_rport_priv - libfc rport and discovery info about a remote port
- * @local_port: Fibre Channel host port instance
- * @rport: transport remote port
- * @kref: reference counter
- * @rp_state: state tracks progress of PLOGI, PRLI, and RTV exchanges
- * @ids: remote port identifiers and roles
- * @flags: REC and RETRY supported flags
- * @max_seq: maximum number of concurrent sequences
- * @disc_id: discovery identifier
- * @maxframe_size: maximum frame size
- * @retries: retry count in current state
- * @e_d_tov: error detect timeout value (in msec)
- * @r_a_tov: resource allocation timeout value (in msec)
- * @rp_mutex: mutex protects rport
- * @retry_work:
- * @event_callback: Callback for rport READY, FAILED or LOGO
+ * struct fc_rport_priv - libfc remote port and discovery info
+ * @local_port:     The associated local port
+ * @rport:          The FC transport remote port
+ * @kref:           Reference counter
+ * @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
+ * @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
+ * @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
  */
 struct fc_rport_priv {
-        struct fc_lport            *local_port;
-        struct fc_rport            *rport;
-        struct kref                kref;
-        enum fc_rport_state        rp_state;
+        struct fc_lport             *local_port;
+        struct fc_rport             *rport;
+        struct kref                 kref;
+        enum fc_rport_state         rp_state;
         struct fc_rport_identifiers ids;
-        u16                        flags;
-        u16                        max_seq;
-        u16                        disc_id;
-        u16                        maxframe_size;
-        unsigned int               retries;
-        unsigned int               e_d_tov;
-        unsigned int               r_a_tov;
-        struct mutex               rp_mutex;
-        struct delayed_work        retry_work;
-        enum fc_rport_event        event;
-        struct fc_rport_operations *ops;
-        struct list_head           peers;
-        struct work_struct         event_work;
-        u32                        supported_classes;
+        u16                         flags;
+        u16                         max_seq;
+        u16                         disc_id;
+        u16                         maxframe_size;
+        unsigned int                retries;
+        unsigned int                e_d_tov;
+        unsigned int                r_a_tov;
+        struct mutex                rp_mutex;
+        struct delayed_work         retry_work;
+        enum fc_rport_event         event;
+        struct fc_rport_operations  *ops;
+        struct list_head            peers;
+        struct work_struct          event_work;
+        u32                         supported_classes;
 };
 
-/*
- * fcoe stats structure
+/**
+ * struct fcoe_dev_stats - fcoe stats structure
+ * @SecondsSinceLastReset: Seconds since the last reset
+ * @TxFrames:              Number of transmitted frames
+ * @TxWords:               Number of transmitted words
+ * @RxFrames:              Number of received frames
+ * @RxWords:               Number of received words
+ * @ErrorFrames:           Number of received error frames
+ * @DumpedFrames:          Number of dumped frames
+ * @LinkFailureCount:      Number of link failures
+ * @LossOfSignalCount:     Number for signal losses
+ * @InvalidTxWordCount:    Number of invalid transmitted words
+ * @InvalidCRCCount:       Number of invalid CRCs
+ * @InputRequests:         Number of input requests
+ * @OutputRequests:        Number of output requests
+ * @ControlRequests:       Number of control requests
+ * @InputMegabytes:        Number of received megabytes
+ * @OutputMegabytes:       Number of transmitted megabytes
+ * @VLinkFailureCount:     Number of virtual link failures
+ * @MissDiscAdvCount:      Number of missing FIP discovery advertisement
  */
 struct fcoe_dev_stats {
         u64             SecondsSinceLastReset;
@@ -254,12 +251,17 @@ struct fcoe_dev_stats {
         u64             ControlRequests;
         u64             InputMegabytes;
         u64             OutputMegabytes;
+        u64             VLinkFailureCount;
+        u64             MissDiscAdvCount;
 };
 
-/*
- * els data is used for passing ELS respone specific
- * data to send ELS response mainly using infomation
- * in exchange and sequence in EM layer.
+/**
+ * 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;
@@ -267,77 +269,87 @@ struct fc_seq_els_data {
         enum fc_els_rjt_explan explan;
 };
 
-/*
- * FCP request structure, one for each scsi cmd request
+/**
+ * struct fc_fcp_pkt - FCP request structure (one for each scsi_cmnd request)
+ * @lp:              The associated local port
+ * @state:           The state of the I/O
+ * @tgt_flags:       Target's flags
+ * @ref_cnt:         Reference count
+ * @scsi_pkt_lock:   Lock to protect the SCSI packet (must be taken before the
+ *                   host_lock if both are to be held at the same time)
+ * @cmd:             The SCSI command (set and clear with the host_lock held)
+ * @list:            Tracks queued commands (accessed with the host_lock held)
+ * @timer:           The command timer
+ * @tm_done:         Completion indicator
+ * @wait_for_comp:   Indicator to wait for completion of the I/O (in jiffies)
+ * @start_time:      Timestamp indicating the start of the I/O (in jiffies)
+ * @end_time:        Timestamp indicating the end of the I/O (in jiffies)
+ * @last_pkt_time:   Timestamp of the last frame received (in jiffies)
+ * @data_len:        The length of the data
+ * @cdb_cmd:         The CDB command
+ * @xfer_len:        The transfer length
+ * @xfer_ddp:        Indicates if this transfer used DDP (XID of the exchange
+ *                   will be set here if DDP was setup)
+ * @xfer_contig_end: The offset into the buffer if the buffer is contiguous
+ *                   (Tx and Rx)
+ * @max_payload:     The maximum payload size (in bytes)
+ * @io_status:       SCSI result (upper 24 bits)
+ * @cdb_status:      CDB status
+ * @status_code:     FCP I/O status
+ * @scsi_comp_flags: Completion flags (bit 3 Underrun bit 2: overrun)
+ * @req_flags:       Request flags (bit 0: read bit:1 write)
+ * @scsi_resid:      SCSI residule length
+ * @rport:           The remote port that the SCSI command is targeted at
+ * @seq_ptr:         The sequence that will carry the SCSI command
+ * @recov_retry:     Number of recovery retries
+ * @recov_seq:       The sequence for REC or SRR
  */
 struct fc_fcp_pkt {
-        /*
-         * housekeeping stuff
-         */
-        struct fc_lport *lp;    /* handle to hba struct */
-        u16             state;          /* scsi_pkt state state */
-        u16             tgt_flags;      /* target flags  */
-        atomic_t        ref_cnt;        /* fcp pkt ref count */
-        spinlock_t      scsi_pkt_lock;  /* Must be taken before the host lock
-                                         * if both are held at the same time */
-        /*
-         * SCSI I/O related stuff
-         */
-        struct scsi_cmnd *cmd;          /* scsi command pointer. set/clear
-                                         * under host lock */
-        struct list_head list;          /* tracks queued commands. access under
-                                         * host lock */
-        /*
-         * timeout related stuff
-         */
-        struct timer_list timer;        /* command timer */
+        /* Housekeeping information */
+        struct fc_lport   *lp;
+        u16               state;
+        u16               tgt_flags;
+        atomic_t          ref_cnt;
+        spinlock_t        scsi_pkt_lock;
+
+        /* SCSI I/O related information */
+        struct scsi_cmnd  *cmd;
+        struct list_head  list;
+
+        /* Timeout related information */
+        struct timer_list timer;
         struct completion tm_done;
-        int     wait_for_comp;
-        unsigned long   start_time;     /* start jiffie */
-        unsigned long   end_time;       /* end jiffie */
-        unsigned long   last_pkt_time;   /* jiffies of last frame received */
-
-        /*
-         * scsi cmd and data transfer information
-         */
-        u32             data_len;
-        /*
-         * transport related veriables
-         */
-        struct fcp_cmnd cdb_cmd;
-        size_t          xfer_len;
-        u16             xfer_ddp;       /* this xfer is ddped */
-        u32             xfer_contig_end; /* offset of end of contiguous xfer */
-        u16             max_payload;    /* max payload size in bytes */
-
-        /*
-         * scsi/fcp return status
-         */
-        u32             io_status;      /* SCSI result upper 24 bits */
-        u8              cdb_status;
-        u8              status_code;    /* FCP I/O status */
-        /* bit 3 Underrun bit 2: overrun */
-        u8              scsi_comp_flags;
-        u32             req_flags;      /* bit 0: read bit:1 write */
-        u32             scsi_resid;     /* residule length */
-
-        struct fc_rport *rport;         /* remote port pointer */
-        struct fc_seq   *seq_ptr;       /* current sequence pointer */
-        /*
-         * Error Processing
-         */
-        u8              recov_retry;    /* count of recovery retries */
-        struct fc_seq   *recov_seq;     /* sequence for REC or SRR */
+        int               wait_for_comp;
+        unsigned long     start_time;
+        unsigned long     end_time;
+        unsigned long     last_pkt_time;
+
+        /* SCSI command and data transfer information */
+        u32               data_len;
+
+        /* Transport related veriables */
+        struct fcp_cmnd   cdb_cmd;
+        size_t            xfer_len;
+        u16               xfer_ddp;
+        u32               xfer_contig_end;
+        u16               max_payload;
+
+        /* SCSI/FCP return status */
+        u32               io_status;
+        u8                cdb_status;
+        u8                status_code;
+        u8                scsi_comp_flags;
+        u32               req_flags;
+        u32               scsi_resid;
+
+        /* Associated structures */
+        struct fc_rport   *rport;
+        struct fc_seq     *seq_ptr;
+
+        /* Error Processing information */
+        u8                recov_retry;
+        struct fc_seq     *recov_seq;
 };
-/*
- * FC_FCP HELPER FUNCTIONS
- *****************************/
-static inline bool fc_fcp_is_read(const struct fc_fcp_pkt *fsp)
-{
-        if (fsp && fsp->cmd)
-                return fsp->cmd->sc_data_direction == DMA_FROM_DEVICE;
-        return false;
-}
 
 /*
  * Structure and function definitions for managing Fibre Channel Exchanges
@@ -350,23 +362,51 @@ static inline bool fc_fcp_is_read(const struct fc_fcp_pkt *fsp)
 
 struct fc_exch_mgr;
 struct fc_exch_mgr_anchor;
-extern u16      fc_cpu_mask;    /* cpu mask for possible cpus */
+extern u16 fc_cpu_mask; /* cpu mask for possible cpus */
 
-/*
- * Sequence.
+/**
+ * struct fc_seq - FC sequence
+ * @id:       The sequence ID
+ * @ssb_stat: Status flags for the sequence status block (SSB)
+ * @cnt:      Number of frames sent so far
+ * @rec_data: FC-4 value for REC
  */
 struct fc_seq {
-        u8      id;             /* seq ID */
-        u16     ssb_stat;       /* status flags for sequence status block */
-        u16     cnt;            /* frames sent so far on sequence */
-        u32     rec_data;       /* FC-4 value for REC */
+        u8  id;
+        u16 ssb_stat;
+        u16 cnt;
+        u32 rec_data;
 };
 
 #define FC_EX_DONE              (1 << 0) /* ep is completed */
 #define FC_EX_RST_CLEANUP       (1 << 1) /* reset is forcing completion */
 
-/*
- * Exchange.
+/**
+ * struct fc_exch - Fibre Channel Exchange
+ * @em:           Exchange manager
+ * @pool:         Exchange pool
+ * @state:        The exchange's state
+ * @xid:          The exchange ID
+ * @ex_list:      Handle used by the EM to track free exchanges
+ * @ex_lock:      Lock that protects the exchange
+ * @ex_refcnt:    Reference count
+ * @timeout_work: Handle for timeout handler
+ * @lp:           The local port that this exchange is on
+ * @oxid:         Originator's exchange ID
+ * @rxid:         Responder's exchange ID
+ * @oid:          Originator's FCID
+ * @sid:          Source FCID
+ * @did:          Destination FCID
+ * @esb_stat:     ESB exchange status
+ * @r_a_tov:      Resouce allocation time out value (in msecs)
+ * @seq_id:       The next sequence ID to use
+ * @f_ctl:        F_CTL flags for the sequence
+ * @fh_type:      The frame type
+ * @class:        The class of service
+ * @seq:          The sequence in use on this exchange
+ * @resp:         Callback for responses on this exchange
+ * @destructor:   Called when destroying the exchange
+ * @arg:          Passed as a void pointer to the resp() callback
  *
  * Locking notes: The ex_lock protects following items:
  *      state, esb_stat, f_ctl, seq.ssb_stat
@@ -374,76 +414,59 @@ struct fc_seq {
  *      sequence allocation
  */
 struct fc_exch {
-        struct fc_exch_mgr *em;         /* exchange manager */
-        struct fc_exch_pool *pool;      /* per cpu exches pool */
-        u32             state;          /* internal driver state */
-        u16             xid;            /* our exchange ID */
-        struct list_head        ex_list;        /* free or busy list linkage */
-        spinlock_t      ex_lock;        /* lock covering exchange state */
-        atomic_t        ex_refcnt;      /* reference counter */
-        struct delayed_work timeout_work; /* timer for upper level protocols */
-        struct fc_lport *lp;            /* fc device instance */
-        u16             oxid;           /* originator's exchange ID */
-        u16             rxid;           /* responder's exchange ID */
-        u32             oid;            /* originator's FCID */
-        u32             sid;            /* source FCID */
-        u32             did;            /* destination FCID */
-        u32             esb_stat;       /* exchange status for ESB */
-        u32             r_a_tov;        /* r_a_tov from rport (msec) */
-        u8              seq_id;         /* next sequence ID to use */
-        u32             f_ctl;          /* F_CTL flags for sequences */
-        u8              fh_type;        /* frame type */
-        enum fc_class   class;          /* class of service */
-        struct fc_seq   seq;            /* single sequence */
-        /*
-         * Handler for responses to this current exchange.
-         */
-        void            (*resp)(struct fc_seq *, struct fc_frame *, void *);
-        void            (*destructor)(struct fc_seq *, void *);
-        /*
-         * arg is passed as void pointer to exchange
-         * resp and destructor handlers
-         */
-        void            *arg;
+        struct fc_exch_mgr  *em;
+        struct fc_exch_pool *pool;
+        u32                 state;
+        u16                 xid;
+        struct list_head    ex_list;
+        spinlock_t          ex_lock;
+        atomic_t            ex_refcnt;
+        struct delayed_work timeout_work;
+        struct fc_lport     *lp;
+        u16                 oxid;
+        u16                 rxid;
+        u32                 oid;
+        u32                 sid;
+        u32                 did;
+        u32                 esb_stat;
+        u32                 r_a_tov;
+        u8                  seq_id;
+        u32                 f_ctl;
+        u8                  fh_type;
+        enum fc_class       class;
+        struct fc_seq       seq;
+
+        void                (*resp)(struct fc_seq *, struct fc_frame *, void *);
+        void                *arg;
+
+        void                (*destructor)(struct fc_seq *, void *);
+
 };
 #define fc_seq_exch(sp) container_of(sp, struct fc_exch, seq)
 
-struct libfc_function_template {
 
+struct libfc_function_template {
         /*
          * Interface to send a FC frame
          *
          * STATUS: REQUIRED
          */
-        int (*frame_send)(struct fc_lport *lp, struct fc_frame *fp);
+        int (*frame_send)(struct fc_lport *, struct fc_frame *);
 
         /*
          * Interface to send ELS/CT frames
          *
          * STATUS: OPTIONAL
          */
-        struct fc_seq *(*elsct_send)(struct fc_lport *lport,
-                                     u32 did,
-                                     struct fc_frame *fp,
-                                     unsigned int op,
+        struct fc_seq *(*elsct_send)(struct fc_lport *, u32 did,
+                                     struct fc_frame *, unsigned int op,
                                      void (*resp)(struct fc_seq *,
-                                             struct fc_frame *fp,
-                                             void *arg),
+                                             struct fc_frame *, void *arg),
                                      void *arg, u32 timer_msec);
 
         /*
          * Send the FC frame payload using a new exchange and sequence.
          *
-         * The frame pointer with some of the header's fields must be
-         * filled before calling exch_seq_send(), those fields are,
-         *
-         * - routing control
-         * - FC port did
-         * - FC port sid
-         * - FC header type
-         * - frame control
-         * - parameter or relative offset
-         *
          * The exchange response handler is set in this routine to resp()
          * function pointer. It can be called in two scenarios: if a timeout
          * occurs or if a response frame is received for the exchange. The
@@ -464,14 +487,13 @@ struct libfc_function_template {
          *
          * STATUS: OPTIONAL
          */
-        struct fc_seq *(*exch_seq_send)(struct fc_lport *lp,
-                                        struct fc_frame *fp,
-                                        void (*resp)(struct fc_seq *sp,
-                                                     struct fc_frame *fp,
-                                                     void *arg),
-                                        void (*destructor)(struct fc_seq *sp,
-                                                           void *arg),
-                                        void *arg, unsigned int timer_msec);
+        struct fc_seq *(*exch_seq_send)(struct fc_lport *, struct fc_frame *,
+                                        void (*resp)(struct fc_seq *,
+                                                     struct fc_frame *,
+                                                     void *),
+                                        void (*destructor)(struct fc_seq *,
+                                                           void *),
+                                        void *, unsigned int timer_msec);
 
         /*
          * Sets up the DDP context for a given exchange id on the given
@@ -479,22 +501,28 @@ struct libfc_function_template {
          *
          * STATUS: OPTIONAL
          */
-        int (*ddp_setup)(struct fc_lport *lp, u16 xid,
-                         struct scatterlist *sgl, unsigned int sgc);
+        int (*ddp_setup)(struct fc_lport *, u16, struct scatterlist *,
+                         unsigned int);
         /*
          * Completes the DDP transfer and returns the length of data DDPed
          * for the given exchange id.
          *
          * STATUS: OPTIONAL
          */
-        int (*ddp_done)(struct fc_lport *lp, u16 xid);
+        int (*ddp_done)(struct fc_lport *, u16);
+        /*
+         * Allow LLD to fill its own Link Error Status Block
+         *
+         * STATUS: OPTIONAL
+         */
+        void (*get_lesb)(struct fc_lport *, struct fc_els_lesb *lesb);
         /*
          * Send a frame using an existing sequence and exchange.
          *
          * STATUS: OPTIONAL
          */
-        int (*seq_send)(struct fc_lport *lp, struct fc_seq *sp,
-                        struct fc_frame *fp);
+        int (*seq_send)(struct fc_lport *, struct fc_seq *,
+                        struct fc_frame *);
 
         /*
          * Send an ELS response using infomation from a previous
@@ -502,8 +530,8 @@ struct libfc_function_template {
          *
          * STATUS: OPTIONAL
          */
-        void (*seq_els_rsp_send)(struct fc_seq *sp, enum fc_els_cmd els_cmd,
-                                 struct fc_seq_els_data *els_data);
+        void (*seq_els_rsp_send)(struct fc_seq *, enum fc_els_cmd,
+                                 struct fc_seq_els_data *);
 
         /*
          * Abort an exchange and sequence. Generally called because of a
@@ -515,7 +543,7 @@ struct libfc_function_template {
          *
          * STATUS: OPTIONAL
          */
-        int (*seq_exch_abort)(const struct fc_seq *req_sp,
+        int (*seq_exch_abort)(const struct fc_seq *,
                               unsigned int timer_msec);
 
         /*
@@ -524,14 +552,14 @@ struct libfc_function_template {
          *
          * STATUS: OPTIONAL
          */
-        void (*exch_done)(struct fc_seq *sp);
+        void (*exch_done)(struct fc_seq *);
 
         /*
          * Start a new sequence on the same exchange/sequence tuple.
          *
          * STATUS: OPTIONAL
          */
-        struct fc_seq *(*seq_start_next)(struct fc_seq *sp);
+        struct fc_seq *(*seq_start_next)(struct fc_seq *);
 
         /*
          * Reset an exchange manager, completing all sequences and exchanges.
@@ -540,8 +568,7 @@ struct libfc_function_template {
          *
          * STATUS: OPTIONAL
          */
-        void (*exch_mgr_reset)(struct fc_lport *,
-                               u32 s_id, u32 d_id);
+        void (*exch_mgr_reset)(struct fc_lport *, u32 s_id, u32 d_id);
 
         /*
          * Flush the rport work queue. Generally used before shutdown.
@@ -555,8 +582,8 @@ struct libfc_function_template {
          *
          * STATUS: OPTIONAL
          */
-        void (*lport_recv)(struct fc_lport *lp, struct fc_seq *sp,
-                           struct fc_frame *fp);
+        void (*lport_recv)(struct fc_lport *, struct fc_seq *,
+                           struct fc_frame *);
 
         /*
          * Reset the local port.
@@ -566,6 +593,26 @@ struct libfc_function_template {
         int (*lport_reset)(struct fc_lport *);
 
         /*
+         * Set the local port FC_ID.
+         *
+         * This may be provided by the LLD to allow it to be
+         * notified when the local port is assigned a FC-ID.
+         *
+         * The frame, if non-NULL, is the incoming frame with the
+         * FLOGI LS_ACC or FLOGI, and may contain the granted MAC
+         * address for the LLD.  The frame pointer may be NULL if
+         * no MAC is associated with this assignment (LOGO or PLOGI).
+         *
+         * If FC_ID is non-zero, r_a_tov and e_d_tov must be valid.
+         *
+         * Note: this is called with the local port mutex held.
+         *
+         * STATUS: OPTIONAL
+         */
+        void (*lport_set_port_id)(struct fc_lport *, u32 port_id,
+                                  struct fc_frame *);
+
+        /*
          * Create a remote port with a given port ID
          *
          * STATUS: OPTIONAL
@@ -622,31 +669,31 @@ struct libfc_function_template {
          *
          * STATUS: OPTIONAL
          */
-        int (*fcp_cmd_send)(struct fc_lport *lp, struct fc_fcp_pkt *fsp,
-                            void (*resp)(struct fc_seq *, struct fc_frame *fp,
-                                         void *arg));
+        int (*fcp_cmd_send)(struct fc_lport *, struct fc_fcp_pkt *,
+                            void (*resp)(struct fc_seq *, struct fc_frame *,
+                                         void *));
 
         /*
          * Cleanup the FCP layer, used durring link down and reset
          *
          * STATUS: OPTIONAL
          */
-        void (*fcp_cleanup)(struct fc_lport *lp);
+        void (*fcp_cleanup)(struct fc_lport *);
 
         /*
          * Abort all I/O on a local port
          *
          * STATUS: OPTIONAL
          */
-        void (*fcp_abort_io)(struct fc_lport *lp);
+        void (*fcp_abort_io)(struct fc_lport *);
 
         /*
          * Receive a request for the discovery layer.
          *
          * STATUS: OPTIONAL
          */
-        void (*disc_recv_req)(struct fc_seq *,
-                              struct fc_frame *, struct fc_lport *);
+        void (*disc_recv_req)(struct fc_seq *, struct fc_frame *,
+                              struct fc_lport *);
 
         /*
          * Start discovery for a local port.
@@ -675,419 +722,340 @@ struct libfc_function_template {
         void (*disc_stop_final) (struct fc_lport *);
 };
 
-/* information used by the discovery layer */
+/**
+ * struct fc_disc - Discovery context
+ * @retry_count:   Number of retries
+ * @pending:       1 if discovery is pending, 0 if not
+ * @requesting:    1 if discovery has been requested, 0 if not
+ * @seq_count:     Number of sequences used for discovery
+ * @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
+ * @disc_mutex:    Mutex that protects the discovery context
+ * @partial_buf:   Partial name buffer (if names are returned
+ *                 in multiple frames)
+ * @disc_work:     handle for delayed work context
+ * @disc_callback: Callback routine called when discovery completes
+ */
 struct fc_disc {
-        unsigned char           retry_count;
-        unsigned char           pending;
-        unsigned char           requested;
-        unsigned short          seq_count;
-        unsigned char           buf_len;
-        u16                     disc_id;
+        unsigned char         retry_count;
+        unsigned char         pending;
+        unsigned char         requested;
+        unsigned short        seq_count;
+        unsigned char         buf_len;
+        u16                   disc_id;
+
+        struct list_head      rports;
+        struct fc_lport       *lport;
+        struct mutex          disc_mutex;
+        struct fc_gpn_ft_resp partial_buf;
+        struct delayed_work   disc_work;
 
         void (*disc_callback)(struct fc_lport *,
                               enum fc_disc_event);
-
-        struct list_head         rports;
-        struct fc_lport         *lport;
-        struct mutex            disc_mutex;
-        struct fc_gpn_ft_resp   partial_buf;    /* partial name buffer */
-        struct delayed_work     disc_work;
 };
 
+/**
+ * struct fc_lport - Local port
+ * @host:                  The SCSI host associated with a local port
+ * @ema_list:              Exchange manager anchor list
+ * @dns_rdata:             The directory server remote port
+ * @ptp_rdata:             Point to point remote port
+ * @scsi_priv:             FCP layer internal data
+ * @disc:                  Discovery context
+ * @vports:                Child vports if N_Port
+ * @vport:                 Parent vport if VN_Port
+ * @tt:                    Libfc function template
+ * @link_up:               Link state (1 = link up, 0 = link down)
+ * @qfull:                 Queue state (1 queue is full, 0 queue is not full)
+ * @state:                 Identifies the state
+ * @boot_time:             Timestamp indicating when the local port came online
+ * @host_stats:            SCSI host statistics
+ * @dev_stats:             FCoE device stats (TODO: libfc should not be
+ *                         FCoE aware)
+ * @retry_count:           Number of retries in the current state
+ * @wwpn:                  World Wide Port Name
+ * @wwnn:                  World Wide Node Name
+ * @service_params:        Common service parameters
+ * @e_d_tov:               Error detection timeout value
+ * @r_a_tov:               Resouce allocation timeout value
+ * @rnid_gen:              RNID information
+ * @sg_supp:               Indicates if scatter gather is supported
+ * @seq_offload:           Indicates if sequence offload is supported
+ * @crc_offload:           Indicates if CRC offload is supported
+ * @lro_enabled:           Indicates if large receive offload is supported
+ * @does_npiv:             Supports multiple vports
+ * @npiv_enabled:          Switch/fabric allows NPIV
+ * @mfs:                   The maximum Fibre Channel payload size
+ * @max_retry_count:       The maximum retry attempts
+ * @max_rport_retry_count: The maximum remote port retry attempts
+ * @lro_xid:               The maximum XID for LRO
+ * @lso_max:               The maximum large offload send size
+ * @fcts:                  FC-4 type mask
+ * @lp_mutex:              Mutex to protect the local port
+ * @list:                  Handle for list of local ports
+ * @retry_work:            Handle to local port for delayed retry context
+ */
 struct fc_lport {
-        struct list_head list;
-
         /* Associations */
-        struct Scsi_Host        *host;
-        struct list_head        ema_list;
-        struct fc_rport_priv    *dns_rp;
-        struct fc_rport_priv    *ptp_rp;
-        void                    *scsi_priv;
-        struct fc_disc          disc;
+        struct Scsi_Host               *host;
+        struct list_head               ema_list;
+        struct fc_rport_priv           *dns_rdata;
+        struct fc_rport_priv           *ptp_rdata;
+        void                           *scsi_priv;
+        struct fc_disc                 disc;
+
+        /* Virtual port information */
+        struct list_head               vports;
+        struct fc_vport                *vport;
 
         /* Operational Information */
         struct libfc_function_template tt;
-        u8                      link_up;
-        u8                      qfull;
-        enum fc_lport_state     state;
-        unsigned long           boot_time;
-
-        struct fc_host_statistics host_stats;
-        struct fcoe_dev_stats   *dev_stats;
-
-        u64                     wwpn;
-        u64                     wwnn;
-        u8                      retry_count;
+        u8                             link_up;
+        u8                             qfull;
+        enum fc_lport_state            state;
+        unsigned long                  boot_time;
+        struct fc_host_statistics      host_stats;
+        struct fcoe_dev_stats          *dev_stats;
+        u8                             retry_count;
+
+        /* Fabric information */
+        u64                            wwpn;
+        u64                            wwnn;
+        unsigned int                   service_params;
+        unsigned int                   e_d_tov;
+        unsigned int                   r_a_tov;
+        struct fc_els_rnid_gen         rnid_gen;
 
         /* Capabilities */
-        u32                     sg_supp:1;      /* scatter gather supported */
-        u32                     seq_offload:1;  /* seq offload supported */
-        u32                     crc_offload:1;  /* crc offload supported */
-        u32                     lro_enabled:1;  /* large receive offload */
-        u32                     mfs;            /* max FC payload size */
-        unsigned int            service_params;
-        unsigned int            e_d_tov;
-        unsigned int            r_a_tov;
-        u8                      max_retry_count;
-        u8                      max_rport_retry_count;
-        u16                     link_speed;
-        u16                     link_supported_speeds;
-        u16                     lro_xid;        /* max xid for fcoe lro */
-        unsigned int            lso_max;        /* max large send size */
-        struct fc_ns_fts        fcts;           /* FC-4 type masks */
-        struct fc_els_rnid_gen  rnid_gen;       /* RNID information */
-
-        /* Semaphores */
-        struct mutex lp_mutex;
+        u32                            sg_supp:1;
+        u32                            seq_offload:1;
+        u32                            crc_offload:1;
+        u32                            lro_enabled:1;
+        u32                            does_npiv:1;
+        u32                            npiv_enabled:1;
+        u32                            mfs;
+        u8                             max_retry_count;
+        u8                             max_rport_retry_count;
+        u16                            link_speed;
+        u16                            link_supported_speeds;
+        u16                            lro_xid;
+        unsigned int                   lso_max;
+        struct fc_ns_fts               fcts;
 
         /* Miscellaneous */
-        struct delayed_work     retry_work;
-        struct delayed_work     disc_work;
+        struct mutex                   lp_mutex;
+        struct list_head               list;
+        struct delayed_work            retry_work;
 };
 
 /*
  * FC_LPORT HELPER FUNCTIONS
  *****************************/
-static inline int fc_lport_test_ready(struct fc_lport *lp)
+
+/**
+ * fc_lport_test_ready() - Determine if a local port is in the READY state
+ * @lport: The local port to test
+ */
+static inline int fc_lport_test_ready(struct fc_lport *lport)
 {
-        return lp->state == LPORT_ST_READY;
+        return lport->state == LPORT_ST_READY;
 }
 
-static inline void fc_set_wwnn(struct fc_lport *lp, u64 wwnn)
+/**
+ * fc_set_wwnn() - Set the World Wide Node Name of a local port
+ * @lport: The local port whose WWNN is to be set
+ * @wwnn:  The new WWNN
+ */
+static inline void fc_set_wwnn(struct fc_lport *lport, u64 wwnn)
 {
-        lp->wwnn = wwnn;
+        lport->wwnn = wwnn;
 }
 
-static inline void fc_set_wwpn(struct fc_lport *lp, u64 wwnn)
+/**
+ * fc_set_wwpn() - Set the World Wide Port Name of a local port
+ * @lport: The local port whose WWPN is to be set
+ * @wwnn:  The new WWPN
+ */
+static inline void fc_set_wwpn(struct fc_lport *lport, u64 wwnn)
 {
-        lp->wwpn = wwnn;
+        lport->wwpn = wwnn;
 }
 
-static inline void fc_lport_state_enter(struct fc_lport *lp,
+/**
+ * fc_lport_state_enter() - Change a local port's state
+ * @lport: The local port whose state is to change
+ * @state: The new state
+ */
+static inline void fc_lport_state_enter(struct fc_lport *lport,
                                         enum fc_lport_state state)
 {
-        if (state != lp->state)
-                lp->retry_count = 0;
-        lp->state = state;
+        if (state != lport->state)
+                lport->retry_count = 0;
+        lport->state = state;
 }
 
-static inline int fc_lport_init_stats(struct fc_lport *lp)
+/**
+ * fc_lport_init_stats() - Allocate per-CPU statistics for a local port
+ * @lport: The local port whose statistics are to be initialized
+ */
+static inline int fc_lport_init_stats(struct fc_lport *lport)
 {
-        /* allocate per cpu stats block */
-        lp->dev_stats = alloc_percpu(struct fcoe_dev_stats);
-        if (!lp->dev_stats)
+        lport->dev_stats = alloc_percpu(struct fcoe_dev_stats);
+        if (!lport->dev_stats)
                 return -ENOMEM;
         return 0;
 }
 
-static inline void fc_lport_free_stats(struct fc_lport *lp)
+/**
+ * fc_lport_free_stats() - Free memory for a local port's statistics
+ * @lport: The local port whose statistics are to be freed
+ */
+static inline void fc_lport_free_stats(struct fc_lport *lport)
 {
-        free_percpu(lp->dev_stats);
+        free_percpu(lport->dev_stats);
 }
 
-static inline struct fcoe_dev_stats *fc_lport_get_stats(struct fc_lport *lp)
+/**
+ * fc_lport_get_stats() - Get a local port's statistics
+ * @lport: The local port whose statistics are to be retreived
+ */
+static inline struct fcoe_dev_stats *fc_lport_get_stats(struct fc_lport *lport)
 {
-        return per_cpu_ptr(lp->dev_stats, smp_processor_id());
+        return per_cpu_ptr(lport->dev_stats, smp_processor_id());
 }
 
-static inline void *lport_priv(const struct fc_lport *lp)
+/**
+ * lport_priv() - Return the private data from a local port
+ * @lport: The local port whose private data is to be retreived
+ */
+static inline void *lport_priv(const struct fc_lport *lport)
 {
-        return (void *)(lp + 1);
+        return (void *)(lport + 1);
 }
 
 /**
- * libfc_host_alloc() - Allocate a Scsi_Host with room for the fc_lport
- * @sht: ptr to the scsi host templ
- * @priv_size: size of private data after fc_lport
+ * libfc_host_alloc() - Allocate a Scsi_Host with room for a local port and
+ *                      LLD private data
+ * @sht:       The SCSI host template
+ * @priv_size: Size of private data
  *
- * Returns: ptr to Scsi_Host
+ * Returns: libfc lport
  */
-static inline struct Scsi_Host *
+static inline struct fc_lport *
 libfc_host_alloc(struct scsi_host_template *sht, int priv_size)
 {
-        return scsi_host_alloc(sht, sizeof(struct fc_lport) + priv_size);
+        struct fc_lport *lport;
+        struct Scsi_Host *shost;
+
+        shost = scsi_host_alloc(sht, sizeof(*lport) + priv_size);
+        if (!shost)
+                return NULL;
+        lport = shost_priv(shost);
+        lport->host = shost;
+        INIT_LIST_HEAD(&lport->ema_list);
+        INIT_LIST_HEAD(&lport->vports);
+        return lport;
 }
 
 /*
- * LOCAL PORT LAYER
+ * FC_FCP HELPER FUNCTIONS
  *****************************/
-int fc_lport_init(struct fc_lport *lp);
-
-/*
- * Destroy the specified local port by finding and freeing all
- * fc_rports associated with it and then by freeing the fc_lport
- * itself.
- */
-int fc_lport_destroy(struct fc_lport *lp);
-
-/*
- * Logout the specified local port from the fabric
- */
-int fc_fabric_logoff(struct fc_lport *lp);
-
-/*
- * Initiate the LP state machine. This handler will use fc_host_attr
- * to store the FLOGI service parameters, so fc_host_attr must be
- * initialized before calling this handler.
- */
-int fc_fabric_login(struct fc_lport *lp);
+static inline bool fc_fcp_is_read(const struct fc_fcp_pkt *fsp)
+{
+        if (fsp && fsp->cmd)
+                return fsp->cmd->sc_data_direction == DMA_FROM_DEVICE;
+        return false;
+}
 
 /*
- * The link is up for the given local port.
- */
+ * LOCAL PORT LAYER
+ *****************************/
+int fc_lport_init(struct fc_lport *);
+int fc_lport_destroy(struct fc_lport *);
+int fc_fabric_logoff(struct fc_lport *);
+int fc_fabric_login(struct fc_lport *);
+void __fc_linkup(struct fc_lport *);
 void fc_linkup(struct fc_lport *);
-
-/*
- * Link is down for the given local port.
- */
+void __fc_linkdown(struct fc_lport *);
 void fc_linkdown(struct fc_lport *);
-
-/*
- * Configure the local port.
- */
+void fc_vport_setlink(struct fc_lport *);
+void fc_vports_linkchange(struct fc_lport *);
 int fc_lport_config(struct fc_lport *);
-
-/*
- * Reset the local port.
- */
 int fc_lport_reset(struct fc_lport *);
-
-/*
- * Set the mfs or reset
- */
-int fc_set_mfs(struct fc_lport *lp, u32 mfs);
-
+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 *);
 
 /*
  * REMOTE PORT LAYER
  *****************************/
-int fc_rport_init(struct fc_lport *lp);
-void fc_rport_terminate_io(struct fc_rport *rp);
+int fc_rport_init(struct fc_lport *);
+void fc_rport_terminate_io(struct fc_rport *);
 
 /*
  * DISCOVERY LAYER
  *****************************/
-int fc_disc_init(struct fc_lport *lp);
-
+int fc_disc_init(struct fc_lport *);
 
 /*
- * SCSI LAYER
+ * FCP LAYER
  *****************************/
-/*
- * Initialize the SCSI block of libfc
- */
 int fc_fcp_init(struct fc_lport *);
-
-/*
- * This section provides an API which allows direct interaction
- * with the SCSI-ml. Each of these functions satisfies a function
- * pointer defined in Scsi_Host and therefore is always called
- * directly from the SCSI-ml.
- */
-int fc_queuecommand(struct scsi_cmnd *sc_cmd,
-                    void (*done)(struct scsi_cmnd *));
-
-/*
- * complete processing of a fcp packet
- *
- * This function may sleep if a fsp timer is pending.
- * The host lock must not be held by caller.
- */
-void fc_fcp_complete(struct fc_fcp_pkt *fsp);
-
-/*
- * Send an ABTS frame to the target device. The sc_cmd argument
- * is a pointer to the SCSI command to be aborted.
- */
-int fc_eh_abort(struct scsi_cmnd *sc_cmd);
-
-/*
- * Reset a LUN by sending send the tm cmd to the target.
- */
-int fc_eh_device_reset(struct scsi_cmnd *sc_cmd);
-
-/*
- * Reset the host adapter.
- */
-int fc_eh_host_reset(struct scsi_cmnd *sc_cmd);
-
-/*
- * Check rport status.
- */
-int fc_slave_alloc(struct scsi_device *sdev);
-
-/*
- * Adjust the queue depth.
- */
-int fc_change_queue_depth(struct scsi_device *sdev, int qdepth);
-
-/*
- * Change the tag type.
- */
-int fc_change_queue_type(struct scsi_device *sdev, int tag_type);
-
-/*
- * Free memory pools used by the FCP layer.
- */
 void fc_fcp_destroy(struct fc_lport *);
 
 /*
- * Set up direct-data placement for this I/O request
- */
-void fc_fcp_ddp_setup(struct fc_fcp_pkt *fsp, u16 xid);
+ * SCSI INTERACTION LAYER
+ *****************************/
+int fc_queuecommand(struct scsi_cmnd *,
+                    void (*done)(struct scsi_cmnd *));
+int fc_eh_abort(struct scsi_cmnd *);
+int fc_eh_device_reset(struct scsi_cmnd *);
+int fc_eh_host_reset(struct scsi_cmnd *);
+int fc_slave_alloc(struct scsi_device *);
+int fc_change_queue_depth(struct scsi_device *, int qdepth, int reason);
+int fc_change_queue_type(struct scsi_device *, int tag_type);
 
 /*
  * ELS/CT interface
  *****************************/
-/*
- * Initializes ELS/CT interface
- */
-int fc_elsct_init(struct fc_lport *lp);
+int fc_elsct_init(struct fc_lport *);
+struct fc_seq *fc_elsct_send(struct fc_lport *, u32 did,
+                                    struct fc_frame *,
+                                    unsigned int op,
+                                    void (*resp)(struct fc_seq *,
+                                                 struct fc_frame *,
+                                                 void *arg),
+                                    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 *);
 
 
 /*
  * EXCHANGE MANAGER LAYER
  *****************************/
-/*
- * Initializes Exchange Manager related
- * function pointers in struct libfc_function_template.
- */
-int fc_exch_init(struct fc_lport *lp);
-
-/*
- * Adds Exchange Manager (EM) mp to lport.
- *
- * Adds specified mp to lport using struct fc_exch_mgr_anchor,
- * the struct fc_exch_mgr_anchor allows same EM sharing by
- * more than one lport with their specified match function,
- * the match function is used in allocating exchange from
- * added mp.
- */
-struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *lport,
-                                           struct fc_exch_mgr *mp,
+int fc_exch_init(struct fc_lport *);
+struct fc_exch_mgr_anchor *fc_exch_mgr_add(struct fc_lport *,
+                                           struct fc_exch_mgr *,
                                            bool (*match)(struct fc_frame *));
-
-/*
- * Deletes Exchange Manager (EM) from lport by removing
- * its anchor ema from lport.
- *
- * If removed anchor ema was the last user of its associated EM
- * then also destroys associated EM.
- */
-void fc_exch_mgr_del(struct fc_exch_mgr_anchor *ema);
-
-/*
- * Allocates an Exchange Manager (EM).
- *
- * The EM manages exchanges for their allocation and
- * free, also allows exchange lookup for received
- * frame.
- *
- * The class is used for initializing FC class of
- * allocated exchange from EM.
- *
- * The min_xid and max_xid will limit new
- * exchange ID (XID) within this range for
- * a new exchange.
- * The LLD may choose to have multiple EMs,
- * e.g. one EM instance per CPU receive thread in LLD.
- *
- * Specified match function is used in allocating exchanges
- * from newly allocated EM.
- */
-struct fc_exch_mgr *fc_exch_mgr_alloc(struct fc_lport *lp,
-                                      enum fc_class class,
-                                      u16 min_xid,
-                                      u16 max_xid,
+void fc_exch_mgr_del(struct fc_exch_mgr_anchor *);
+int fc_exch_mgr_list_clone(struct fc_lport *src, struct fc_lport *dst);
+struct fc_exch_mgr *fc_exch_mgr_alloc(struct fc_lport *, enum fc_class class,
+                                      u16 min_xid, u16 max_xid,
                                       bool (*match)(struct fc_frame *));
-
-/*
- * Free all exchange managers of a lport.
- */
-void fc_exch_mgr_free(struct fc_lport *lport);
-
-/*
- * Receive a frame on specified local port and exchange manager.
- */
-void fc_exch_recv(struct fc_lport *lp, struct fc_frame *fp);
-
-/*
- * This function is for exch_seq_send function pointer in
- * struct libfc_function_template, see comment block on
- * exch_seq_send for description of this function.
- */
-struct fc_seq *fc_exch_seq_send(struct fc_lport *lp,
-                                struct fc_frame *fp,
-                                void (*resp)(struct fc_seq *sp,
-                                             struct fc_frame *fp,
-                                             void *arg),
-                                void (*destructor)(struct fc_seq *sp,
-                                                   void *arg),
-                                void *arg, u32 timer_msec);
-
-/*
- * send a frame using existing sequence and exchange.
- */
-int fc_seq_send(struct fc_lport *lp, struct fc_seq *sp, struct fc_frame *fp);
-
-/*
- * Send ELS response using mainly infomation
- * in exchange and sequence in EM layer.
- */
-void fc_seq_els_rsp_send(struct fc_seq *sp, enum fc_els_cmd els_cmd,
-                         struct fc_seq_els_data *els_data);
-
-/*
- * This function is for seq_exch_abort function pointer in
- * struct libfc_function_template, see comment block on
- * seq_exch_abort for description of this function.
- */
-int fc_seq_exch_abort(const struct fc_seq *req_sp, unsigned int timer_msec);
-
-/*
- * Indicate that an exchange/sequence tuple is complete and the memory
- * allocated for the related objects may be freed.
- */
-void fc_exch_done(struct fc_seq *sp);
-
-/*
- * Allocate a new exchange and sequence pair.
- */
-struct fc_exch *fc_exch_alloc(struct fc_lport *lport, struct fc_frame *fp);
-/*
- * Start a new sequence on the same exchange as the supplied sequence.
- */
-struct fc_seq *fc_seq_start_next(struct fc_seq *sp);
-
-
-/*
- * Reset all EMs of a lport, releasing its all sequences and
- * exchanges. If sid is non-zero, then reset only exchanges
- * we sourced from that FID. If did is non-zero, reset only
- * exchanges destined to that FID.
- */
+void fc_exch_mgr_free(struct fc_lport *);
+void fc_exch_recv(struct fc_lport *, struct fc_frame *);
 void fc_exch_mgr_reset(struct fc_lport *, u32 s_id, u32 d_id);
 
 /*
  * Functions for fc_functions_template
  */
-void fc_get_host_speed(struct Scsi_Host *shost);
-void fc_get_host_port_type(struct Scsi_Host *shost);
-void fc_get_host_port_state(struct Scsi_Host *shost);
-void fc_set_rport_loss_tmo(struct fc_rport *rport, u32 timeout);
+void fc_get_host_speed(struct Scsi_Host *);
+void fc_get_host_port_type(struct Scsi_Host *);
+void fc_get_host_port_state(struct Scsi_Host *);
+void fc_set_rport_loss_tmo(struct fc_rport *, u32 timeout);
 struct fc_host_statistics *fc_get_host_stats(struct Scsi_Host *);
 
-/*
- * module setup functions.
- */
-int fc_setup_exch_mgr(void);
-void fc_destroy_exch_mgr(void);
-int fc_setup_rport(void);
-void fc_destroy_rport(void);
-
-/*
- * Internal libfc functions.
- */
-const char *fc_els_resp_type(struct fc_frame *);
-
 #endif /* _LIBFC_H_ */
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index b2410605b74..c603f4a7e7f 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -53,33 +53,36 @@ enum fip_state {
 };
 
 /**
- * struct fcoe_ctlr - FCoE Controller and FIP state.
- * @state:      internal FIP state for network link and FIP or non-FIP mode.
- * @lp:         &fc_lport: libfc local port.
- * @sel_fcf:    currently selected FCF, or NULL.
- * @fcfs:       list of discovered FCFs.
- * @fcf_count:  number of discovered FCF entries.
- * @sol_time:   time when a multicast solicitation was last sent.
- * @sel_time:   time after which to select an FCF.
- * @port_ka_time: time of next port keep-alive.
- * @ctlr_ka_time: time of next controller keep-alive.
- * @timer:      timer struct used for all delayed events.
- * @link_work:  &work_struct for doing FCF selection.
- * @recv_work:  &work_struct for receiving FIP frames.
+ * struct fcoe_ctlr - FCoE Controller and FIP state
+ * @state:         internal FIP state for network link and FIP or non-FIP mode.
+ * @mode:          LLD-selected mode.
+ * @lp:            &fc_lport: libfc local port.
+ * @sel_fcf:       currently selected FCF, or NULL.
+ * @fcfs:          list of discovered FCFs.
+ * @fcf_count:     number of discovered FCF entries.
+ * @sol_time:      time when a multicast solicitation was last sent.
+ * @sel_time:      time after which to select an FCF.
+ * @port_ka_time:  time of next port keep-alive.
+ * @ctlr_ka_time:  time of next controller keep-alive.
+ * @timer:         timer struct used for all delayed events.
+ * @link_work:     &work_struct for doing FCF selection.
+ * @recv_work:     &work_struct for receiving FIP frames.
  * @fip_recv_list: list of received FIP frames.
- * @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.
- * @link:       current link status for libfc.
- * @last_link:  last link state reported to libfc.
- * @map_dest:   use the FC_MAP mode for destination MAC addresses.
- * @spma:       supports SPMA server-provided MACs mode
- * @dest_addr:  MAC address of the selected FC forwarder.
- * @ctl_src_addr: the native MAC address of our local port.
- * @data_src_addr: the assigned MAC address for the local port after FLOGI.
- * @send:       LLD-supplied function to handle sending of FIP Ethernet frames.
- * @update_mac: LLD-supplied function to handle changes to MAC addresses.
- * @lock:       lock protecting this structure.
+ * @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.
+ * @link:          current link status for libfc.
+ * @last_link:     last link state reported to libfc.
+ * @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
+ * @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.
  *
  * This structure is used by all FCoE drivers.  It contains information
  * needed by all FCoE low-level drivers (LLDs) as well as internal state
@@ -87,6 +90,7 @@ enum fip_state {
  */
 struct fcoe_ctlr {
         enum fip_state state;
+        enum fip_state mode;
         struct fc_lport *lp;
         struct fcoe_fcf *sel_fcf;
         struct list_head fcfs;
@@ -104,29 +108,32 @@ struct fcoe_ctlr {
         u8 flogi_count;
         u8 link;
         u8 last_link;
+        u8 reset_req;
         u8 map_dest;
         u8 spma;
+        u8 send_ctlr_ka;
+        u8 send_port_ka;
         u8 dest_addr[ETH_ALEN];
         u8 ctl_src_addr[ETH_ALEN];
-        u8 data_src_addr[ETH_ALEN];
 
         void (*send)(struct fcoe_ctlr *, struct sk_buff *);
-        void (*update_mac)(struct fcoe_ctlr *, u8 *old, u8 *new);
+        void (*update_mac)(struct fc_lport *, u8 *addr);
+        u8 * (*get_src_addr)(struct fc_lport *);
         spinlock_t lock;
 };
 
-/*
- * struct fcoe_fcf - Fibre-Channel Forwarder.
- * @list:       list linkage.
- * @time:       system time (jiffies) when an advertisement was last received.
- * @switch_name: WWN of switch from advertisement.
- * @fabric_name: WWN of fabric from advertisement.
- * @fc_map:     FC_MAP value from advertisement.
- * @fcf_mac:    Ethernet address of the FCF.
- * @vfid:       virtual fabric ID.
- * @pri:        seletion priority, smaller values are better.
- * @flags:      flags received from advertisement.
- * @fka_period: keep-alive period, in jiffies.
+/**
+ * struct fcoe_fcf - Fibre-Channel Forwarder
+ * @list:        list linkage
+ * @time:        system time (jiffies) when an advertisement was last received
+ * @switch_name: WWN of switch from advertisement
+ * @fabric_name: WWN of fabric from advertisement
+ * @fc_map:      FC_MAP value from advertisement
+ * @fcf_mac:     Ethernet address of the FCF
+ * @vfid:        virtual fabric ID
+ * @pri:         selection priority, smaller values are better
+ * @flags:       flags received from advertisement
+ * @fka_period:  keep-alive period, in jiffies
  *
  * A Fibre-Channel Forwarder (FCF) is the entity on the Ethernet that
  * passes FCoE frames on to an FC fabric.  This structure represents
@@ -148,6 +155,7 @@ struct fcoe_fcf {
         u8 pri;
         u16 flags;
         u32 fka_period;
+        u8 fd_flags:1;
 };
 
 /* FIP API functions */
@@ -155,9 +163,10 @@ void fcoe_ctlr_init(struct fcoe_ctlr *);
 void fcoe_ctlr_destroy(struct fcoe_ctlr *);
 void fcoe_ctlr_link_up(struct fcoe_ctlr *);
 int fcoe_ctlr_link_down(struct fcoe_ctlr *);
-int fcoe_ctlr_els_send(struct fcoe_ctlr *, struct sk_buff *);
+int fcoe_ctlr_els_send(struct fcoe_ctlr *, struct fc_lport *, struct sk_buff *);
 void fcoe_ctlr_recv(struct fcoe_ctlr *, struct sk_buff *);
-int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_frame *fp, u8 *sa);
+int fcoe_ctlr_recv_flogi(struct fcoe_ctlr *, struct fc_lport *,
+                         struct fc_frame *);
 
 /* libfcoe funcs */
 u64 fcoe_wwn_from_mac(unsigned char mac[], unsigned int, unsigned int);
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index a72edd4ecee..7394e3bc8f4 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -267,6 +267,7 @@ struct iscsi_session {
         /* configuration */
         int                     abort_timeout;
         int                     lu_reset_timeout;
+        int                     tgt_reset_timeout;
         int                     initial_r2t_en;
         unsigned                max_r2t;
         int                     imm_data_en;
@@ -333,7 +334,8 @@ struct iscsi_host {
 /*
  * scsi host template
  */
-extern int iscsi_change_queue_depth(struct scsi_device *sdev, int depth);
+extern int iscsi_change_queue_depth(struct scsi_device *sdev, int depth,
+                                    int reason);
 extern int iscsi_eh_abort(struct scsi_cmnd *sc);
 extern int iscsi_eh_target_reset(struct scsi_cmnd *sc);
 extern int iscsi_eh_device_reset(struct scsi_cmnd *sc);
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index e78d3b62d8e..9eaa3f05f95 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -634,7 +634,8 @@ extern int sas_target_alloc(struct scsi_target *);
 extern int sas_slave_alloc(struct scsi_device *);
 extern int sas_slave_configure(struct scsi_device *);
 extern void sas_slave_destroy(struct scsi_device *);
-extern int sas_change_queue_depth(struct scsi_device *, int new_depth);
+extern int sas_change_queue_depth(struct scsi_device *, int new_depth,
+                                  int reason);
 extern int sas_change_queue_type(struct scsi_device *, int qt);
 extern int sas_bios_param(struct scsi_device *,
                           struct block_device *,
diff --git a/include/scsi/osd_initiator.h b/include/scsi/osd_initiator.h
index 02bd9f71635..39d6d109715 100644
--- a/include/scsi/osd_initiator.h
+++ b/include/scsi/osd_initiator.h
@@ -48,7 +48,6 @@ enum osd_std_version {
  */
 struct osd_dev {
         struct scsi_device *scsi_device;
-        struct file *file;
         unsigned def_timeout;
 
 #ifdef OSD_VER1_SUPPORT
@@ -56,10 +55,24 @@ struct osd_dev {
 #endif
 };
 
-/* Retrieve/return osd_dev(s) for use by Kernel clients */
-struct osd_dev *osduld_path_lookup(const char *dev_name); /*Use IS_ERR/ERR_PTR*/
+/* Unique Identification of an OSD device */
+struct osd_dev_info {
+        unsigned systemid_len;
+        u8 systemid[OSD_SYSTEMID_LEN];
+        unsigned osdname_len;
+        u8 *osdname;
+};
+
+/* Retrieve/return osd_dev(s) for use by Kernel clients
+ * Use IS_ERR/ERR_PTR on returned "osd_dev *".
+ */
+struct osd_dev *osduld_path_lookup(const char *dev_name);
+struct osd_dev *osduld_info_lookup(const struct osd_dev_info *odi);
 void osduld_put_device(struct osd_dev *od);
 
+const struct osd_dev_info *osduld_device_info(struct osd_dev *od);
+bool osduld_device_same(struct osd_dev *od, const struct osd_dev_info *odi);
+
 /* Add/remove test ioctls from external modules */
 typedef int (do_test_fn)(struct osd_dev *od, unsigned cmd, unsigned long arg);
 int osduld_register_test(unsigned ioctl, do_test_fn *do_test);
@@ -69,8 +82,24 @@ void osduld_unregister_test(unsigned ioctl);
 void osd_dev_init(struct osd_dev *od, struct scsi_device *scsi_device);
 void osd_dev_fini(struct osd_dev *od);
 
-/* some hi level device operations */
-int osd_auto_detect_ver(struct osd_dev *od, void *caps);    /* GFP_KERNEL */
+/**
+ * osd_auto_detect_ver - Detect the OSD version, return Unique Identification
+ *
+ * @od:     OSD target lun handle
+ * @caps:   Capabilities authorizing OSD root read attributes access
+ * @odi:    Retrieved information uniquely identifying the osd target lun
+ *          Note: odi->osdname must be kfreed by caller.
+ *
+ * Auto detects the OSD version of the OSD target and sets the @od
+ * accordingly. Meanwhile also returns the "system id" and "osd name" root
+ * attributes which uniquely identify the OSD target. This member is usually
+ * called by the ULD. ULD users should call osduld_device_info().
+ * This rutine allocates osd requests and memory at GFP_KERNEL level and might
+ * sleep.
+ */
+int osd_auto_detect_ver(struct osd_dev *od,
+        void *caps, struct osd_dev_info *odi);
+
 static inline struct request_queue *osd_request_queue(struct osd_dev *od)
 {
         return od->scsi_device->request_queue;
@@ -84,6 +113,15 @@ static inline void osd_dev_set_ver(struct osd_dev *od, enum osd_std_version v)
 #endif
 }
 
+static inline bool osd_dev_is_ver1(struct osd_dev *od)
+{
+#ifdef OSD_VER1_SUPPORT
+        return od->version == OSD_VER1;
+#else
+        return false;
+#endif
+}
+
 struct osd_request;
 typedef void (osd_req_done_fn)(struct osd_request *or, void *private);
 
@@ -120,14 +158,9 @@ struct osd_request {
         int async_error;
 };
 
-/* OSD Version control */
 static inline bool osd_req_is_ver1(struct osd_request *or)
 {
-#ifdef OSD_VER1_SUPPORT
-        return or->osd_dev->version == OSD_VER1;
-#else
-        return false;
-#endif
+        return osd_dev_is_ver1(or->osd_dev);
 }
 
 /*
@@ -234,7 +267,7 @@ int osd_execute_request_async(struct osd_request *or,
  * @bad_attr_list - List of failing attributes (optional)
  * @max_attr      - Size of @bad_attr_list.
  *
- * After execution, sense + return code can be analyzed using this function. The
+ * After execution, osd_request results are analyzed using this function. The
  * return code is the final disposition on the error. So it is possible that a
  * CHECK_CONDITION was returned from target but this will return NO_ERROR, for
  * example on recovered errors. All parameters are optional if caller does
@@ -243,7 +276,31 @@ int osd_execute_request_async(struct osd_request *or,
  * of the SCSI_OSD_DPRINT_SENSE Kconfig value. Set @silent if you know the
  * command would routinely fail, to not spam the dmsg file.
  */
+
+/**
+ * osd_err_priority - osd categorized return codes in ascending severity.
+ *
+ * The categories are borrowed from the pnfs_osd_errno enum.
+ * See comments for translated Linux codes returned by osd_req_decode_sense.
+ */
+enum osd_err_priority {
+        OSD_ERR_PRI_NO_ERROR    = 0,
+        /* Recoverable, caller should clear_highpage() all pages */
+        OSD_ERR_PRI_CLEAR_PAGES = 1, /* -EFAULT */
+        OSD_ERR_PRI_RESOURCE    = 2, /* -ENOMEM */
+        OSD_ERR_PRI_BAD_CRED    = 3, /* -EINVAL */
+        OSD_ERR_PRI_NO_ACCESS   = 4, /* -EACCES */
+        OSD_ERR_PRI_UNREACHABLE = 5, /* any other */
+        OSD_ERR_PRI_NOT_FOUND   = 6, /* -ENOENT */
+        OSD_ERR_PRI_NO_SPACE    = 7, /* -ENOSPC */
+        OSD_ERR_PRI_EIO         = 8, /* -EIO    */
+};
+
 struct osd_sense_info {
+        u64 out_resid;          /* Zero on success otherwise out residual */
+        u64 in_resid;           /* Zero on success otherwise in residual */
+        enum osd_err_priority osd_err_pri;
+
         int key;                /* one of enum scsi_sense_keys */
         int additional_code ;   /* enum osd_additional_sense_codes */
         union { /* Sense specific information */
diff --git a/include/scsi/osd_protocol.h b/include/scsi/osd_protocol.h
index 2cc8e8b1cc1..68566128354 100644
--- a/include/scsi/osd_protocol.h
+++ b/include/scsi/osd_protocol.h
@@ -17,6 +17,7 @@
 #define __OSD_PROTOCOL_H__
 
 #include <linux/types.h>
+#include <linux/kernel.h>
 #include <asm/unaligned.h>
 #include <scsi/scsi.h>
 
diff --git a/include/scsi/osd_sense.h b/include/scsi/osd_sense.h
index ff9b33c773c..91db543a550 100644
--- a/include/scsi/osd_sense.h
+++ b/include/scsi/osd_sense.h
@@ -255,6 +255,9 @@ enum osdv2_cdb_field_offset {
         OSD_CFO_STARTING_BYTE   = OSD_CDB_OFFSET(v2.start_address),
         OSD_CFO_PARTITION_ID    = OSD_CDB_OFFSET(partition),
         OSD_CFO_OBJECT_ID       = OSD_CDB_OFFSET(object),
+        OSD_CFO_PERMISSIONS     = sizeof(struct osd_cdb_head) +
+                                        offsetof(struct osd_capability_head,
+                                                 permissions_bit_mask),
 };
 
 #endif /* ndef __OSD_SENSE_H__ */
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 34c46ab5c31..8b4deca996a 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -94,6 +94,7 @@ struct scsi_cmnd;
 #define WRITE_LONG            0x3f
 #define CHANGE_DEFINITION     0x40
 #define WRITE_SAME            0x41
+#define UNMAP                 0x42
 #define READ_TOC              0x43
 #define LOG_SELECT            0x4c
 #define LOG_SENSE             0x4d
@@ -122,9 +123,11 @@ struct scsi_cmnd;
 #define READ_16               0x88
 #define WRITE_16              0x8a
 #define VERIFY_16             0x8f
+#define WRITE_SAME_16         0x93
 #define SERVICE_ACTION_IN     0x9e
 /* values for service action in */
 #define SAI_READ_CAPACITY_16  0x10
+#define SAI_GET_LBA_STATUS    0x12
 /* values for maintenance in */
 #define MI_REPORT_TARGET_PGS  0x0a
 /* values for maintenance out */
@@ -132,6 +135,7 @@ struct scsi_cmnd;
 /* values for variable length command */
 #define READ_32               0x09
 #define WRITE_32              0x0b
+#define WRITE_SAME_32         0x0d
 
 /* Values for T10/04-262r7 */
 #define ATA_16                0x85      /* 16-byte pass-thru */
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 9af48cbf003..7c4449900c2 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -81,11 +81,14 @@ struct scsi_device {
         struct list_head starved_entry;
         struct scsi_cmnd *current_cmnd; /* currently active command */
         unsigned short queue_depth;     /* How deep of a queue we want */
+        unsigned short max_queue_depth; /* max queue depth */
         unsigned short last_queue_full_depth; /* These two are used by */
         unsigned short last_queue_full_count; /* scsi_track_queue_full() */
-        unsigned long last_queue_full_time;/* don't let QUEUE_FULLs on the same
-                                           jiffie count on our counter, they
-                                           could all be from the same event. */
+        unsigned long last_queue_full_time;     /* last queue full time */
+        unsigned long queue_ramp_up_period;     /* ramp up period in jiffies */
+#define SCSI_DEFAULT_RAMP_UP_PERIOD     (120 * HZ)
+
+        unsigned long last_queue_ramp_up;       /* last queue ramp up time */
 
         unsigned int id, lun, channel;
 
@@ -145,6 +148,7 @@ struct scsi_device {
         unsigned retry_hwerror:1;       /* Retry HARDWARE_ERROR */
         unsigned last_sector_bug:1;     /* do not use multisector accesses on
                                            SD_LAST_BUGGY_SECTORS */
+        unsigned is_visible:1;  /* is the device visible in sysfs */
 
         DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */
         struct list_head event_list;    /* asserted events */
@@ -174,6 +178,7 @@ struct scsi_dh_devlist {
         char *model;
 };
 
+typedef void (*activate_complete)(void *, int);
 struct scsi_device_handler {
         /* Used by the infrastructure */
         struct list_head list; /* list of scsi_device_handlers */
@@ -185,7 +190,7 @@ struct scsi_device_handler {
         int (*check_sense)(struct scsi_device *, struct scsi_sense_hdr *);
         int (*attach)(struct scsi_device *);
         void (*detach)(struct scsi_device *);
-        int (*activate)(struct scsi_device *);
+        int (*activate)(struct scsi_device *, activate_complete, void *);
         int (*prep_fn)(struct scsi_device *, struct request *);
         int (*set_params)(struct scsi_device *, const char *);
 };
diff --git a/include/scsi/scsi_dh.h b/include/scsi/scsi_dh.h
index ff2407405b4..e3f2db212dd 100644
--- a/include/scsi/scsi_dh.h
+++ b/include/scsi/scsi_dh.h
@@ -56,14 +56,16 @@ enum {
         SCSI_DH_DRIVER_MAX,
 };
 #if defined(CONFIG_SCSI_DH) || defined(CONFIG_SCSI_DH_MODULE)
-extern int scsi_dh_activate(struct request_queue *);
+extern int scsi_dh_activate(struct request_queue *, activate_complete, void *);
 extern int scsi_dh_handler_exist(const char *);
 extern int scsi_dh_attach(struct request_queue *, const char *);
 extern void scsi_dh_detach(struct request_queue *);
 extern int scsi_dh_set_params(struct request_queue *, const char *);
 #else
-static inline int scsi_dh_activate(struct request_queue *req)
+static inline int scsi_dh_activate(struct request_queue *req,
+                                        activate_complete fn, void *data)
 {
+        fn(data, 0);
         return 0;
 }
 static inline int scsi_dh_handler_exist(const char *name)
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 6e728b17690..c50a97fc76f 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -43,6 +43,12 @@ struct blk_queue_tags;
 #define DISABLE_CLUSTERING 0
 #define ENABLE_CLUSTERING 1
 
+enum {
+        SCSI_QDEPTH_DEFAULT,    /* default requested change, e.g. from sysfs */
+        SCSI_QDEPTH_QFULL,      /* scsi-ml requested due to queue full */
+        SCSI_QDEPTH_RAMP_UP,    /* scsi-ml requested due to threshhold event */
+};
+
 struct scsi_host_template {
         struct module *module;
         const char *name;
@@ -294,7 +300,7 @@ struct scsi_host_template {
          *
          * Status: OPTIONAL
          */
-        int (* change_queue_depth)(struct scsi_device *, int);
+        int (* change_queue_depth)(struct scsi_device *, int, int);
 
         /*
          * Fill in this function to allow the changing of tag types
@@ -677,6 +683,12 @@ struct Scsi_Host {
         void *shost_data;
 
         /*
+         * Points to the physical bus device we'd use to do DMA
+         * Needed just in case we have virtual hosts.
+         */
+        struct device *dma_dev;
+
+        /*
          * We should ensure that this is aligned, both for better performance
          * and also because some compilers (m68k) don't automatically force
          * alignment to a long boundary.
@@ -720,7 +732,9 @@ extern int scsi_queue_work(struct Scsi_Host *, struct work_struct *);
 extern void scsi_flush_work(struct Scsi_Host *);
 
 extern struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *, int);
-extern int __must_check scsi_add_host(struct Scsi_Host *, struct device *);
+extern int __must_check scsi_add_host_with_dma(struct Scsi_Host *,
+                                               struct device *,
+                                               struct device *);
 extern void scsi_scan_host(struct Scsi_Host *);
 extern void scsi_rescan_device(struct device *);
 extern void scsi_remove_host(struct Scsi_Host *);
@@ -731,6 +745,12 @@ extern const char *scsi_host_state_name(enum scsi_host_state);
 
 extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *);
 
+static inline int __must_check scsi_add_host(struct Scsi_Host *host,
+                                             struct device *dev)
+{
+        return scsi_add_host_with_dma(host, dev, dev);
+}
+
 static inline struct device *scsi_get_device(struct Scsi_Host *shost)
 {
         return shost->shost_gendev.parent;
@@ -797,30 +817,23 @@ static inline unsigned int scsi_host_get_prot(struct Scsi_Host *shost)
 
 static inline unsigned int scsi_host_dif_capable(struct Scsi_Host *shost, unsigned int target_type)
 {
-        switch (target_type) {
-        case 1:
-                if (shost->prot_capabilities & SHOST_DIF_TYPE1_PROTECTION)
-                        return target_type;
-        case 2:
-                if (shost->prot_capabilities & SHOST_DIF_TYPE2_PROTECTION)
-                        return target_type;
-        case 3:
-                if (shost->prot_capabilities & SHOST_DIF_TYPE3_PROTECTION)
-                        return target_type;
-        }
+        static unsigned char cap[] = { 0,
+                                       SHOST_DIF_TYPE1_PROTECTION,
+                                       SHOST_DIF_TYPE2_PROTECTION,
+                                       SHOST_DIF_TYPE3_PROTECTION };
 
-        return 0;
+        return shost->prot_capabilities & cap[target_type] ? target_type : 0;
 }
 
 static inline unsigned int scsi_host_dix_capable(struct Scsi_Host *shost, unsigned int target_type)
 {
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
-        switch (target_type) {
-        case 0: return shost->prot_capabilities & SHOST_DIX_TYPE0_PROTECTION;
-        case 1: return shost->prot_capabilities & SHOST_DIX_TYPE1_PROTECTION;
-        case 2: return shost->prot_capabilities & SHOST_DIX_TYPE2_PROTECTION;
-        case 3: return shost->prot_capabilities & SHOST_DIX_TYPE3_PROTECTION;
-        }
+        static unsigned char cap[] = { SHOST_DIX_TYPE0_PROTECTION,
+                                       SHOST_DIX_TYPE1_PROTECTION,
+                                       SHOST_DIX_TYPE2_PROTECTION,
+                                       SHOST_DIX_TYPE3_PROTECTION };
+
+        return shost->prot_capabilities & cap[target_type];
 #endif
         return 0;
 }
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index fc50bd64aa4..8e86a94faf0 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -807,5 +807,6 @@ void fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
 struct fc_vport *fc_vport_create(struct Scsi_Host *shost, int channel,
                 struct fc_vport_identifiers *);
 int fc_vport_terminate(struct fc_vport *vport);
+void fc_block_scsi_eh(struct scsi_cmnd *cmnd);
 
 #endif /* SCSI_TRANSPORT_FC_H */
diff --git a/include/sound/Kbuild b/include/sound/Kbuild
index fd054a34432..e9dd9369ecb 100644
--- a/include/sound/Kbuild
+++ b/include/sound/Kbuild
@@ -2,7 +2,6 @@ header-y += asound_fm.h
 header-y += hdsp.h
 header-y += hdspm.h
 header-y += sfnt_info.h
-header-y += sscape_ioctl.h
 
 unifdef-y += asequencer.h
 unifdef-y += asound.h
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 3dae3f799b9..49400459b47 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -593,7 +593,7 @@ enum {
 
 struct ac97_quirk {
         unsigned short subvendor; /* PCI subsystem vendor id */
-        unsigned short subdevice; /* PCI sybsystem device id */
+        unsigned short subdevice; /* PCI subsystem device id */
         unsigned short mask;    /* device id bit mask, 0 = accept all */
         unsigned int codec_id;  /* codec id (if any), 0 = accept all */
         const char *name;       /* name shown as info */
diff --git a/include/sound/aci.h b/include/sound/aci.h
new file mode 100644
index 00000000000..ee639d355ef
--- /dev/null
+++ b/include/sound/aci.h
@@ -0,0 +1,90 @@
+#ifndef _ACI_H_
+#define _ACI_H_
+
+#define ACI_REG_COMMAND         0       /* write register offset */
+#define ACI_REG_STATUS          1       /* read register offset */
+#define ACI_REG_BUSY            2       /* busy register offset */
+#define ACI_REG_RDS             2       /* PCM20: RDS register offset */
+#define ACI_MINTIME             500     /* ACI time out limit */
+
+#define ACI_SET_MUTE            0x0d
+#define ACI_SET_POWERAMP        0x0f
+#define ACI_SET_TUNERMUTE       0xa3
+#define ACI_SET_TUNERMONO       0xa4
+#define ACI_SET_IDE             0xd0
+#define ACI_SET_WSS             0xd1
+#define ACI_SET_SOLOMODE        0xd2
+#define ACI_SET_PREAMP          0x03
+#define ACI_GET_PREAMP          0x21
+#define ACI_WRITE_TUNE          0xa7
+#define ACI_READ_TUNERSTEREO    0xa8
+#define ACI_READ_TUNERSTATION   0xa9
+#define ACI_READ_VERSION        0xf1
+#define ACI_READ_IDCODE         0xf2
+#define ACI_INIT                0xff
+#define ACI_STATUS              0xf0
+#define ACI_S_GENERAL           0x00
+#define ACI_ERROR_OP            0xdf
+
+/* ACI Mixer */
+
+/* These are the values for the right channel GET registers.
+   Add an offset of 0x01 for the left channel register.
+   (left=right+0x01) */
+
+#define ACI_GET_MASTER          0x03
+#define ACI_GET_MIC             0x05
+#define ACI_GET_LINE            0x07
+#define ACI_GET_CD              0x09
+#define ACI_GET_SYNTH           0x0b
+#define ACI_GET_PCM             0x0d
+#define ACI_GET_LINE1           0x10    /* Radio on PCM20 */
+#define ACI_GET_LINE2           0x12
+
+#define ACI_GET_EQ1             0x22    /* from Bass ... */
+#define ACI_GET_EQ2             0x24
+#define ACI_GET_EQ3             0x26
+#define ACI_GET_EQ4             0x28
+#define ACI_GET_EQ5             0x2a
+#define ACI_GET_EQ6             0x2c
+#define ACI_GET_EQ7             0x2e    /* ... to Treble */
+
+/* And these are the values for the right channel SET registers.
+   For left channel access you have to add an offset of 0x08.
+   MASTER is an exception, which needs an offset of 0x01 */
+
+#define ACI_SET_MASTER          0x00
+#define ACI_SET_MIC             0x30
+#define ACI_SET_LINE            0x31
+#define ACI_SET_CD              0x34
+#define ACI_SET_SYNTH           0x33
+#define ACI_SET_PCM             0x32
+#define ACI_SET_LINE1           0x35    /* Radio on PCM20 */
+#define ACI_SET_LINE2           0x36
+
+#define ACI_SET_EQ1             0x40    /* from Bass ... */
+#define ACI_SET_EQ2             0x41
+#define ACI_SET_EQ3             0x42
+#define ACI_SET_EQ4             0x43
+#define ACI_SET_EQ5             0x44
+#define ACI_SET_EQ6             0x45
+#define ACI_SET_EQ7             0x46    /* ... to Treble */
+
+struct snd_miro_aci {
+        unsigned long aci_port;
+        int aci_vendor;
+        int aci_product;
+        int aci_version;
+        int aci_amp;
+        int aci_preamp;
+        int aci_solomode;
+
+        struct mutex aci_mutex;
+};
+
+int snd_aci_cmd(struct snd_miro_aci *aci, int write1, int write2, int write3);
+
+struct snd_miro_aci *snd_aci_get_aci(void);
+
+#endif  /* _ACI_H_ */
+
diff --git a/include/sound/ak4113.h b/include/sound/ak4113.h
new file mode 100644
index 00000000000..8988edae160
--- /dev/null
+++ b/include/sound/ak4113.h
@@ -0,0 +1,321 @@
+#ifndef __SOUND_AK4113_H
+#define __SOUND_AK4113_H
+
+/*
+ *  Routines for Asahi Kasei AK4113
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
+ *  Copyright (c) by Pavel Hofman <pavel.hofman@ivitera.com>,
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+/* AK4113 registers */
+/* power down */
+#define AK4113_REG_PWRDN        0x00
+/* format control */
+#define AK4113_REG_FORMAT       0x01
+/* input/output control */
+#define AK4113_REG_IO0          0x02
+/* input/output control */
+#define AK4113_REG_IO1          0x03
+/* interrupt0 mask */
+#define AK4113_REG_INT0_MASK    0x04
+/* interrupt1 mask */
+#define AK4113_REG_INT1_MASK    0x05
+/* DAT mask & DTS select */
+#define AK4113_REG_DATDTS       0x06
+/* receiver status 0 */
+#define AK4113_REG_RCS0         0x07
+/* receiver status 1 */
+#define AK4113_REG_RCS1         0x08
+/* receiver status 2 */
+#define AK4113_REG_RCS2         0x09
+/* RX channel status byte 0 */
+#define AK4113_REG_RXCSB0       0x0a
+/* RX channel status byte 1 */
+#define AK4113_REG_RXCSB1       0x0b
+/* RX channel status byte 2 */
+#define AK4113_REG_RXCSB2       0x0c
+/* RX channel status byte 3 */
+#define AK4113_REG_RXCSB3       0x0d
+/* RX channel status byte 4 */
+#define AK4113_REG_RXCSB4       0x0e
+/* burst preamble Pc byte 0 */
+#define AK4113_REG_Pc0          0x0f
+/* burst preamble Pc byte 1 */
+#define AK4113_REG_Pc1          0x10
+/* burst preamble Pd byte 0 */
+#define AK4113_REG_Pd0          0x11
+/* burst preamble Pd byte 1 */
+#define AK4113_REG_Pd1          0x12
+/* Q-subcode address + control */
+#define AK4113_REG_QSUB_ADDR    0x13
+/* Q-subcode track */
+#define AK4113_REG_QSUB_TRACK   0x14
+/* Q-subcode index */
+#define AK4113_REG_QSUB_INDEX   0x15
+/* Q-subcode minute */
+#define AK4113_REG_QSUB_MINUTE  0x16
+/* Q-subcode second */
+#define AK4113_REG_QSUB_SECOND  0x17
+/* Q-subcode frame */
+#define AK4113_REG_QSUB_FRAME   0x18
+/* Q-subcode zero */
+#define AK4113_REG_QSUB_ZERO    0x19
+/* Q-subcode absolute minute */
+#define AK4113_REG_QSUB_ABSMIN  0x1a
+/* Q-subcode absolute second */
+#define AK4113_REG_QSUB_ABSSEC  0x1b
+/* Q-subcode absolute frame */
+#define AK4113_REG_QSUB_ABSFRM  0x1c
+
+/* sizes */
+#define AK4113_REG_RXCSB_SIZE   ((AK4113_REG_RXCSB4-AK4113_REG_RXCSB0)+1)
+#define AK4113_REG_QSUB_SIZE    ((AK4113_REG_QSUB_ABSFRM-AK4113_REG_QSUB_ADDR)\
+                +1)
+
+#define AK4113_WRITABLE_REGS    (AK4113_REG_DATDTS + 1)
+
+/* AK4113_REG_PWRDN bits */
+/* Channel Status Select */
+#define AK4113_CS12             (1<<7)
+/* Block Start & C/U Output Mode */
+#define AK4113_BCU              (1<<6)
+/* Master Clock Operation Select */
+#define AK4113_CM1              (1<<5)
+/* Master Clock Operation Select */
+#define AK4113_CM0              (1<<4)
+/* Master Clock Frequency Select */
+#define AK4113_OCKS1            (1<<3)
+/* Master Clock Frequency Select */
+#define AK4113_OCKS0            (1<<2)
+/* 0 = power down, 1 = normal operation */
+#define AK4113_PWN              (1<<1)
+/* 0 = reset & initialize (except thisregister), 1 = normal operation */
+#define AK4113_RST              (1<<0)
+
+/* AK4113_REQ_FORMAT bits */
+/* V/TX Output select: 0 = Validity Flag Output, 1 = TX */
+#define AK4113_VTX              (1<<7)
+/* Audio Data Control */
+#define AK4113_DIF2             (1<<6)
+/* Audio Data Control */
+#define AK4113_DIF1             (1<<5)
+/* Audio Data Control */
+#define AK4113_DIF0             (1<<4)
+/* Deemphasis Autodetect Enable (1 = enable) */
+#define AK4113_DEAU             (1<<3)
+/* 32kHz-48kHz Deemphasis Control */
+#define AK4113_DEM1             (1<<2)
+/* 32kHz-48kHz Deemphasis Control */
+#define AK4113_DEM0             (1<<1)
+#define AK4113_DEM_OFF          (AK4113_DEM0)
+#define AK4113_DEM_44KHZ        (0)
+#define AK4113_DEM_48KHZ        (AK4113_DEM1)
+#define AK4113_DEM_32KHZ        (AK4113_DEM0|AK4113_DEM1)
+/* STDO: 16-bit, right justified */
+#define AK4113_DIF_16R          (0)
+/* STDO: 18-bit, right justified */
+#define AK4113_DIF_18R          (AK4113_DIF0)
+/* STDO: 20-bit, right justified */
+#define AK4113_DIF_20R          (AK4113_DIF1)
+/* STDO: 24-bit, right justified */
+#define AK4113_DIF_24R          (AK4113_DIF1|AK4113_DIF0)
+/* STDO: 24-bit, left justified */
+#define AK4113_DIF_24L          (AK4113_DIF2)
+/* STDO: I2S */
+#define AK4113_DIF_24I2S        (AK4113_DIF2|AK4113_DIF0)
+/* STDO: 24-bit, left justified; LRCLK, BICK = Input */
+#define AK4113_DIF_I24L         (AK4113_DIF2|AK4113_DIF1)
+/* STDO: I2S;  LRCLK, BICK = Input */
+#define AK4113_DIF_I24I2S       (AK4113_DIF2|AK4113_DIF1|AK4113_DIF0)
+
+/* AK4113_REG_IO0 */
+/* XTL1=0,XTL0=0 -> 11.2896Mhz; XTL1=0,XTL0=1 -> 12.288Mhz */
+#define AK4113_XTL1             (1<<6)
+/* XTL1=1,XTL0=0 -> 24.576Mhz; XTL1=1,XTL0=1 -> use channel status */
+#define AK4113_XTL0             (1<<5)
+/* Block Start Signal Output: 0 = U-bit, 1 = C-bit (req. BCU = 1) */
+#define AK4113_UCE              (1<<4)
+/* TX Output Enable (1 = enable) */
+#define AK4113_TXE              (1<<3)
+/* Output Through Data Selector for TX pin */
+#define AK4113_OPS2             (1<<2)
+/* Output Through Data Selector for TX pin */
+#define AK4113_OPS1             (1<<1)
+/* Output Through Data Selector for TX pin */
+#define AK4113_OPS0             (1<<0)
+/* 11.2896 MHz ref. Xtal freq. */
+#define AK4113_XTL_11_2896M     (0)
+/* 12.288 MHz ref. Xtal freq. */
+#define AK4113_XTL_12_288M      (AK4113_XTL0)
+/* 24.576 MHz ref. Xtal freq. */
+#define AK4113_XTL_24_576M      (AK4113_XTL1)
+
+/* AK4113_REG_IO1 */
+/* Interrupt 0 pin Hold */
+#define AK4113_EFH1             (1<<7)
+/* Interrupt 0 pin Hold */
+#define AK4113_EFH0             (1<<6)
+#define AK4113_EFH_512LRCLK     (0)
+#define AK4113_EFH_1024LRCLK    (AK4113_EFH0)
+#define AK4113_EFH_2048LRCLK    (AK4113_EFH1)
+#define AK4113_EFH_4096LRCLK    (AK4113_EFH1|AK4113_EFH0)
+/* PLL Lock Time: 0 = 384/fs, 1 = 1/fs */
+#define AK4113_FAST             (1<<5)
+/* MCKO2 Output Select: 0 = CMx/OCKSx, 1 = Xtal */
+#define AK4113_XMCK             (1<<4)
+/* MCKO2 Output Freq. Select: 0 = x1, 1 = x0.5  (req. XMCK = 1) */
+#define AK4113_DIV              (1<<3)
+/* Input Recovery Data Select */
+#define AK4113_IPS2             (1<<2)
+/* Input Recovery Data Select */
+#define AK4113_IPS1             (1<<1)
+/* Input Recovery Data Select */
+#define AK4113_IPS0             (1<<0)
+#define AK4113_IPS(x)           ((x)&7)
+
+/* AK4113_REG_INT0_MASK && AK4113_REG_INT1_MASK*/
+/* mask enable for QINT bit */
+#define AK4113_MQI              (1<<7)
+/* mask enable for AUTO bit */
+#define AK4113_MAUT             (1<<6)
+/* mask enable for CINT bit */
+#define AK4113_MCIT             (1<<5)
+/* mask enable for UNLOCK bit */
+#define AK4113_MULK             (1<<4)
+/* mask enable for V bit */
+#define AK4113_V                (1<<3)
+/* mask enable for STC bit */
+#define AK4113_STC              (1<<2)
+/* mask enable for AUDN bit */
+#define AK4113_MAN              (1<<1)
+/* mask enable for PAR bit */
+#define AK4113_MPR              (1<<0)
+
+/* AK4113_REG_DATDTS */
+/* DAT Start ID Counter */
+#define AK4113_DCNT             (1<<4)
+/* DTS-CD 16-bit Sync Word Detect */
+#define AK4113_DTS16            (1<<3)
+/* DTS-CD 14-bit Sync Word Detect */
+#define AK4113_DTS14            (1<<2)
+/* mask enable for DAT bit (if 1, no INT1 effect */
+#define AK4113_MDAT1            (1<<1)
+/* mask enable for DAT bit (if 1, no INT0 effect */
+#define AK4113_MDAT0            (1<<0)
+
+/* AK4113_REG_RCS0 */
+/* Q-subcode buffer interrupt, 0 = no change, 1 = changed */
+#define AK4113_QINT             (1<<7)
+/* Non-PCM or DTS stream auto detection, 0 = no detect, 1 = detect */
+#define AK4113_AUTO             (1<<6)
+/* channel status buffer interrupt, 0 = no change, 1 = change */
+#define AK4113_CINT             (1<<5)
+/* PLL lock status, 0 = lock, 1 = unlock */
+#define AK4113_UNLCK            (1<<4)
+/* Validity bit, 0 = valid, 1 = invalid */
+#define AK4113_V                (1<<3)
+/* sampling frequency or Pre-emphasis change, 0 = no detect, 1 = detect */
+#define AK4113_STC              (1<<2)
+/* audio bit output, 0 = audio, 1 = non-audio */
+#define AK4113_AUDION           (1<<1)
+/* parity error or biphase error status, 0 = no error, 1 = error */
+#define AK4113_PAR              (1<<0)
+
+/* AK4113_REG_RCS1 */
+/* sampling frequency detection */
+#define AK4113_FS3              (1<<7)
+#define AK4113_FS2              (1<<6)
+#define AK4113_FS1              (1<<5)
+#define AK4113_FS0              (1<<4)
+/* Pre-emphasis detect, 0 = OFF, 1 = ON */
+#define AK4113_PEM              (1<<3)
+/* DAT Start ID Detect, 0 = no detect, 1 = detect */
+#define AK4113_DAT              (1<<2)
+/* DTS-CD bit audio stream detect, 0 = no detect, 1 = detect */
+#define AK4113_DTSCD            (1<<1)
+/* Non-PCM bit stream detection, 0 = no detect, 1 = detect */
+#define AK4113_NPCM             (1<<0)
+#define AK4113_FS_8000HZ        (AK4113_FS3|AK4113_FS0)
+#define AK4113_FS_11025HZ       (AK4113_FS2|AK4113_FS0)
+#define AK4113_FS_16000HZ       (AK4113_FS2|AK4113_FS1|AK4113_FS0)
+#define AK4113_FS_22050HZ       (AK4113_FS2)
+#define AK4113_FS_24000HZ       (AK4113_FS2|AK4113_FS1)
+#define AK4113_FS_32000HZ       (AK4113_FS1|AK4113_FS0)
+#define AK4113_FS_44100HZ       (0)
+#define AK4113_FS_48000HZ       (AK4113_FS1)
+#define AK4113_FS_64000HZ       (AK4113_FS3|AK4113_FS1|AK4113_FS0)
+#define AK4113_FS_88200HZ       (AK4113_FS3)
+#define AK4113_FS_96000HZ       (AK4113_FS3|AK4113_FS1)
+#define AK4113_FS_176400HZ      (AK4113_FS3|AK4113_FS2)
+#define AK4113_FS_192000HZ      (AK4113_FS3|AK4113_FS2|AK4113_FS1)
+
+/* AK4113_REG_RCS2 */
+/* CRC for Q-subcode, 0 = no error, 1 = error */
+#define AK4113_QCRC             (1<<1)
+/* CRC for channel status, 0 = no error, 1 = error */
+#define AK4113_CCRC             (1<<0)
+
+/* flags for snd_ak4113_check_rate_and_errors() */
+#define AK4113_CHECK_NO_STAT    (1<<0)  /* no statistics */
+#define AK4113_CHECK_NO_RATE    (1<<1)  /* no rate check */
+
+#define AK4113_CONTROLS         13
+
+typedef void (ak4113_write_t)(void *private_data, unsigned char addr,
+                unsigned char data);
+typedef unsigned char (ak4113_read_t)(void *private_data, unsigned char addr);
+
+struct ak4113 {
+        struct snd_card *card;
+        ak4113_write_t *write;
+        ak4113_read_t *read;
+        void *private_data;
+        unsigned int init:1;
+        spinlock_t lock;
+        unsigned char regmap[AK4113_WRITABLE_REGS];
+        struct snd_kcontrol *kctls[AK4113_CONTROLS];
+        struct snd_pcm_substream *substream;
+        unsigned long parity_errors;
+        unsigned long v_bit_errors;
+        unsigned long qcrc_errors;
+        unsigned long ccrc_errors;
+        unsigned char rcs0;
+        unsigned char rcs1;
+        unsigned char rcs2;
+        struct delayed_work work;
+        unsigned int check_flags;
+        void *change_callback_private;
+        void (*change_callback)(struct ak4113 *ak4113, unsigned char c0,
+                        unsigned char c1);
+};
+
+int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,
+                ak4113_write_t *write,
+                const unsigned char pgm[AK4113_WRITABLE_REGS],
+                void *private_data, struct ak4113 **r_ak4113);
+void snd_ak4113_reg_write(struct ak4113 *ak4113, unsigned char reg,
+                unsigned char mask, unsigned char val);
+void snd_ak4113_reinit(struct ak4113 *ak4113);
+int snd_ak4113_build(struct ak4113 *ak4113,
+                struct snd_pcm_substream *capture_substream);
+int snd_ak4113_external_rate(struct ak4113 *ak4113);
+int snd_ak4113_check_rate_and_errors(struct ak4113 *ak4113, unsigned int flags);
+
+#endif /* __SOUND_AK4113_H */
+
diff --git a/include/sound/ak4114.h b/include/sound/ak4114.h
index d293d36a66b..3ce69fd9252 100644
--- a/include/sound/ak4114.h
+++ b/include/sound/ak4114.h
@@ -95,13 +95,13 @@
 
 /* AK4114_REG_IO0 */
 #define AK4114_TX1E             (1<<7)  /* TX1 Output Enable (1 = enable) */
-#define AK4114_OPS12            (1<<2)  /* Output Though Data Selector for TX1 pin */
-#define AK4114_OPS11            (1<<1)  /* Output Though Data Selector for TX1 pin */
-#define AK4114_OPS10            (1<<0)  /* Output Though Data Selector for TX1 pin */
+#define AK4114_OPS12            (1<<6)  /* Output Data Selector for TX1 pin */
+#define AK4114_OPS11            (1<<5)  /* Output Data Selector for TX1 pin */
+#define AK4114_OPS10            (1<<4)  /* Output Data Selector for TX1 pin */
 #define AK4114_TX0E             (1<<3)  /* TX0 Output Enable (1 = enable) */
-#define AK4114_OPS02            (1<<2)  /* Output Though Data Selector for TX0 pin */
-#define AK4114_OPS01            (1<<1)  /* Output Though Data Selector for TX0 pin */
-#define AK4114_OPS00            (1<<0)  /* Output Though Data Selector for TX0 pin */
+#define AK4114_OPS02            (1<<2)  /* Output Data Selector for TX0 pin */
+#define AK4114_OPS01            (1<<1)  /* Output Data Selector for TX0 pin */
+#define AK4114_OPS00            (1<<0)  /* Output Data Selector for TX0 pin */
 
 /* AK4114_REG_IO1 */
 #define AK4114_EFH1             (1<<7)  /* Interrupt 0 pin Hold */
diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
index 891cf1aea8b..030b87c2f6d 100644
--- a/include/sound/ak4xxx-adda.h
+++ b/include/sound/ak4xxx-adda.h
@@ -68,7 +68,7 @@ struct snd_akm4xxx {
         enum {
                 SND_AK4524, SND_AK4528, SND_AK4529,
                 SND_AK4355, SND_AK4358, SND_AK4381,
-                SND_AK5365
+                SND_AK5365, SND_AK4620,
         } type;
 
         /* (array) information of combined codecs */
@@ -76,6 +76,9 @@ struct snd_akm4xxx {
         const struct snd_akm4xxx_adc_channel *adc_info;
 
         struct snd_ak4xxx_ops ops;
+        unsigned int num_chips;
+        unsigned int total_regs;
+        const char *name;
 };
 
 void snd_akm4xxx_write(struct snd_akm4xxx *ak, int chip, unsigned char reg,
diff --git a/include/sound/control.h b/include/sound/control.h
index ef96f07aa03..112374dc0c5 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -56,7 +56,6 @@ struct snd_kcontrol_new {
 
 struct snd_kcontrol_volatile {
         struct snd_ctl_file *owner;     /* locked */
-        pid_t owner_pid;
         unsigned int access;    /* access rights */
 };
 
@@ -87,10 +86,12 @@ struct snd_kctl_event {
 
 #define snd_kctl_event(n) list_entry(n, struct snd_kctl_event, list)
 
+struct pid;
+
 struct snd_ctl_file {
         struct list_head list;          /* list of all control files */
         struct snd_card *card;
-        pid_t pid;
+        struct pid *pid;
         int prefer_pcm_subdevice;
         int prefer_rawmidi_subdevice;
         wait_queue_head_t change_sleep;
diff --git a/include/sound/cs4231-regs.h b/include/sound/cs4231-regs.h
index 92647532c45..66d28c2cb53 100644
--- a/include/sound/cs4231-regs.h
+++ b/include/sound/cs4231-regs.h
@@ -70,7 +70,6 @@
 #define AD1845_PWR_DOWN         0x1b    /* power down control */
 #define CS4235_LEFT_MASTER      0x1b    /* left master output control */
 #define CS4231_REC_FORMAT       0x1c    /* clock and data format - record - bits 7-0 MCE */
-#define CS4231_PLY_VAR_FREQ     0x1d    /* playback variable frequency */
 #define AD1845_CLOCK            0x1d    /* crystal clock select and total power down */
 #define CS4235_RIGHT_MASTER     0x1d    /* right master output control */
 #define CS4231_REC_UPR_CNT      0x1e    /* record upper count */
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index de6d981de5d..c83a4a79f16 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -348,6 +348,8 @@ struct snd_pcm_group {		/* keep linked substreams */
         int count;
 };
 
+struct pid;
+
 struct snd_pcm_substream {
         struct snd_pcm *pcm;
         struct snd_pcm_str *pstr;
@@ -379,6 +381,7 @@ struct snd_pcm_substream {
         atomic_t mmap_count;
         unsigned int f_flags;
         void (*pcm_release)(struct snd_pcm_substream *);
+        struct pid *pid;
 #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
         /* -- OSS things -- */
         struct snd_pcm_oss_substream oss;
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h
index c23c2658570..2480e7d10dc 100644
--- a/include/sound/rawmidi.h
+++ b/include/sound/rawmidi.h
@@ -46,6 +46,7 @@
 struct snd_rawmidi;
 struct snd_rawmidi_substream;
 struct snd_seq_port_info;
+struct pid;
 
 struct snd_rawmidi_ops {
         int (*open) (struct snd_rawmidi_substream * substream);
@@ -97,6 +98,7 @@ struct snd_rawmidi_substream {
         struct snd_rawmidi_str *pstr;
         char name[32];
         struct snd_rawmidi_runtime *runtime;
+        struct pid *pid;
         /* hardware layer */
         struct snd_rawmidi_ops *ops;
 };
diff --git a/include/sound/sh_dac_audio.h b/include/sound/sh_dac_audio.h
new file mode 100644
index 00000000000..f5deaf1ddb9
--- /dev/null
+++ b/include/sound/sh_dac_audio.h
@@ -0,0 +1,21 @@
+/*
+ * SH_DAC specific configuration, for the dac_audio platform_device
+ *
+ * Copyright (C) 2009 Rafael Ignacio Zurita <rizurita@yahoo.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#ifndef __INCLUDE_SH_DAC_AUDIO_H
+#define __INCLUDE_SH_DAC_AUDIO_H
+
+struct dac_audio_pdata {
+        int buffer_size;
+        int channel;
+        void (*start)(struct dac_audio_pdata *pd);
+        void (*stop)(struct dac_audio_pdata *pd);
+};
+
+#endif /* __INCLUDE_SH_DAC_AUDIO_H */
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 97ca9af414d..ca24e7f7a3f 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -30,6 +30,7 @@ struct snd_pcm_substream;
 #define SND_SOC_DAIFMT_DSP_A            3 /* L data MSB after FRM LRC */
 #define SND_SOC_DAIFMT_DSP_B            4 /* L data MSB during FRM LRC */
 #define SND_SOC_DAIFMT_AC97             5 /* AC97 */
+#define SND_SOC_DAIFMT_PDM              6 /* Pulse density modulation */
 
 /* left and right justified also known as MSB and LSB respectively */
 #define SND_SOC_DAIFMT_MSB              SND_SOC_DAIFMT_LEFT_J
@@ -106,7 +107,7 @@ int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai,
         int div_id, int div);
 
 int snd_soc_dai_set_pll(struct snd_soc_dai *dai,
-        int pll_id, unsigned int freq_in, unsigned int freq_out);
+        int pll_id, int source, unsigned int freq_in, unsigned int freq_out);
 
 /* Digital Audio interface formatting */
 int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt);
@@ -114,6 +115,10 @@ int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt);
 int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,
         unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width);
 
+int snd_soc_dai_set_channel_map(struct snd_soc_dai *dai,
+        unsigned int tx_num, unsigned int *tx_slot,
+        unsigned int rx_num, unsigned int *rx_slot);
+
 int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate);
 
 /* Digital Audio Interface mute */
@@ -136,8 +141,8 @@ struct snd_soc_dai_ops {
          */
         int (*set_sysclk)(struct snd_soc_dai *dai,
                 int clk_id, unsigned int freq, int dir);
-        int (*set_pll)(struct snd_soc_dai *dai,
-                int pll_id, unsigned int freq_in, unsigned int freq_out);
+        int (*set_pll)(struct snd_soc_dai *dai, int pll_id, int source,
+                unsigned int freq_in, unsigned int freq_out);
         int (*set_clkdiv)(struct snd_soc_dai *dai, int div_id, int div);
 
         /*
@@ -148,6 +153,9 @@ struct snd_soc_dai_ops {
         int (*set_tdm_slot)(struct snd_soc_dai *dai,
                 unsigned int tx_mask, unsigned int rx_mask,
                 int slots, int slot_width);
+        int (*set_channel_map)(struct snd_soc_dai *dai,
+                unsigned int tx_num, unsigned int *tx_slot,
+                unsigned int rx_num, unsigned int *rx_slot);
         int (*set_tristate)(struct snd_soc_dai *dai, int tristate);
 
         /*
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index c1410e3191e..c5c95e1da65 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -206,6 +206,12 @@
         .get = snd_soc_dapm_get_enum_double, \
         .put = snd_soc_dapm_put_enum_double, \
         .private_value = (unsigned long)&xenum }
+#define SOC_DAPM_ENUM_VIRT(xname, xenum)                    \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .info = snd_soc_info_enum_double, \
+        .get = snd_soc_dapm_get_enum_virt, \
+        .put = snd_soc_dapm_put_enum_virt, \
+        .private_value = (unsigned long)&xenum }
 #define SOC_DAPM_VALUE_ENUM(xname, xenum) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
         .info = snd_soc_info_enum_double, \
@@ -260,6 +266,10 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
+int snd_soc_dapm_get_enum_virt(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
+int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol);
 int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
@@ -333,6 +343,10 @@ struct snd_soc_dapm_route {
         const char *sink;
         const char *control;
         const char *source;
+
+        /* Note: currently only supported for links where source is a supply */
+        int (*connected)(struct snd_soc_dapm_widget *source,
+                         struct snd_soc_dapm_widget *sink);
 };
 
 /* dapm audio path between two widgets */
@@ -349,6 +363,9 @@ struct snd_soc_dapm_path {
         u32 connect:1;  /* source and sink widgets are connected */
         u32 walked:1;   /* path has been walked */
 
+        int (*connected)(struct snd_soc_dapm_widget *source,
+                         struct snd_soc_dapm_widget *sink);
+
         struct list_head list_source;
         struct list_head list_sink;
         struct list_head list;
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 475cb7ed6be..0d7718f9280 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -223,15 +223,15 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
                                int addr_bits, int data_bits,
                                enum snd_soc_control_type control);
 
-#ifdef CONFIG_PM
-int snd_soc_suspend_device(struct device *dev);
-int snd_soc_resume_device(struct device *dev);
-#endif
-
 /* pcm <-> DAI connect */
 void snd_soc_free_pcms(struct snd_soc_device *socdev);
 int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid);
-int snd_soc_init_card(struct snd_soc_device *socdev);
+
+/* Utility functions to get clock rates from various things */
+int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
+int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);
+int snd_soc_calc_bclk(int fs, int sample_size, int channels, int tdm_slots);
+int snd_soc_params_to_bclk(struct snd_pcm_hw_params *parms);
 
 /* set runtime hw params */
 int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
@@ -333,6 +333,8 @@ struct snd_soc_jack_gpio {
         int debounce_time;
         struct snd_soc_jack *jack;
         struct work_struct work;
+
+        int (*jack_status_check)(void);
 };
 #endif
 
@@ -413,6 +415,7 @@ struct snd_soc_codec {
         unsigned int num_dai;
 
 #ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_codec_root;
         struct dentry *debugfs_reg;
         struct dentry *debugfs_pop_time;
         struct dentry *debugfs_dapm;
diff --git a/include/sound/sscape_ioctl.h b/include/sound/sscape_ioctl.h
deleted file mode 100644
index 0d8885969c6..00000000000
--- a/include/sound/sscape_ioctl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef SSCAPE_IOCTL_H
-#define SSCAPE_IOCTL_H
-
-
-struct sscape_bootblock
-{
-  unsigned char code[256];
-  unsigned version;
-};
-
-#define SSCAPE_MICROCODE_SIZE  65536
-
-struct sscape_microcode
-{
-  unsigned char __user *code;
-};
-
-#define SND_SSCAPE_LOAD_BOOTB  _IOWR('P', 100, struct sscape_bootblock)
-#define SND_SSCAPE_LOAD_MCODE  _IOW ('P', 101, struct sscape_microcode)
-
-#endif
diff --git a/include/sound/tlv320dac33-plat.h b/include/sound/tlv320dac33-plat.h
new file mode 100644
index 00000000000..5858d06a7ff
--- /dev/null
+++ b/include/sound/tlv320dac33-plat.h
@@ -0,0 +1,20 @@
+/*
+ * Platform header for Texas Instruments TLV320DAC33 codec driver
+ *
+ * Author:      Peter Ujfalusi <peter.ujfalusi@nokia.com>
+ *
+ * Copyright:   (C) 2009 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __TLV320DAC33_PLAT_H
+#define __TLV320DAC33_PLAT_H
+
+struct tlv320dac33_platform_data {
+        int power_gpio;
+};
+
+#endif /* __TLV320DAC33_PLAT_H */
diff --git a/include/sound/tpa6130a2-plat.h b/include/sound/tpa6130a2-plat.h
new file mode 100644
index 00000000000..e8c901e749d
--- /dev/null
+++ b/include/sound/tpa6130a2-plat.h
@@ -0,0 +1,30 @@
+/*
+ * TPA6130A2 driver platform header
+ *
+ * Copyright (C) Nokia Corporation
+ *
+ * Written by Peter Ujfalusi <peter.ujfalusi@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 TPA6130A2_PLAT_H
+#define TPA6130A2_PLAT_H
+
+struct tpa6130a2_platform_data {
+        int power_gpio;
+};
+
+#endif
diff --git a/include/sound/wm8993.h b/include/sound/wm8993.h
index 9c661f2f8cd..eee19f63c0d 100644
--- a/include/sound/wm8993.h
+++ b/include/sound/wm8993.h
@@ -36,7 +36,7 @@ struct wm8993_platform_data {
         unsigned int micbias1_lvl:1;
         unsigned int micbias2_lvl:1;
 
-        /* Jack detect threashold levels, see datasheet for values */
+        /* Jack detect threshold levels, see datasheet for values */
         unsigned int jd_scthr:2;
         unsigned int jd_thr:2;
 };
diff --git a/include/sound/wss.h b/include/sound/wss.h
index 6d65f322f1d..fd01f22825c 100644
--- a/include/sound/wss.h
+++ b/include/sound/wss.h
@@ -154,7 +154,6 @@ int snd_wss_create(struct snd_card *card,
                       unsigned short hardware,
                       unsigned short hwshare,
                       struct snd_wss **rchip);
-int snd_wss_free(struct snd_wss *chip);
 int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm);
 int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer);
 int snd_wss_mixer(struct snd_wss *chip);
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index 2a4b3bf7403..5acfb1eb4df 100644
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -31,6 +31,14 @@
                 assign, print, reg, unreg)                      \
         DEFINE_TRACE_FN(name, reg, unreg)
 
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, name, proto, args) \
+        DEFINE_TRACE(name)
+
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
+        DEFINE_TRACE(name)
+
 #undef DECLARE_TRACE
 #define DECLARE_TRACE(name, proto, args)        \
         DEFINE_TRACE(name)
@@ -63,6 +71,9 @@
 
 #undef TRACE_EVENT
 #undef TRACE_EVENT_FN
+#undef DECLARE_EVENT_CLASS
+#undef DEFINE_EVENT
+#undef DEFINE_EVENT_PRINT
 #undef TRACE_HEADER_MULTI_READ
 
 /* Only undef what we defined in this file */
diff --git a/include/trace/events/bkl.h b/include/trace/events/bkl.h
new file mode 100644
index 00000000000..1af72dc2427
--- /dev/null
+++ b/include/trace/events/bkl.h
@@ -0,0 +1,61 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM bkl
+
+#if !defined(_TRACE_BKL_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_BKL_H
+
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(lock_kernel,
+
+        TP_PROTO(const char *func, const char *file, int line),
+
+        TP_ARGS(func, file, line),
+
+        TP_STRUCT__entry(
+                __field(        int,            depth                   )
+                __field_ext(    const char *,   func, FILTER_PTR_STRING )
+                __field_ext(    const char *,   file, FILTER_PTR_STRING )
+                __field(        int,            line                    )
+        ),
+
+        TP_fast_assign(
+                /* We want to record the lock_depth after lock is acquired */
+                __entry->depth = current->lock_depth + 1;
+                __entry->func = func;
+                __entry->file = file;
+                __entry->line = line;
+        ),
+
+        TP_printk("depth=%d file:line=%s:%d func=%s()", __entry->depth,
+                  __entry->file, __entry->line, __entry->func)
+);
+
+TRACE_EVENT(unlock_kernel,
+
+        TP_PROTO(const char *func, const char *file, int line),
+
+        TP_ARGS(func, file, line),
+
+        TP_STRUCT__entry(
+                __field(int,            depth           )
+                __field(const char *,   func            )
+                __field(const char *,   file            )
+                __field(int,            line            )
+        ),
+
+        TP_fast_assign(
+                __entry->depth = current->lock_depth;
+                __entry->func = func;
+                __entry->file = file;
+                __entry->line = line;
+        ),
+
+        TP_printk("depth=%d file:line=%s:%d func=%s()", __entry->depth,
+                  __entry->file, __entry->line, __entry->func)
+);
+
+#endif /* _TRACE_BKL_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/block.h b/include/trace/events/block.h
index 00405b5f624..5fb72733331 100644
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
@@ -8,7 +8,7 @@
 #include <linux/blkdev.h>
 #include <linux/tracepoint.h>
 
-TRACE_EVENT(block_rq_abort,
+DECLARE_EVENT_CLASS(block_rq_with_error,
 
         TP_PROTO(struct request_queue *q, struct request *rq),
 
@@ -40,41 +40,28 @@ TRACE_EVENT(block_rq_abort,
                   __entry->nr_sector, __entry->errors)
 );
 
-TRACE_EVENT(block_rq_insert,
+DEFINE_EVENT(block_rq_with_error, block_rq_abort,
 
         TP_PROTO(struct request_queue *q, struct request *rq),
 
-        TP_ARGS(q, rq),
+        TP_ARGS(q, rq)
+);
 
-        TP_STRUCT__entry(
-                __field(  dev_t,        dev                     )
-                __field(  sector_t,     sector                  )
-                __field(  unsigned int, nr_sector               )
-                __field(  unsigned int, bytes                   )
-                __array(  char,         rwbs,   6               )
-                __array(  char,         comm,   TASK_COMM_LEN   )
-                __dynamic_array( char,  cmd,    blk_cmd_buf_len(rq)     )
-        ),
+DEFINE_EVENT(block_rq_with_error, block_rq_requeue,
 
-        TP_fast_assign(
-                __entry->dev       = rq->rq_disk ? disk_devt(rq->rq_disk) : 0;
-                __entry->sector    = blk_pc_request(rq) ? 0 : blk_rq_pos(rq);
-                __entry->nr_sector = blk_pc_request(rq) ? 0 : blk_rq_sectors(rq);
-                __entry->bytes     = blk_pc_request(rq) ? blk_rq_bytes(rq) : 0;
+        TP_PROTO(struct request_queue *q, struct request *rq),
 
-                blk_fill_rwbs_rq(__entry->rwbs, rq);
-                blk_dump_cmd(__get_str(cmd), rq);
-                memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
-        ),
+        TP_ARGS(q, rq)
+);
 
-        TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
-                  MAJOR(__entry->dev), MINOR(__entry->dev),
-                  __entry->rwbs, __entry->bytes, __get_str(cmd),
-                  (unsigned long long)__entry->sector,
-                  __entry->nr_sector, __entry->comm)
+DEFINE_EVENT(block_rq_with_error, block_rq_complete,
+
+        TP_PROTO(struct request_queue *q, struct request *rq),
+
+        TP_ARGS(q, rq)
 );
 
-TRACE_EVENT(block_rq_issue,
+DECLARE_EVENT_CLASS(block_rq,
 
         TP_PROTO(struct request_queue *q, struct request *rq),
 
@@ -86,7 +73,7 @@ TRACE_EVENT(block_rq_issue,
                 __field(  unsigned int, nr_sector               )
                 __field(  unsigned int, bytes                   )
                 __array(  char,         rwbs,   6               )
-                __array(  char,         comm,   TASK_COMM_LEN   )
+                __array(  char,         comm,   TASK_COMM_LEN   )
                 __dynamic_array( char,  cmd,    blk_cmd_buf_len(rq)     )
         ),
 
@@ -108,68 +95,18 @@ TRACE_EVENT(block_rq_issue,
                   __entry->nr_sector, __entry->comm)
 );
 
-TRACE_EVENT(block_rq_requeue,
+DEFINE_EVENT(block_rq, block_rq_insert,
 
         TP_PROTO(struct request_queue *q, struct request *rq),
 
-        TP_ARGS(q, rq),
-
-        TP_STRUCT__entry(
-                __field(  dev_t,        dev                     )
-                __field(  sector_t,     sector                  )
-                __field(  unsigned int, nr_sector               )
-                __field(  int,          errors                  )
-                __array(  char,         rwbs,   6               )
-                __dynamic_array( char,  cmd,    blk_cmd_buf_len(rq)     )
-        ),
-
-        TP_fast_assign(
-                __entry->dev       = rq->rq_disk ? disk_devt(rq->rq_disk) : 0;
-                __entry->sector    = blk_pc_request(rq) ? 0 : blk_rq_pos(rq);
-                __entry->nr_sector = blk_pc_request(rq) ? 0 : blk_rq_sectors(rq);
-                __entry->errors    = rq->errors;
-
-                blk_fill_rwbs_rq(__entry->rwbs, rq);
-                blk_dump_cmd(__get_str(cmd), rq);
-        ),
-
-        TP_printk("%d,%d %s (%s) %llu + %u [%d]",
-                  MAJOR(__entry->dev), MINOR(__entry->dev),
-                  __entry->rwbs, __get_str(cmd),
-                  (unsigned long long)__entry->sector,
-                  __entry->nr_sector, __entry->errors)
+        TP_ARGS(q, rq)
 );
 
-TRACE_EVENT(block_rq_complete,
+DEFINE_EVENT(block_rq, block_rq_issue,
 
         TP_PROTO(struct request_queue *q, struct request *rq),
 
-        TP_ARGS(q, rq),
-
-        TP_STRUCT__entry(
-                __field(  dev_t,        dev                     )
-                __field(  sector_t,     sector                  )
-                __field(  unsigned int, nr_sector               )
-                __field(  int,          errors                  )
-                __array(  char,         rwbs,   6               )
-                __dynamic_array( char,  cmd,    blk_cmd_buf_len(rq)     )
-        ),
-
-        TP_fast_assign(
-                __entry->dev       = rq->rq_disk ? disk_devt(rq->rq_disk) : 0;
-                __entry->sector    = blk_pc_request(rq) ? 0 : blk_rq_pos(rq);
-                __entry->nr_sector = blk_pc_request(rq) ? 0 : blk_rq_sectors(rq);
-                __entry->errors    = rq->errors;
-
-                blk_fill_rwbs_rq(__entry->rwbs, rq);
-                blk_dump_cmd(__get_str(cmd), rq);
-        ),
-
-        TP_printk("%d,%d %s (%s) %llu + %u [%d]",
-                  MAJOR(__entry->dev), MINOR(__entry->dev),
-                  __entry->rwbs, __get_str(cmd),
-                  (unsigned long long)__entry->sector,
-                  __entry->nr_sector, __entry->errors)
+        TP_ARGS(q, rq)
 );
 
 TRACE_EVENT(block_bio_bounce,
@@ -228,7 +165,7 @@ TRACE_EVENT(block_bio_complete,
                   __entry->nr_sector, __entry->error)
 );
 
-TRACE_EVENT(block_bio_backmerge,
+DECLARE_EVENT_CLASS(block_bio,
 
         TP_PROTO(struct request_queue *q, struct bio *bio),
 
@@ -256,63 +193,28 @@ TRACE_EVENT(block_bio_backmerge,
                   __entry->nr_sector, __entry->comm)
 );
 
-TRACE_EVENT(block_bio_frontmerge,
+DEFINE_EVENT(block_bio, block_bio_backmerge,
 
         TP_PROTO(struct request_queue *q, struct bio *bio),
 
-        TP_ARGS(q, bio),
-
-        TP_STRUCT__entry(
-                __field( dev_t,         dev                     )
-                __field( sector_t,      sector                  )
-                __field( unsigned,      nr_sector               )
-                __array( char,          rwbs,   6               )
-                __array( char,          comm,   TASK_COMM_LEN   )
-        ),
-
-        TP_fast_assign(
-                __entry->dev            = bio->bi_bdev->bd_dev;
-                __entry->sector         = bio->bi_sector;
-                __entry->nr_sector      = bio->bi_size >> 9;
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
-                memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
-        ),
-
-        TP_printk("%d,%d %s %llu + %u [%s]",
-                  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
-                  (unsigned long long)__entry->sector,
-                  __entry->nr_sector, __entry->comm)
+        TP_ARGS(q, bio)
 );
 
-TRACE_EVENT(block_bio_queue,
+DEFINE_EVENT(block_bio, block_bio_frontmerge,
 
         TP_PROTO(struct request_queue *q, struct bio *bio),
 
-        TP_ARGS(q, bio),
+        TP_ARGS(q, bio)
+);
 
-        TP_STRUCT__entry(
-                __field( dev_t,         dev                     )
-                __field( sector_t,      sector                  )
-                __field( unsigned int,  nr_sector               )
-                __array( char,          rwbs,   6               )
-                __array( char,          comm,   TASK_COMM_LEN   )
-        ),
+DEFINE_EVENT(block_bio, block_bio_queue,
 
-        TP_fast_assign(
-                __entry->dev            = bio->bi_bdev->bd_dev;
-                __entry->sector         = bio->bi_sector;
-                __entry->nr_sector      = bio->bi_size >> 9;
-                blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size);
-                memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
-        ),
+        TP_PROTO(struct request_queue *q, struct bio *bio),
 
-        TP_printk("%d,%d %s %llu + %u [%s]",
-                  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
-                  (unsigned long long)__entry->sector,
-                  __entry->nr_sector, __entry->comm)
+        TP_ARGS(q, bio)
 );
 
-TRACE_EVENT(block_getrq,
+DECLARE_EVENT_CLASS(block_get_rq,
 
         TP_PROTO(struct request_queue *q, struct bio *bio, int rw),
 
@@ -341,33 +243,18 @@ TRACE_EVENT(block_getrq,
                   __entry->nr_sector, __entry->comm)
 );
 
-TRACE_EVENT(block_sleeprq,
+DEFINE_EVENT(block_get_rq, block_getrq,
 
         TP_PROTO(struct request_queue *q, struct bio *bio, int rw),
 
-        TP_ARGS(q, bio, rw),
+        TP_ARGS(q, bio, rw)
+);
 
-        TP_STRUCT__entry(
-                __field( dev_t,         dev                     )
-                __field( sector_t,      sector                  )
-                __field( unsigned int,  nr_sector               )
-                __array( char,          rwbs,   6               )
-                __array( char,          comm,   TASK_COMM_LEN   )
-        ),
+DEFINE_EVENT(block_get_rq, block_sleeprq,
 
-        TP_fast_assign(
-                __entry->dev            = bio ? bio->bi_bdev->bd_dev : 0;
-                __entry->sector         = bio ? bio->bi_sector : 0;
-                __entry->nr_sector      = bio ? bio->bi_size >> 9 : 0;
-                blk_fill_rwbs(__entry->rwbs,
-                            bio ? bio->bi_rw : 0, __entry->nr_sector);
-                memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
-        ),
+        TP_PROTO(struct request_queue *q, struct bio *bio, int rw),
 
-        TP_printk("%d,%d %s %llu + %u [%s]",
-                  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
-                  (unsigned long long)__entry->sector,
-                  __entry->nr_sector, __entry->comm)
+        TP_ARGS(q, bio, rw)
 );
 
 TRACE_EVENT(block_plug,
@@ -387,7 +274,7 @@ TRACE_EVENT(block_plug,
         TP_printk("[%s]", __entry->comm)
 );
 
-TRACE_EVENT(block_unplug_timer,
+DECLARE_EVENT_CLASS(block_unplug,
 
         TP_PROTO(struct request_queue *q),
 
@@ -406,23 +293,18 @@ TRACE_EVENT(block_unplug_timer,
         TP_printk("[%s] %d", __entry->comm, __entry->nr_rq)
 );
 
-TRACE_EVENT(block_unplug_io,
+DEFINE_EVENT(block_unplug, block_unplug_timer,
 
         TP_PROTO(struct request_queue *q),
 
-        TP_ARGS(q),
+        TP_ARGS(q)
+);
 
-        TP_STRUCT__entry(
-                __field( int,           nr_rq                   )
-                __array( char,          comm,   TASK_COMM_LEN   )
-        ),
+DEFINE_EVENT(block_unplug, block_unplug_io,
 
-        TP_fast_assign(
-                __entry->nr_rq  = q->rq.count[READ] + q->rq.count[WRITE];
-                memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
-        ),
+        TP_PROTO(struct request_queue *q),
 
-        TP_printk("[%s] %d", __entry->comm, __entry->nr_rq)
+        TP_ARGS(q)
 );
 
 TRACE_EVENT(block_split,
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index f4c62d33077..d0b6cd3afb2 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -90,7 +90,7 @@ TRACE_EVENT(ext4_allocate_inode,
                   (unsigned long) __entry->dir, __entry->mode)
 );
 
-TRACE_EVENT(ext4_write_begin,
+DECLARE_EVENT_CLASS(ext4__write_begin,
 
         TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                  unsigned int flags),
@@ -118,7 +118,23 @@ TRACE_EVENT(ext4_write_begin,
                   __entry->pos, __entry->len, __entry->flags)
 );
 
-TRACE_EVENT(ext4_ordered_write_end,
+DEFINE_EVENT(ext4__write_begin, ext4_write_begin,
+
+        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
+                 unsigned int flags),
+
+        TP_ARGS(inode, pos, len, flags)
+);
+
+DEFINE_EVENT(ext4__write_begin, ext4_da_write_begin,
+
+        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
+                 unsigned int flags),
+
+        TP_ARGS(inode, pos, len, flags)
+);
+
+DECLARE_EVENT_CLASS(ext4__write_end,
         TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                         unsigned int copied),
 
@@ -145,57 +161,36 @@ TRACE_EVENT(ext4_ordered_write_end,
                   __entry->pos, __entry->len, __entry->copied)
 );
 
-TRACE_EVENT(ext4_writeback_write_end,
+DEFINE_EVENT(ext4__write_end, ext4_ordered_write_end,
+
         TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                  unsigned int copied),
 
-        TP_ARGS(inode, pos, len, copied),
+        TP_ARGS(inode, pos, len, copied)
+);
 
-        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
-                __field(        ino_t,  ino                     )
-                __field(        loff_t, pos                     )
-                __field(        unsigned int, len               )
-                __field(        unsigned int, copied            )
-        ),
+DEFINE_EVENT(ext4__write_end, ext4_writeback_write_end,
 
-        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
-                __entry->ino    = inode->i_ino;
-                __entry->pos    = pos;
-                __entry->len    = len;
-                __entry->copied = copied;
-        ),
+        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
+                 unsigned int copied),
 
-        TP_printk("dev %s ino %lu pos %llu len %u copied %u",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
-                  __entry->pos, __entry->len, __entry->copied)
+        TP_ARGS(inode, pos, len, copied)
 );
 
-TRACE_EVENT(ext4_journalled_write_end,
+DEFINE_EVENT(ext4__write_end, ext4_journalled_write_end,
+
         TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                  unsigned int copied),
-        TP_ARGS(inode, pos, len, copied),
 
-        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
-                __field(        ino_t,  ino                     )
-                __field(        loff_t, pos                     )
-                __field(        unsigned int, len               )
-                __field(        unsigned int, copied            )
-        ),
+        TP_ARGS(inode, pos, len, copied)
+);
 
-        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
-                __entry->ino    = inode->i_ino;
-                __entry->pos    = pos;
-                __entry->len    = len;
-                __entry->copied = copied;
-        ),
+DEFINE_EVENT(ext4__write_end, ext4_da_write_end,
 
-        TP_printk("dev %s ino %lu pos %llu len %u copied %u",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
-                  __entry->pos, __entry->len, __entry->copied)
+        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
+                 unsigned int copied),
+
+        TP_ARGS(inode, pos, len, copied)
 );
 
 TRACE_EVENT(ext4_writepage,
@@ -335,60 +330,6 @@ TRACE_EVENT(ext4_da_writepages_result,
                   (unsigned long) __entry->writeback_index)
 );
 
-TRACE_EVENT(ext4_da_write_begin,
-        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
-                        unsigned int flags),
-
-        TP_ARGS(inode, pos, len, flags),
-
-        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
-                __field(        ino_t,  ino                     )
-                __field(        loff_t, pos                     )
-                __field(        unsigned int, len               )
-                __field(        unsigned int, flags             )
-        ),
-
-        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
-                __entry->ino    = inode->i_ino;
-                __entry->pos    = pos;
-                __entry->len    = len;
-                __entry->flags  = flags;
-        ),
-
-        TP_printk("dev %s ino %lu pos %llu len %u flags %u",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
-                  __entry->pos, __entry->len, __entry->flags)
-);
-
-TRACE_EVENT(ext4_da_write_end,
-        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
-                        unsigned int copied),
-
-        TP_ARGS(inode, pos, len, copied),
-
-        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
-                __field(        ino_t,  ino                     )
-                __field(        loff_t, pos                     )
-                __field(        unsigned int, len               )
-                __field(        unsigned int, copied            )
-        ),
-
-        TP_fast_assign(
-                __entry->dev    = inode->i_sb->s_dev;
-                __entry->ino    = inode->i_ino;
-                __entry->pos    = pos;
-                __entry->len    = len;
-                __entry->copied = copied;
-        ),
-
-        TP_printk("dev %s ino %lu pos %llu len %u copied %u",
-                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
-                  __entry->pos, __entry->len, __entry->copied)
-);
-
 TRACE_EVENT(ext4_discard_blocks,
         TP_PROTO(struct super_block *sb, unsigned long long blk,
                         unsigned long long count),
diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
index b89f9db4a40..0e4cfb694fe 100644
--- a/include/trace/events/irq.h
+++ b/include/trace/events/irq.h
@@ -48,7 +48,7 @@ TRACE_EVENT(irq_handler_entry,
                 __assign_str(name, action->name);
         ),
 
-        TP_printk("irq=%d handler=%s", __entry->irq, __get_str(name))
+        TP_printk("irq=%d name=%s", __entry->irq, __get_str(name))
 );
 
 /**
@@ -78,22 +78,11 @@ TRACE_EVENT(irq_handler_exit,
                 __entry->ret    = ret;
         ),
 
-        TP_printk("irq=%d return=%s",
+        TP_printk("irq=%d ret=%s",
                   __entry->irq, __entry->ret ? "handled" : "unhandled")
 );
 
-/**
- * softirq_entry - called immediately before the softirq handler
- * @h: pointer to struct softirq_action
- * @vec: pointer to first struct softirq_action in softirq_vec array
- *
- * The @h parameter, contains a pointer to the struct softirq_action
- * which has a pointer to the action handler that is called. By subtracting
- * the @vec pointer from the @h pointer, we can determine the softirq
- * number. Also, when used in combination with the softirq_exit tracepoint
- * we can determine the softirq latency.
- */
-TRACE_EVENT(softirq_entry,
+DECLARE_EVENT_CLASS(softirq,
 
         TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
 
@@ -107,11 +96,29 @@ TRACE_EVENT(softirq_entry,
                 __entry->vec = (int)(h - vec);
         ),
 
-        TP_printk("softirq=%d action=%s", __entry->vec,
+        TP_printk("vec=%d [action=%s]", __entry->vec,
                   show_softirq_name(__entry->vec))
 );
 
 /**
+ * softirq_entry - called immediately before the softirq handler
+ * @h: pointer to struct softirq_action
+ * @vec: pointer to first struct softirq_action in softirq_vec array
+ *
+ * The @h parameter, contains a pointer to the struct softirq_action
+ * which has a pointer to the action handler that is called. By subtracting
+ * the @vec pointer from the @h pointer, we can determine the softirq
+ * number. Also, when used in combination with the softirq_exit tracepoint
+ * we can determine the softirq latency.
+ */
+DEFINE_EVENT(softirq, softirq_entry,
+
+        TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
+
+        TP_ARGS(h, vec)
+);
+
+/**
  * softirq_exit - called immediately after the softirq handler returns
  * @h: pointer to struct softirq_action
  * @vec: pointer to first struct softirq_action in softirq_vec array
@@ -122,22 +129,11 @@ TRACE_EVENT(softirq_entry,
  * combination with the softirq_entry tracepoint we can determine the softirq
  * latency.
  */
-TRACE_EVENT(softirq_exit,
+DEFINE_EVENT(softirq, softirq_exit,
 
         TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
 
-        TP_ARGS(h, vec),
-
-        TP_STRUCT__entry(
-                __field(        int,    vec                     )
-        ),
-
-        TP_fast_assign(
-                __entry->vec = (int)(h - vec);
-        ),
-
-        TP_printk("softirq=%d action=%s", __entry->vec,
-                  show_softirq_name(__entry->vec))
+        TP_ARGS(h, vec)
 );
 
 #endif /*  _TRACE_IRQ_H */
diff --git a/include/trace/events/jbd2.h b/include/trace/events/jbd2.h
index 3c60b75adb9..96b370a050d 100644
--- a/include/trace/events/jbd2.h
+++ b/include/trace/events/jbd2.h
@@ -30,7 +30,7 @@ TRACE_EVENT(jbd2_checkpoint,
                   jbd2_dev_to_name(__entry->dev), __entry->result)
 );
 
-TRACE_EVENT(jbd2_start_commit,
+DECLARE_EVENT_CLASS(jbd2_commit,
 
         TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
 
@@ -53,73 +53,32 @@ TRACE_EVENT(jbd2_start_commit,
                   __entry->sync_commit)
 );
 
-TRACE_EVENT(jbd2_commit_locking,
+DEFINE_EVENT(jbd2_commit, jbd2_start_commit,
 
         TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
 
-        TP_ARGS(journal, commit_transaction),
-
-        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
-                __field(        char,   sync_commit               )
-                __field(        int,    transaction               )
-        ),
-
-        TP_fast_assign(
-                __entry->dev            = journal->j_fs_dev->bd_dev;
-                __entry->sync_commit = commit_transaction->t_synchronous_commit;
-                __entry->transaction    = commit_transaction->t_tid;
-        ),
-
-        TP_printk("dev %s transaction %d sync %d",
-                  jbd2_dev_to_name(__entry->dev), __entry->transaction,
-                  __entry->sync_commit)
+        TP_ARGS(journal, commit_transaction)
 );
 
-TRACE_EVENT(jbd2_commit_flushing,
+DEFINE_EVENT(jbd2_commit, jbd2_commit_locking,
 
         TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
 
-        TP_ARGS(journal, commit_transaction),
-
-        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
-                __field(        char,   sync_commit               )
-                __field(        int,    transaction               )
-        ),
-
-        TP_fast_assign(
-                __entry->dev            = journal->j_fs_dev->bd_dev;
-                __entry->sync_commit = commit_transaction->t_synchronous_commit;
-                __entry->transaction    = commit_transaction->t_tid;
-        ),
-
-        TP_printk("dev %s transaction %d sync %d",
-                  jbd2_dev_to_name(__entry->dev), __entry->transaction,
-                  __entry->sync_commit)
+        TP_ARGS(journal, commit_transaction)
 );
 
-TRACE_EVENT(jbd2_commit_logging,
+DEFINE_EVENT(jbd2_commit, jbd2_commit_flushing,
 
         TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
 
-        TP_ARGS(journal, commit_transaction),
+        TP_ARGS(journal, commit_transaction)
+);
 
-        TP_STRUCT__entry(
-                __field(        dev_t,  dev                     )
-                __field(        char,   sync_commit               )
-                __field(        int,    transaction               )
-        ),
+DEFINE_EVENT(jbd2_commit, jbd2_commit_logging,
 
-        TP_fast_assign(
-                __entry->dev            = journal->j_fs_dev->bd_dev;
-                __entry->sync_commit = commit_transaction->t_synchronous_commit;
-                __entry->transaction    = commit_transaction->t_tid;
-        ),
+        TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
 
-        TP_printk("dev %s transaction %d sync %d",
-                  jbd2_dev_to_name(__entry->dev), __entry->transaction,
-                  __entry->sync_commit)
+        TP_ARGS(journal, commit_transaction)
 );
 
 TRACE_EVENT(jbd2_end_commit,
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index eaf46bdd18a..3adca0ca9db 100644
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -44,7 +44,7 @@
         {(unsigned long)__GFP_MOVABLE,          "GFP_MOVABLE"}          \
         ) : "GFP_NOWAIT"
 
-TRACE_EVENT(kmalloc,
+DECLARE_EVENT_CLASS(kmem_alloc,
 
         TP_PROTO(unsigned long call_site,
                  const void *ptr,
@@ -78,41 +78,23 @@ TRACE_EVENT(kmalloc,
                 show_gfp_flags(__entry->gfp_flags))
 );
 
-TRACE_EVENT(kmem_cache_alloc,
+DEFINE_EVENT(kmem_alloc, kmalloc,
 
-        TP_PROTO(unsigned long call_site,
-                 const void *ptr,
-                 size_t bytes_req,
-                 size_t bytes_alloc,
-                 gfp_t gfp_flags),
+        TP_PROTO(unsigned long call_site, const void *ptr,
+                 size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
 
-        TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags),
+        TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags)
+);
 
-        TP_STRUCT__entry(
-                __field(        unsigned long,  call_site       )
-                __field(        const void *,   ptr             )
-                __field(        size_t,         bytes_req       )
-                __field(        size_t,         bytes_alloc     )
-                __field(        gfp_t,          gfp_flags       )
-        ),
+DEFINE_EVENT(kmem_alloc, kmem_cache_alloc,
 
-        TP_fast_assign(
-                __entry->call_site      = call_site;
-                __entry->ptr            = ptr;
-                __entry->bytes_req      = bytes_req;
-                __entry->bytes_alloc    = bytes_alloc;
-                __entry->gfp_flags      = gfp_flags;
-        ),
+        TP_PROTO(unsigned long call_site, const void *ptr,
+                 size_t bytes_req, size_t bytes_alloc, gfp_t gfp_flags),
 
-        TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s",
-                __entry->call_site,
-                __entry->ptr,
-                __entry->bytes_req,
-                __entry->bytes_alloc,
-                show_gfp_flags(__entry->gfp_flags))
+        TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags)
 );
 
-TRACE_EVENT(kmalloc_node,
+DECLARE_EVENT_CLASS(kmem_alloc_node,
 
         TP_PROTO(unsigned long call_site,
                  const void *ptr,
@@ -150,45 +132,25 @@ TRACE_EVENT(kmalloc_node,
                 __entry->node)
 );
 
-TRACE_EVENT(kmem_cache_alloc_node,
+DEFINE_EVENT(kmem_alloc_node, kmalloc_node,
 
-        TP_PROTO(unsigned long call_site,
-                 const void *ptr,
-                 size_t bytes_req,
-                 size_t bytes_alloc,
-                 gfp_t gfp_flags,
-                 int node),
+        TP_PROTO(unsigned long call_site, const void *ptr,
+                 size_t bytes_req, size_t bytes_alloc,
+                 gfp_t gfp_flags, int node),
 
-        TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node),
+        TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node)
+);
 
-        TP_STRUCT__entry(
-                __field(        unsigned long,  call_site       )
-                __field(        const void *,   ptr             )
-                __field(        size_t,         bytes_req       )
-                __field(        size_t,         bytes_alloc     )
-                __field(        gfp_t,          gfp_flags       )
-                __field(        int,            node            )
-        ),
+DEFINE_EVENT(kmem_alloc_node, kmem_cache_alloc_node,
 
-        TP_fast_assign(
-                __entry->call_site      = call_site;
-                __entry->ptr            = ptr;
-                __entry->bytes_req      = bytes_req;
-                __entry->bytes_alloc    = bytes_alloc;
-                __entry->gfp_flags      = gfp_flags;
-                __entry->node           = node;
-        ),
+        TP_PROTO(unsigned long call_site, const void *ptr,
+                 size_t bytes_req, size_t bytes_alloc,
+                 gfp_t gfp_flags, int node),
 
-        TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s node=%d",
-                __entry->call_site,
-                __entry->ptr,
-                __entry->bytes_req,
-                __entry->bytes_alloc,
-                show_gfp_flags(__entry->gfp_flags),
-                __entry->node)
+        TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node)
 );
 
-TRACE_EVENT(kfree,
+DECLARE_EVENT_CLASS(kmem_free,
 
         TP_PROTO(unsigned long call_site, const void *ptr),
 
@@ -207,23 +169,18 @@ TRACE_EVENT(kfree,
         TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)
 );
 
-TRACE_EVENT(kmem_cache_free,
+DEFINE_EVENT(kmem_free, kfree,
 
         TP_PROTO(unsigned long call_site, const void *ptr),
 
-        TP_ARGS(call_site, ptr),
+        TP_ARGS(call_site, ptr)
+);
 
-        TP_STRUCT__entry(
-                __field(        unsigned long,  call_site       )
-                __field(        const void *,   ptr             )
-        ),
+DEFINE_EVENT(kmem_free, kmem_cache_free,
 
-        TP_fast_assign(
-                __entry->call_site      = call_site;
-                __entry->ptr            = ptr;
-        ),
+        TP_PROTO(unsigned long call_site, const void *ptr),
 
-        TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)
+        TP_ARGS(call_site, ptr)
 );
 
 TRACE_EVENT(mm_page_free_direct,
@@ -299,7 +256,7 @@ TRACE_EVENT(mm_page_alloc,
                 show_gfp_flags(__entry->gfp_flags))
 );
 
-TRACE_EVENT(mm_page_alloc_zone_locked,
+DECLARE_EVENT_CLASS(mm_page,
 
         TP_PROTO(struct page *page, unsigned int order, int migratetype),
 
@@ -325,29 +282,22 @@ TRACE_EVENT(mm_page_alloc_zone_locked,
                 __entry->order == 0)
 );
 
-TRACE_EVENT(mm_page_pcpu_drain,
+DEFINE_EVENT(mm_page, mm_page_alloc_zone_locked,
 
-        TP_PROTO(struct page *page, int order, int migratetype),
+        TP_PROTO(struct page *page, unsigned int order, int migratetype),
 
-        TP_ARGS(page, order, migratetype),
+        TP_ARGS(page, order, migratetype)
+);
 
-        TP_STRUCT__entry(
-                __field(        struct page *,  page            )
-                __field(        int,            order           )
-                __field(        int,            migratetype     )
-        ),
+DEFINE_EVENT_PRINT(mm_page, mm_page_pcpu_drain,
 
-        TP_fast_assign(
-                __entry->page           = page;
-                __entry->order          = order;
-                __entry->migratetype    = migratetype;
-        ),
+        TP_PROTO(struct page *page, unsigned int order, int migratetype),
+
+        TP_ARGS(page, order, migratetype),
 
         TP_printk("page=%p pfn=%lu order=%d migratetype=%d",
-                __entry->page,
-                page_to_pfn(__entry->page),
-                __entry->order,
-                __entry->migratetype)
+                __entry->page, page_to_pfn(__entry->page),
+                __entry->order, __entry->migratetype)
 );
 
 TRACE_EVENT(mm_page_alloc_extfrag,
diff --git a/include/trace/events/lockdep.h b/include/trace/events/lock.h
index bcf1d209a00..a870ba125aa 100644
--- a/include/trace/events/lockdep.h
+++ b/include/trace/events/lock.h
@@ -1,8 +1,8 @@
 #undef TRACE_SYSTEM
-#define TRACE_SYSTEM lockdep
+#define TRACE_SYSTEM lock
 
-#if !defined(_TRACE_LOCKDEP_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_LOCKDEP_H
+#if !defined(_TRACE_LOCK_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_LOCK_H
 
 #include <linux/lockdep.h>
 #include <linux/tracepoint.h>
@@ -90,7 +90,7 @@ TRACE_EVENT(lock_acquired,
 #endif
 #endif
 
-#endif /* _TRACE_LOCKDEP_H */
+#endif /* _TRACE_LOCK_H */
 
 /* This part must be outside protection */
 #include <trace/define_trace.h>
diff --git a/include/trace/events/mce.h b/include/trace/events/mce.h
new file mode 100644
index 00000000000..7eee77895cb
--- /dev/null
+++ b/include/trace/events/mce.h
@@ -0,0 +1,69 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM mce
+
+#if !defined(_TRACE_MCE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_MCE_H
+
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+#include <asm/mce.h>
+
+TRACE_EVENT(mce_record,
+
+        TP_PROTO(struct mce *m),
+
+        TP_ARGS(m),
+
+        TP_STRUCT__entry(
+                __field(        u64,            mcgcap          )
+                __field(        u64,            mcgstatus       )
+                __field(        u8,             bank            )
+                __field(        u64,            status          )
+                __field(        u64,            addr            )
+                __field(        u64,            misc            )
+                __field(        u64,            ip              )
+                __field(        u8,             cs              )
+                __field(        u64,            tsc             )
+                __field(        u64,            walltime        )
+                __field(        u32,            cpu             )
+                __field(        u32,            cpuid           )
+                __field(        u32,            apicid          )
+                __field(        u32,            socketid        )
+                __field(        u8,             cpuvendor       )
+        ),
+
+        TP_fast_assign(
+                __entry->mcgcap         = m->mcgcap;
+                __entry->mcgstatus      = m->mcgstatus;
+                __entry->bank           = m->bank;
+                __entry->status         = m->status;
+                __entry->addr           = m->addr;
+                __entry->misc           = m->misc;
+                __entry->ip             = m->ip;
+                __entry->cs             = m->cs;
+                __entry->tsc            = m->tsc;
+                __entry->walltime       = m->time;
+                __entry->cpu            = m->extcpu;
+                __entry->cpuid          = m->cpuid;
+                __entry->apicid         = m->apicid;
+                __entry->socketid       = m->socketid;
+                __entry->cpuvendor      = m->cpuvendor;
+        ),
+
+        TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016Lx, ADDR/MISC: %016Lx/%016Lx, RIP: %02x:<%016Lx>, TSC: %llx, PROCESSOR: %u:%x, TIME: %llu, SOCKET: %u, APIC: %x",
+                __entry->cpu,
+                __entry->mcgcap, __entry->mcgstatus,
+                __entry->bank, __entry->status,
+                __entry->addr, __entry->misc,
+                __entry->cs, __entry->ip,
+                __entry->tsc,
+                __entry->cpuvendor, __entry->cpuid,
+                __entry->walltime,
+                __entry->socketid,
+                __entry->apicid)
+);
+
+#endif /* _TRACE_MCE_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/module.h b/include/trace/events/module.h
index 84160fb1847..4b0f48ba16a 100644
--- a/include/trace/events/module.h
+++ b/include/trace/events/module.h
@@ -51,7 +51,7 @@ TRACE_EVENT(module_free,
         TP_printk("%s", __get_str(name))
 );
 
-TRACE_EVENT(module_get,
+DECLARE_EVENT_CLASS(module_refcnt,
 
         TP_PROTO(struct module *mod, unsigned long ip, int refcnt),
 
@@ -73,26 +73,18 @@ TRACE_EVENT(module_get,
                   __get_str(name), (void *)__entry->ip, __entry->refcnt)
 );
 
-TRACE_EVENT(module_put,
+DEFINE_EVENT(module_refcnt, module_get,
 
         TP_PROTO(struct module *mod, unsigned long ip, int refcnt),
 
-        TP_ARGS(mod, ip, refcnt),
+        TP_ARGS(mod, ip, refcnt)
+);
 
-        TP_STRUCT__entry(
-                __field(        unsigned long,  ip              )
-                __field(        int,            refcnt          )
-                __string(       name,           mod->name       )
-        ),
+DEFINE_EVENT(module_refcnt, module_put,
 
-        TP_fast_assign(
-                __entry->ip     = ip;
-                __entry->refcnt = refcnt;
-                __assign_str(name, mod->name);
-        ),
+        TP_PROTO(struct module *mod, unsigned long ip, int refcnt),
 
-        TP_printk("%s call_site=%pf refcnt=%d",
-                  __get_str(name), (void *)__entry->ip, __entry->refcnt)
+        TP_ARGS(mod, ip, refcnt)
 );
 
 TRACE_EVENT(module_request,
diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index ea6d579261a..c4efe9b8280 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -16,9 +16,7 @@ enum {
 };
 #endif
 
-
-
-TRACE_EVENT(power_start,
+DECLARE_EVENT_CLASS(power,
 
         TP_PROTO(unsigned int type, unsigned int state),
 
@@ -37,42 +35,36 @@ TRACE_EVENT(power_start,
         TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, (unsigned long)__entry->state)
 );
 
-TRACE_EVENT(power_end,
-
-        TP_PROTO(int dummy),
+DEFINE_EVENT(power, power_start,
 
-        TP_ARGS(dummy),
+        TP_PROTO(unsigned int type, unsigned int state),
 
-        TP_STRUCT__entry(
-                __field(        u64,            dummy           )
-        ),
+        TP_ARGS(type, state)
+);
 
-        TP_fast_assign(
-                __entry->dummy = 0xffff;
-        ),
+DEFINE_EVENT(power, power_frequency,
 
-        TP_printk("dummy=%lu", (unsigned long)__entry->dummy)
+        TP_PROTO(unsigned int type, unsigned int state),
 
+        TP_ARGS(type, state)
 );
 
+TRACE_EVENT(power_end,
 
-TRACE_EVENT(power_frequency,
-
-        TP_PROTO(unsigned int type, unsigned int state),
+        TP_PROTO(int dummy),
 
-        TP_ARGS(type, state),
+        TP_ARGS(dummy),
 
         TP_STRUCT__entry(
-                __field(        u64,            type            )
-                __field(        u64,            state           )
+                __field(        u64,            dummy           )
         ),
 
         TP_fast_assign(
-                __entry->type = type;
-                __entry->state = state;
+                __entry->dummy = 0xffff;
         ),
 
-        TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, (unsigned long) __entry->state)
+        TP_printk("dummy=%lu", (unsigned long)__entry->dummy)
+
 );
 
 #endif /* _TRACE_POWER_H */
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 4069c43f418..cfceb0b73e2 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -26,7 +26,7 @@ TRACE_EVENT(sched_kthread_stop,
                 __entry->pid    = t->pid;
         ),
 
-        TP_printk("task %s:%d", __entry->comm, __entry->pid)
+        TP_printk("comm=%s pid=%d", __entry->comm, __entry->pid)
 );
 
 /*
@@ -46,7 +46,7 @@ TRACE_EVENT(sched_kthread_stop_ret,
                 __entry->ret    = ret;
         ),
 
-        TP_printk("ret %d", __entry->ret)
+        TP_printk("ret=%d", __entry->ret)
 );
 
 /*
@@ -73,7 +73,7 @@ TRACE_EVENT(sched_wait_task,
                 __entry->prio   = p->prio;
         ),
 
-        TP_printk("task %s:%d [%d]",
+        TP_printk("comm=%s pid=%d prio=%d",
                   __entry->comm, __entry->pid, __entry->prio)
 );
 
@@ -83,7 +83,7 @@ TRACE_EVENT(sched_wait_task,
  * (NOTE: the 'rq' argument is not used by generic trace events,
  *        but used by the latency tracer plugin. )
  */
-TRACE_EVENT(sched_wakeup,
+DECLARE_EVENT_CLASS(sched_wakeup_template,
 
         TP_PROTO(struct rq *rq, struct task_struct *p, int success),
 
@@ -94,7 +94,7 @@ TRACE_EVENT(sched_wakeup,
                 __field(        pid_t,  pid                     )
                 __field(        int,    prio                    )
                 __field(        int,    success                 )
-                __field(        int,    cpu                     )
+                __field(        int,    target_cpu              )
         ),
 
         TP_fast_assign(
@@ -102,46 +102,27 @@ TRACE_EVENT(sched_wakeup,
                 __entry->pid            = p->pid;
                 __entry->prio           = p->prio;
                 __entry->success        = success;
-                __entry->cpu            = task_cpu(p);
+                __entry->target_cpu     = task_cpu(p);
         ),
 
-        TP_printk("task %s:%d [%d] success=%d [%03d]",
+        TP_printk("comm=%s pid=%d prio=%d success=%d target_cpu=%03d",
                   __entry->comm, __entry->pid, __entry->prio,
-                  __entry->success, __entry->cpu)
+                  __entry->success, __entry->target_cpu)
 );
 
+DEFINE_EVENT(sched_wakeup_template, sched_wakeup,
+             TP_PROTO(struct rq *rq, struct task_struct *p, int success),
+             TP_ARGS(rq, p, success));
+
 /*
  * Tracepoint for waking up a new task:
  *
  * (NOTE: the 'rq' argument is not used by generic trace events,
  *        but used by the latency tracer plugin. )
  */
-TRACE_EVENT(sched_wakeup_new,
-
-        TP_PROTO(struct rq *rq, struct task_struct *p, int success),
-
-        TP_ARGS(rq, p, success),
-
-        TP_STRUCT__entry(
-                __array(        char,   comm,   TASK_COMM_LEN   )
-                __field(        pid_t,  pid                     )
-                __field(        int,    prio                    )
-                __field(        int,    success                 )
-                __field(        int,    cpu                     )
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
-                __entry->pid            = p->pid;
-                __entry->prio           = p->prio;
-                __entry->success        = success;
-                __entry->cpu            = task_cpu(p);
-        ),
-
-        TP_printk("task %s:%d [%d] success=%d [%03d]",
-                  __entry->comm, __entry->pid, __entry->prio,
-                  __entry->success, __entry->cpu)
-);
+DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new,
+             TP_PROTO(struct rq *rq, struct task_struct *p, int success),
+             TP_ARGS(rq, p, success));
 
 /*
  * Tracepoint for task switches, performed by the scheduler:
@@ -176,7 +157,7 @@ TRACE_EVENT(sched_switch,
                 __entry->next_prio      = next->prio;
         ),
 
-        TP_printk("task %s:%d [%d] (%s) ==> %s:%d [%d]",
+        TP_printk("prev_comm=%s prev_pid=%d prev_prio=%d prev_state=%s ==> next_comm=%s next_pid=%d next_prio=%d",
                 __entry->prev_comm, __entry->prev_pid, __entry->prev_prio,
                 __entry->prev_state ?
                   __print_flags(__entry->prev_state, "|",
@@ -211,15 +192,12 @@ TRACE_EVENT(sched_migrate_task,
                 __entry->dest_cpu       = dest_cpu;
         ),
 
-        TP_printk("task %s:%d [%d] from: %d  to: %d",
+        TP_printk("comm=%s pid=%d prio=%d orig_cpu=%d dest_cpu=%d",
                   __entry->comm, __entry->pid, __entry->prio,
                   __entry->orig_cpu, __entry->dest_cpu)
 );
 
-/*
- * Tracepoint for freeing a task:
- */
-TRACE_EVENT(sched_process_free,
+DECLARE_EVENT_CLASS(sched_process_template,
 
         TP_PROTO(struct task_struct *p),
 
@@ -237,34 +215,24 @@ TRACE_EVENT(sched_process_free,
                 __entry->prio           = p->prio;
         ),
 
-        TP_printk("task %s:%d [%d]",
+        TP_printk("comm=%s pid=%d prio=%d",
                   __entry->comm, __entry->pid, __entry->prio)
 );
 
 /*
- * Tracepoint for a task exiting:
+ * Tracepoint for freeing a task:
  */
-TRACE_EVENT(sched_process_exit,
+DEFINE_EVENT(sched_process_template, sched_process_free,
+             TP_PROTO(struct task_struct *p),
+             TP_ARGS(p));
+             
 
-        TP_PROTO(struct task_struct *p),
-
-        TP_ARGS(p),
-
-        TP_STRUCT__entry(
-                __array(        char,   comm,   TASK_COMM_LEN   )
-                __field(        pid_t,  pid                     )
-                __field(        int,    prio                    )
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
-                __entry->pid            = p->pid;
-                __entry->prio           = p->prio;
-        ),
-
-        TP_printk("task %s:%d [%d]",
-                  __entry->comm, __entry->pid, __entry->prio)
-);
+/*
+ * Tracepoint for a task exiting:
+ */
+DEFINE_EVENT(sched_process_template, sched_process_exit,
+             TP_PROTO(struct task_struct *p),
+             TP_ARGS(p));
 
 /*
  * Tracepoint for a waiting task:
@@ -287,7 +255,7 @@ TRACE_EVENT(sched_process_wait,
                 __entry->prio           = current->prio;
         ),
 
-        TP_printk("task %s:%d [%d]",
+        TP_printk("comm=%s pid=%d prio=%d",
                   __entry->comm, __entry->pid, __entry->prio)
 );
 
@@ -314,46 +282,16 @@ TRACE_EVENT(sched_process_fork,
                 __entry->child_pid      = child->pid;
         ),
 
-        TP_printk("parent %s:%d  child %s:%d",
+        TP_printk("comm=%s pid=%d child_comm=%s child_pid=%d",
                 __entry->parent_comm, __entry->parent_pid,
                 __entry->child_comm, __entry->child_pid)
 );
 
 /*
- * Tracepoint for sending a signal:
- */
-TRACE_EVENT(sched_signal_send,
-
-        TP_PROTO(int sig, struct task_struct *p),
-
-        TP_ARGS(sig, p),
-
-        TP_STRUCT__entry(
-                __field(        int,    sig                     )
-                __array(        char,   comm,   TASK_COMM_LEN   )
-                __field(        pid_t,  pid                     )
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
-                __entry->pid    = p->pid;
-                __entry->sig    = sig;
-        ),
-
-        TP_printk("sig: %d  task %s:%d",
-                  __entry->sig, __entry->comm, __entry->pid)
-);
-
-/*
  * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE
  *     adding sched_stat support to SCHED_FIFO/RR would be welcome.
  */
-
-/*
- * Tracepoint for accounting wait time (time the task is runnable
- * but not actually running due to scheduler contention).
- */
-TRACE_EVENT(sched_stat_wait,
+DECLARE_EVENT_CLASS(sched_stat_template,
 
         TP_PROTO(struct task_struct *tsk, u64 delay),
 
@@ -374,11 +312,36 @@ TRACE_EVENT(sched_stat_wait,
                 __perf_count(delay);
         ),
 
-        TP_printk("task: %s:%d wait: %Lu [ns]",
+        TP_printk("comm=%s pid=%d delay=%Lu [ns]",
                         __entry->comm, __entry->pid,
                         (unsigned long long)__entry->delay)
 );
 
+
+/*
+ * Tracepoint for accounting wait time (time the task is runnable
+ * but not actually running due to scheduler contention).
+ */
+DEFINE_EVENT(sched_stat_template, sched_stat_wait,
+             TP_PROTO(struct task_struct *tsk, u64 delay),
+             TP_ARGS(tsk, delay));
+
+/*
+ * Tracepoint for accounting sleep time (time the task is not runnable,
+ * including iowait, see below).
+ */
+DEFINE_EVENT(sched_stat_template, sched_stat_sleep,
+             TP_PROTO(struct task_struct *tsk, u64 delay),
+             TP_ARGS(tsk, delay));
+
+/*
+ * Tracepoint for accounting iowait time (time the task is not runnable
+ * due to waiting on IO to complete).
+ */
+DEFINE_EVENT(sched_stat_template, sched_stat_iowait,
+             TP_PROTO(struct task_struct *tsk, u64 delay),
+             TP_ARGS(tsk, delay));
+
 /*
  * Tracepoint for accounting runtime (time the task is executing
  * on a CPU).
@@ -406,72 +369,12 @@ TRACE_EVENT(sched_stat_runtime,
                 __perf_count(runtime);
         ),
 
-        TP_printk("task: %s:%d runtime: %Lu [ns], vruntime: %Lu [ns]",
+        TP_printk("comm=%s pid=%d runtime=%Lu [ns] vruntime=%Lu [ns]",
                         __entry->comm, __entry->pid,
                         (unsigned long long)__entry->runtime,
                         (unsigned long long)__entry->vruntime)
 );
 
-/*
- * Tracepoint for accounting sleep time (time the task is not runnable,
- * including iowait, see below).
- */
-TRACE_EVENT(sched_stat_sleep,
-
-        TP_PROTO(struct task_struct *tsk, u64 delay),
-
-        TP_ARGS(tsk, delay),
-
-        TP_STRUCT__entry(
-                __array( char,  comm,   TASK_COMM_LEN   )
-                __field( pid_t, pid                     )
-                __field( u64,   delay                   )
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);
-                __entry->pid    = tsk->pid;
-                __entry->delay  = delay;
-        )
-        TP_perf_assign(
-                __perf_count(delay);
-        ),
-
-        TP_printk("task: %s:%d sleep: %Lu [ns]",
-                        __entry->comm, __entry->pid,
-                        (unsigned long long)__entry->delay)
-);
-
-/*
- * Tracepoint for accounting iowait time (time the task is not runnable
- * due to waiting on IO to complete).
- */
-TRACE_EVENT(sched_stat_iowait,
-
-        TP_PROTO(struct task_struct *tsk, u64 delay),
-
-        TP_ARGS(tsk, delay),
-
-        TP_STRUCT__entry(
-                __array( char,  comm,   TASK_COMM_LEN   )
-                __field( pid_t, pid                     )
-                __field( u64,   delay                   )
-        ),
-
-        TP_fast_assign(
-                memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);
-                __entry->pid    = tsk->pid;
-                __entry->delay  = delay;
-        )
-        TP_perf_assign(
-                __perf_count(delay);
-        ),
-
-        TP_printk("task: %s:%d iowait: %Lu [ns]",
-                        __entry->comm, __entry->pid,
-                        (unsigned long long)__entry->delay)
-);
-
 #endif /* _TRACE_SCHED_H */
 
 /* This part must be outside protection */
diff --git a/include/trace/events/signal.h b/include/trace/events/signal.h
new file mode 100644
index 00000000000..a510b75ac30
--- /dev/null
+++ b/include/trace/events/signal.h
@@ -0,0 +1,173 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM signal
+
+#if !defined(_TRACE_SIGNAL_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_SIGNAL_H
+
+#include <linux/signal.h>
+#include <linux/sched.h>
+#include <linux/tracepoint.h>
+
+#define TP_STORE_SIGINFO(__entry, info)                         \
+        do {                                                    \
+                if (info == SEND_SIG_NOINFO) {                  \
+                        __entry->errno  = 0;                    \
+                        __entry->code   = SI_USER;              \
+                } else if (info == SEND_SIG_PRIV) {             \
+                        __entry->errno  = 0;                    \
+                        __entry->code   = SI_KERNEL;            \
+                } else {                                        \
+                        __entry->errno  = info->si_errno;       \
+                        __entry->code   = info->si_code;        \
+                }                                               \
+        } while (0)
+
+/**
+ * signal_generate - called when a signal is generated
+ * @sig: signal number
+ * @info: pointer to struct siginfo
+ * @task: pointer to struct task_struct
+ *
+ * Current process sends a 'sig' signal to 'task' process with
+ * 'info' siginfo. If 'info' is SEND_SIG_NOINFO or SEND_SIG_PRIV,
+ * 'info' is not a pointer and you can't access its field. Instead,
+ * SEND_SIG_NOINFO means that si_code is SI_USER, and SEND_SIG_PRIV
+ * means that si_code is SI_KERNEL.
+ */
+TRACE_EVENT(signal_generate,
+
+        TP_PROTO(int sig, struct siginfo *info, struct task_struct *task),
+
+        TP_ARGS(sig, info, task),
+
+        TP_STRUCT__entry(
+                __field(        int,    sig                     )
+                __field(        int,    errno                   )
+                __field(        int,    code                    )
+                __array(        char,   comm,   TASK_COMM_LEN   )
+                __field(        pid_t,  pid                     )
+        ),
+
+        TP_fast_assign(
+                __entry->sig    = sig;
+                TP_STORE_SIGINFO(__entry, info);
+                memcpy(__entry->comm, task->comm, TASK_COMM_LEN);
+                __entry->pid    = task->pid;
+        ),
+
+        TP_printk("sig=%d errno=%d code=%d comm=%s pid=%d",
+                  __entry->sig, __entry->errno, __entry->code,
+                  __entry->comm, __entry->pid)
+);
+
+/**
+ * signal_deliver - called when a signal is delivered
+ * @sig: signal number
+ * @info: pointer to struct siginfo
+ * @ka: pointer to struct k_sigaction
+ *
+ * A 'sig' signal is delivered to current process with 'info' siginfo,
+ * and it will be handled by 'ka'. ka->sa.sa_handler can be SIG_IGN or
+ * SIG_DFL.
+ * Note that some signals reported by signal_generate tracepoint can be
+ * lost, ignored or modified (by debugger) before hitting this tracepoint.
+ * This means, this can show which signals are actually delivered, but
+ * matching generated signals and delivered signals may not be correct.
+ */
+TRACE_EVENT(signal_deliver,
+
+        TP_PROTO(int sig, struct siginfo *info, struct k_sigaction *ka),
+
+        TP_ARGS(sig, info, ka),
+
+        TP_STRUCT__entry(
+                __field(        int,            sig             )
+                __field(        int,            errno           )
+                __field(        int,            code            )
+                __field(        unsigned long,  sa_handler      )
+                __field(        unsigned long,  sa_flags        )
+        ),
+
+        TP_fast_assign(
+                __entry->sig    = sig;
+                TP_STORE_SIGINFO(__entry, info);
+                __entry->sa_handler     = (unsigned long)ka->sa.sa_handler;
+                __entry->sa_flags       = ka->sa.sa_flags;
+        ),
+
+        TP_printk("sig=%d errno=%d code=%d sa_handler=%lx sa_flags=%lx",
+                  __entry->sig, __entry->errno, __entry->code,
+                  __entry->sa_handler, __entry->sa_flags)
+);
+
+/**
+ * signal_overflow_fail - called when signal queue is overflow
+ * @sig: signal number
+ * @group: signal to process group or not (bool)
+ * @info: pointer to struct siginfo
+ *
+ * Kernel fails to generate 'sig' signal with 'info' siginfo, because
+ * siginfo queue is overflow, and the signal is dropped.
+ * 'group' is not 0 if the signal will be sent to a process group.
+ * 'sig' is always one of RT signals.
+ */
+TRACE_EVENT(signal_overflow_fail,
+
+        TP_PROTO(int sig, int group, struct siginfo *info),
+
+        TP_ARGS(sig, group, info),
+
+        TP_STRUCT__entry(
+                __field(        int,    sig     )
+                __field(        int,    group   )
+                __field(        int,    errno   )
+                __field(        int,    code    )
+        ),
+
+        TP_fast_assign(
+                __entry->sig    = sig;
+                __entry->group  = group;
+                TP_STORE_SIGINFO(__entry, info);
+        ),
+
+        TP_printk("sig=%d group=%d errno=%d code=%d",
+                  __entry->sig, __entry->group, __entry->errno, __entry->code)
+);
+
+/**
+ * signal_lose_info - called when siginfo is lost
+ * @sig: signal number
+ * @group: signal to process group or not (bool)
+ * @info: pointer to struct siginfo
+ *
+ * Kernel generates 'sig' signal but loses 'info' siginfo, because siginfo
+ * queue is overflow.
+ * 'group' is not 0 if the signal will be sent to a process group.
+ * 'sig' is always one of non-RT signals.
+ */
+TRACE_EVENT(signal_lose_info,
+
+        TP_PROTO(int sig, int group, struct siginfo *info),
+
+        TP_ARGS(sig, group, info),
+
+        TP_STRUCT__entry(
+                __field(        int,    sig     )
+                __field(        int,    group   )
+                __field(        int,    errno   )
+                __field(        int,    code    )
+        ),
+
+        TP_fast_assign(
+                __entry->sig    = sig;
+                __entry->group  = group;
+                TP_STORE_SIGINFO(__entry, info);
+        ),
+
+        TP_printk("sig=%d group=%d errno=%d code=%d",
+                  __entry->sig, __entry->group, __entry->errno, __entry->code)
+);
+#endif /* _TRACE_SIGNAL_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/syscalls.h b/include/trace/events/syscalls.h
index 397dff2dbd5..fb726ac7cae 100644
--- a/include/trace/events/syscalls.h
+++ b/include/trace/events/syscalls.h
@@ -1,5 +1,6 @@
 #undef TRACE_SYSTEM
-#define TRACE_SYSTEM syscalls
+#define TRACE_SYSTEM raw_syscalls
+#define TRACE_INCLUDE_FILE syscalls
 
 #if !defined(_TRACE_EVENTS_SYSCALLS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_EVENTS_SYSCALLS_H
diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h
index 1844c48d640..e5ce87a0498 100644
--- a/include/trace/events/timer.h
+++ b/include/trace/events/timer.h
@@ -26,7 +26,7 @@ TRACE_EVENT(timer_init,
                 __entry->timer  = timer;
         ),
 
-        TP_printk("timer %p", __entry->timer)
+        TP_printk("timer=%p", __entry->timer)
 );
 
 /**
@@ -54,7 +54,7 @@ TRACE_EVENT(timer_start,
                 __entry->now            = jiffies;
         ),
 
-        TP_printk("timer %p: func %pf, expires %lu, timeout %ld",
+        TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld]",
                   __entry->timer, __entry->function, __entry->expires,
                   (long)__entry->expires - __entry->now)
 );
@@ -81,7 +81,7 @@ TRACE_EVENT(timer_expire_entry,
                 __entry->now            = jiffies;
         ),
 
-        TP_printk("timer %p: now %lu", __entry->timer, __entry->now)
+        TP_printk("timer=%p now=%lu", __entry->timer, __entry->now)
 );
 
 /**
@@ -108,7 +108,7 @@ TRACE_EVENT(timer_expire_exit,
                 __entry->timer  = timer;
         ),
 
-        TP_printk("timer %p", __entry->timer)
+        TP_printk("timer=%p", __entry->timer)
 );
 
 /**
@@ -129,7 +129,7 @@ TRACE_EVENT(timer_cancel,
                 __entry->timer  = timer;
         ),
 
-        TP_printk("timer %p", __entry->timer)
+        TP_printk("timer=%p", __entry->timer)
 );
 
 /**
@@ -140,24 +140,24 @@ TRACE_EVENT(timer_cancel,
  */
 TRACE_EVENT(hrtimer_init,
 
-        TP_PROTO(struct hrtimer *timer, clockid_t clockid,
+        TP_PROTO(struct hrtimer *hrtimer, clockid_t clockid,
                  enum hrtimer_mode mode),
 
-        TP_ARGS(timer, clockid, mode),
+        TP_ARGS(hrtimer, clockid, mode),
 
         TP_STRUCT__entry(
-                __field( void *,                timer           )
+                __field( void *,                hrtimer         )
                 __field( clockid_t,             clockid         )
                 __field( enum hrtimer_mode,     mode            )
         ),
 
         TP_fast_assign(
-                __entry->timer          = timer;
+                __entry->hrtimer        = hrtimer;
                 __entry->clockid        = clockid;
                 __entry->mode           = mode;
         ),
 
-        TP_printk("hrtimer %p, clockid %s, mode %s", __entry->timer,
+        TP_printk("hrtimer=%p clockid=%s mode=%s", __entry->hrtimer,
                   __entry->clockid == CLOCK_REALTIME ?
                         "CLOCK_REALTIME" : "CLOCK_MONOTONIC",
                   __entry->mode == HRTIMER_MODE_ABS ?
@@ -170,26 +170,26 @@ TRACE_EVENT(hrtimer_init,
  */
 TRACE_EVENT(hrtimer_start,
 
-        TP_PROTO(struct hrtimer *timer),
+        TP_PROTO(struct hrtimer *hrtimer),
 
-        TP_ARGS(timer),
+        TP_ARGS(hrtimer),
 
         TP_STRUCT__entry(
-                __field( void *,        timer           )
+                __field( void *,        hrtimer         )
                 __field( void *,        function        )
                 __field( s64,           expires         )
                 __field( s64,           softexpires     )
         ),
 
         TP_fast_assign(
-                __entry->timer          = timer;
-                __entry->function       = timer->function;
-                __entry->expires        = hrtimer_get_expires(timer).tv64;
-                __entry->softexpires    = hrtimer_get_softexpires(timer).tv64;
+                __entry->hrtimer        = hrtimer;
+                __entry->function       = hrtimer->function;
+                __entry->expires        = hrtimer_get_expires(hrtimer).tv64;
+                __entry->softexpires    = hrtimer_get_softexpires(hrtimer).tv64;
         ),
 
-        TP_printk("hrtimer %p, func %pf, expires %llu, softexpires %llu",
-                  __entry->timer, __entry->function,
+        TP_printk("hrtimer=%p function=%pf expires=%llu softexpires=%llu",
+                  __entry->hrtimer, __entry->function,
                   (unsigned long long)ktime_to_ns((ktime_t) {
                                   .tv64 = __entry->expires }),
                   (unsigned long long)ktime_to_ns((ktime_t) {
@@ -206,23 +206,22 @@ TRACE_EVENT(hrtimer_start,
  */
 TRACE_EVENT(hrtimer_expire_entry,
 
-        TP_PROTO(struct hrtimer *timer, ktime_t *now),
+        TP_PROTO(struct hrtimer *hrtimer, ktime_t *now),
 
-        TP_ARGS(timer, now),
+        TP_ARGS(hrtimer, now),
 
         TP_STRUCT__entry(
-                __field( void *,        timer   )
+                __field( void *,        hrtimer )
                 __field( s64,           now     )
         ),
 
         TP_fast_assign(
-                __entry->timer  = timer;
-                __entry->now    = now->tv64;
+                __entry->hrtimer        = hrtimer;
+                __entry->now            = now->tv64;
         ),
 
-        TP_printk("hrtimer %p, now %llu", __entry->timer,
-                  (unsigned long long)ktime_to_ns((ktime_t) {
-                                  .tv64 = __entry->now }))
+        TP_printk("hrtimer=%p now=%llu", __entry->hrtimer,
+                  (unsigned long long)ktime_to_ns((ktime_t) { .tv64 = __entry->now }))
  );
 
 /**
@@ -234,40 +233,40 @@ TRACE_EVENT(hrtimer_expire_entry,
  */
 TRACE_EVENT(hrtimer_expire_exit,
 
-        TP_PROTO(struct hrtimer *timer),
+        TP_PROTO(struct hrtimer *hrtimer),
 
-        TP_ARGS(timer),
+        TP_ARGS(hrtimer),
 
         TP_STRUCT__entry(
-                __field( void *,        timer   )
+                __field( void *,        hrtimer )
         ),
 
         TP_fast_assign(
-                __entry->timer  = timer;
+                __entry->hrtimer        = hrtimer;
         ),
 
-        TP_printk("hrtimer %p", __entry->timer)
+        TP_printk("hrtimer=%p", __entry->hrtimer)
 );
 
 /**
  * hrtimer_cancel - called when the hrtimer is canceled
- * @timer:      pointer to struct hrtimer
+ * @hrtimer:    pointer to struct hrtimer
  */
 TRACE_EVENT(hrtimer_cancel,
 
-        TP_PROTO(struct hrtimer *timer),
+        TP_PROTO(struct hrtimer *hrtimer),
 
-        TP_ARGS(timer),
+        TP_ARGS(hrtimer),
 
         TP_STRUCT__entry(
-                __field( void *,        timer   )
+                __field( void *,        hrtimer )
         ),
 
         TP_fast_assign(
-                __entry->timer  = timer;
+                __entry->hrtimer        = hrtimer;
         ),
 
-        TP_printk("hrtimer %p", __entry->timer)
+        TP_printk("hrtimer=%p", __entry->hrtimer)
 );
 
 /**
@@ -302,7 +301,7 @@ TRACE_EVENT(itimer_state,
                 __entry->interval_usec  = value->it_interval.tv_usec;
         ),
 
-        TP_printk("which %d, expires %lu, it_value %lu.%lu, it_interval %lu.%lu",
+        TP_printk("which=%d expires=%lu it_value=%lu.%lu it_interval=%lu.%lu",
                   __entry->which, __entry->expires,
                   __entry->value_sec, __entry->value_usec,
                   __entry->interval_sec, __entry->interval_usec)
@@ -332,7 +331,7 @@ TRACE_EVENT(itimer_expire,
                 __entry->pid    = pid_nr(pid);
         ),
 
-            TP_printk("which %d, pid %d, now %lu", __entry->which,
+            TP_printk("which=%d pid=%d now=%lu", __entry->which,
                       (int) __entry->pid, __entry->now)
 );
 
diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h
index e4612dbd7ba..d6c974474e7 100644
--- a/include/trace/events/workqueue.h
+++ b/include/trace/events/workqueue.h
@@ -8,7 +8,7 @@
 #include <linux/sched.h>
 #include <linux/tracepoint.h>
 
-TRACE_EVENT(workqueue_insertion,
+DECLARE_EVENT_CLASS(workqueue,
 
         TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
 
@@ -30,26 +30,18 @@ TRACE_EVENT(workqueue_insertion,
                 __entry->thread_pid, __entry->func)
 );
 
-TRACE_EVENT(workqueue_execution,
+DEFINE_EVENT(workqueue, workqueue_insertion,
 
         TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
 
-        TP_ARGS(wq_thread, work),
+        TP_ARGS(wq_thread, work)
+);
 
-        TP_STRUCT__entry(
-                __array(char,           thread_comm,    TASK_COMM_LEN)
-                __field(pid_t,          thread_pid)
-                __field(work_func_t,    func)
-        ),
+DEFINE_EVENT(workqueue, workqueue_execution,
 
-        TP_fast_assign(
-                memcpy(__entry->thread_comm, wq_thread->comm, TASK_COMM_LEN);
-                __entry->thread_pid     = wq_thread->pid;
-                __entry->func           = work->func;
-        ),
+        TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
 
-        TP_printk("thread=%s:%d func=%pf", __entry->thread_comm,
-                __entry->thread_pid, __entry->func)
+        TP_ARGS(wq_thread, work)
 );
 
 /* Trace the creation of one workqueue thread on a cpu */
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index cc0d9667e18..d1b3de9c1a7 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -18,6 +18,26 @@
 
 #include <linux/ftrace_event.h>
 
+/*
+ * DECLARE_EVENT_CLASS can be used to add a generic function
+ * handlers for events. That is, if all events have the same
+ * parameters and just have distinct trace points.
+ * Each tracepoint can be defined with DEFINE_EVENT and that
+ * will map the DECLARE_EVENT_CLASS to the tracepoint.
+ *
+ * TRACE_EVENT is a one to one mapping between tracepoint and template.
+ */
+#undef TRACE_EVENT
+#define TRACE_EVENT(name, proto, args, tstruct, assign, print) \
+        DECLARE_EVENT_CLASS(name,                              \
+                             PARAMS(proto),                    \
+                             PARAMS(args),                     \
+                             PARAMS(tstruct),                  \
+                             PARAMS(assign),                   \
+                             PARAMS(print));                   \
+        DEFINE_EVENT(name, name, PARAMS(proto), PARAMS(args));
+
+
 #undef __field
 #define __field(type, item)             type    item;
 
@@ -36,15 +56,21 @@
 #undef TP_STRUCT__entry
 #define TP_STRUCT__entry(args...) args
 
-#undef TRACE_EVENT
-#define TRACE_EVENT(name, proto, args, tstruct, assign, print)  \
-        struct ftrace_raw_##name {                              \
-                struct trace_entry      ent;                    \
-                tstruct                                         \
-                char                    __data[0];              \
-        };                                                      \
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print)  \
+        struct ftrace_raw_##name {                                      \
+                struct trace_entry      ent;                            \
+                tstruct                                                 \
+                char                    __data[0];                      \
+        };
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, name, proto, args)       \
         static struct ftrace_event_call event_##name
 
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
+        DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args))
+
 #undef __cpparg
 #define __cpparg(arg...) arg
 
@@ -89,12 +115,19 @@
 #undef __string
 #define __string(item, src) __dynamic_array(char, item, -1)
 
-#undef TRACE_EVENT
-#define TRACE_EVENT(call, proto, args, tstruct, assign, print)          \
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
         struct ftrace_data_offsets_##call {                             \
                 tstruct;                                                \
         };
 
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, name, proto, args)
+
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
+        DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args))
+
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
 /*
@@ -120,9 +153,10 @@
 #undef __field
 #define __field(type, item)                                     \
         ret = trace_seq_printf(s, "\tfield:" #type " " #item ";\t"      \
-                               "offset:%u;\tsize:%u;\n",                \
+                               "offset:%u;\tsize:%u;\tsigned:%u;\n",    \
                                (unsigned int)offsetof(typeof(field), item), \
-                               (unsigned int)sizeof(field.item));       \
+                               (unsigned int)sizeof(field.item),        \
+                               (unsigned int)is_signed_type(type));     \
         if (!ret)                                                       \
                 return 0;
 
@@ -132,19 +166,21 @@
 #undef __array
 #define __array(type, item, len)                                                \
         ret = trace_seq_printf(s, "\tfield:" #type " " #item "[" #len "];\t"    \
-                               "offset:%u;\tsize:%u;\n",                \
+                               "offset:%u;\tsize:%u;\tsigned:%u;\n",    \
                                (unsigned int)offsetof(typeof(field), item), \
-                               (unsigned int)sizeof(field.item));       \
+                               (unsigned int)sizeof(field.item),        \
+                               (unsigned int)is_signed_type(type));     \
         if (!ret)                                                       \
                 return 0;
 
 #undef __dynamic_array
 #define __dynamic_array(type, item, len)                                       \
         ret = trace_seq_printf(s, "\tfield:__data_loc " #type "[] " #item ";\t"\
-                               "offset:%u;\tsize:%u;\n",                       \
+                               "offset:%u;\tsize:%u;\tsigned:%u;\n",           \
                                (unsigned int)offsetof(typeof(field),           \
                                         __data_loc_##item),                    \
-                               (unsigned int)sizeof(field.__data_loc_##item)); \
+                               (unsigned int)sizeof(field.__data_loc_##item), \
+                               (unsigned int)is_signed_type(type));     \
         if (!ret)                                                              \
                 return 0;
 
@@ -159,7 +195,7 @@
 #undef __get_str
 
 #undef TP_printk
-#define TP_printk(fmt, args...) "%s, %s\n", #fmt, __stringify(args)
+#define TP_printk(fmt, args...) "\"%s\", %s\n", fmt, __stringify(args)
 
 #undef TP_fast_assign
 #define TP_fast_assign(args...) args
@@ -167,17 +203,50 @@
 #undef TP_perf_assign
 #define TP_perf_assign(args...)
 
-#undef TRACE_EVENT
-#define TRACE_EVENT(call, proto, args, tstruct, func, print)            \
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, func, print)    \
 static int                                                              \
-ftrace_format_##call(struct ftrace_event_call *unused,                  \
-                      struct trace_seq *s)                              \
+ftrace_format_setup_##call(struct ftrace_event_call *unused,            \
+                           struct trace_seq *s)                         \
 {                                                                       \
         struct ftrace_raw_##call field __attribute__((unused));         \
         int ret = 0;                                                    \
                                                                         \
         tstruct;                                                        \
                                                                         \
+        return ret;                                                     \
+}                                                                       \
+                                                                        \
+static int                                                              \
+ftrace_format_##call(struct ftrace_event_call *unused,                  \
+                     struct trace_seq *s)                               \
+{                                                                       \
+        int ret = 0;                                                    \
+                                                                        \
+        ret = ftrace_format_setup_##call(unused, s);                    \
+        if (!ret)                                                       \
+                return ret;                                             \
+                                                                        \
+        ret = trace_seq_printf(s, "\nprint fmt: " print);               \
+                                                                        \
+        return ret;                                                     \
+}
+
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, name, proto, args)
+
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, name, proto, args, print)          \
+static int                                                              \
+ftrace_format_##name(struct ftrace_event_call *unused,                  \
+                      struct trace_seq *s)                              \
+{                                                                       \
+        int ret = 0;                                                    \
+                                                                        \
+        ret = ftrace_format_setup_##template(unused, s);                \
+        if (!ret)                                                       \
+                return ret;                                             \
+                                                                        \
         trace_seq_printf(s, "\nprint fmt: " print);                     \
                                                                         \
         return ret;                                                     \
@@ -252,10 +321,11 @@ ftrace_format_##call(struct ftrace_event_call *unused,			\
                 ftrace_print_symbols_seq(p, value, symbols);            \
         })
 
-#undef TRACE_EVENT
-#define TRACE_EVENT(call, proto, args, tstruct, assign, print)          \
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
 static enum print_line_t                                                \
-ftrace_raw_output_##call(struct trace_iterator *iter, int flags)        \
+ftrace_raw_output_id_##call(int event_id, const char *name,             \
+                            struct trace_iterator *iter, int flags)     \
 {                                                                       \
         struct trace_seq *s = &iter->seq;                               \
         struct ftrace_raw_##call *field;                                \
@@ -265,6 +335,47 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags)	\
                                                                         \
         entry = iter->ent;                                              \
                                                                         \
+        if (entry->type != event_id) {                                  \
+                WARN_ON_ONCE(1);                                        \
+                return TRACE_TYPE_UNHANDLED;                            \
+        }                                                               \
+                                                                        \
+        field = (typeof(field))entry;                                   \
+                                                                        \
+        p = &get_cpu_var(ftrace_event_seq);                             \
+        trace_seq_init(p);                                              \
+        ret = trace_seq_printf(s, "%s: ", name);                        \
+        if (ret)                                                        \
+                ret = trace_seq_printf(s, print);                       \
+        put_cpu();                                                      \
+        if (!ret)                                                       \
+                return TRACE_TYPE_PARTIAL_LINE;                         \
+                                                                        \
+        return TRACE_TYPE_HANDLED;                                      \
+}
+
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, name, proto, args)                       \
+static enum print_line_t                                                \
+ftrace_raw_output_##name(struct trace_iterator *iter, int flags)        \
+{                                                                       \
+        return ftrace_raw_output_id_##template(event_##name.id,         \
+                                               #name, iter, flags);     \
+}
+
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, call, proto, args, print)          \
+static enum print_line_t                                                \
+ftrace_raw_output_##call(struct trace_iterator *iter, int flags)        \
+{                                                                       \
+        struct trace_seq *s = &iter->seq;                               \
+        struct ftrace_raw_##template *field;                            \
+        struct trace_entry *entry;                                      \
+        struct trace_seq *p;                                            \
+        int ret;                                                        \
+                                                                        \
+        entry = iter->ent;                                              \
+                                                                        \
         if (entry->type != event_##call.id) {                           \
                 WARN_ON_ONCE(1);                                        \
                 return TRACE_TYPE_UNHANDLED;                            \
@@ -274,14 +385,16 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags)	\
                                                                         \
         p = &get_cpu_var(ftrace_event_seq);                             \
         trace_seq_init(p);                                              \
-        ret = trace_seq_printf(s, #call ": " print);                    \
+        ret = trace_seq_printf(s, "%s: ", #call);                       \
+        if (ret)                                                        \
+                ret = trace_seq_printf(s, print);                       \
         put_cpu();                                                      \
         if (!ret)                                                       \
                 return TRACE_TYPE_PARTIAL_LINE;                         \
                                                                         \
         return TRACE_TYPE_HANDLED;                                      \
 }
-        
+
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
 #undef __field_ext
@@ -315,8 +428,8 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags)	\
 #undef __string
 #define __string(item, src) __dynamic_array(char, item, -1)
 
-#undef TRACE_EVENT
-#define TRACE_EVENT(call, proto, args, tstruct, func, print)            \
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, func, print)    \
 static int                                                              \
 ftrace_define_fields_##call(struct ftrace_event_call *event_call)       \
 {                                                                       \
@@ -332,6 +445,13 @@ ftrace_define_fields_##call(struct ftrace_event_call *event_call)	\
         return ret;                                                     \
 }
 
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, name, proto, args)
+
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
+        DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args))
+
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
 /*
@@ -358,10 +478,10 @@ ftrace_define_fields_##call(struct ftrace_event_call *event_call)	\
         __data_size += (len) * sizeof(type);
 
 #undef __string
-#define __string(item, src) __dynamic_array(char, item, strlen(src) + 1)       \
+#define __string(item, src) __dynamic_array(char, item, strlen(src) + 1)
 
-#undef TRACE_EVENT
-#define TRACE_EVENT(call, proto, args, tstruct, assign, print)          \
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
 static inline int ftrace_get_offsets_##call(                            \
         struct ftrace_data_offsets_##call *__data_offsets, proto)       \
 {                                                                       \
@@ -373,6 +493,13 @@ static inline int ftrace_get_offsets_##call(				\
         return __data_size;                                             \
 }
 
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, name, proto, args)
+
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
+        DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args))
+
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
 #ifdef CONFIG_EVENT_PROFILE
@@ -394,21 +521,28 @@ static inline int ftrace_get_offsets_##call(				\
  *
  */
 
-#undef TRACE_EVENT
-#define TRACE_EVENT(call, proto, args, tstruct, assign, print)          \
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)
+
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, name, proto, args)                       \
                                                                         \
-static void ftrace_profile_##call(proto);                               \
+static void ftrace_profile_##name(proto);                               \
                                                                         \
-static int ftrace_profile_enable_##call(void)                           \
+static int ftrace_profile_enable_##name(struct ftrace_event_call *unused)\
 {                                                                       \
-        return register_trace_##call(ftrace_profile_##call);            \
+        return register_trace_##name(ftrace_profile_##name);            \
 }                                                                       \
                                                                         \
-static void ftrace_profile_disable_##call(void)                         \
+static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\
 {                                                                       \
-        unregister_trace_##call(ftrace_profile_##call);                 \
+        unregister_trace_##name(ftrace_profile_##name);                 \
 }
 
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
+        DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args))
+
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 
 #endif
@@ -423,7 +557,7 @@ static void ftrace_profile_disable_##call(void)				\
  *      event_trace_printk(_RET_IP_, "<call>: " <fmt>);
  * }
  *
- * static int ftrace_reg_event_<call>(void)
+ * static int ftrace_reg_event_<call>(struct ftrace_event_call *unused)
  * {
  *      int ret;
  *
@@ -434,7 +568,7 @@ static void ftrace_profile_disable_##call(void)				\
  *      return ret;
  * }
  *
- * static void ftrace_unreg_event_<call>(void)
+ * static void ftrace_unreg_event_<call>(struct ftrace_event_call *unused)
  * {
  *      unregister_trace_<call>(ftrace_event_<call>);
  * }
@@ -469,7 +603,7 @@ static void ftrace_profile_disable_##call(void)				\
  *      trace_current_buffer_unlock_commit(buffer, event, irq_flags, pc);
  * }
  *
- * static int ftrace_raw_reg_event_<call>(void)
+ * static int ftrace_raw_reg_event_<call>(struct ftrace_event_call *unused)
  * {
  *      int ret;
  *
@@ -480,7 +614,7 @@ static void ftrace_profile_disable_##call(void)				\
  *      return ret;
  * }
  *
- * static void ftrace_unreg_event_<call>(void)
+ * static void ftrace_unreg_event_<call>(struct ftrace_event_call *unused)
  * {
  *      unregister_trace_<call>(ftrace_raw_event_<call>);
  * }
@@ -489,7 +623,7 @@ static void ftrace_profile_disable_##call(void)				\
  *      .trace                  = ftrace_raw_output_<call>, <-- stage 2
  * };
  *
- * static int ftrace_raw_init_event_<call>(void)
+ * static int ftrace_raw_init_event_<call>(struct ftrace_event_call *unused)
  * {
  *      int id;
  *
@@ -547,15 +681,13 @@ static void ftrace_profile_disable_##call(void)				\
 #define __assign_str(dst, src)                                          \
         strcpy(__get_str(dst), src);
 
-#undef TRACE_EVENT
-#define TRACE_EVENT(call, proto, args, tstruct, assign, print)          \
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
                                                                         \
-static struct ftrace_event_call event_##call;                           \
-                                                                        \
-static void ftrace_raw_event_##call(proto)                              \
+static void ftrace_raw_event_id_##call(struct ftrace_event_call *event_call, \
+                                       proto)                           \
 {                                                                       \
         struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
-        struct ftrace_event_call *event_call = &event_##call;           \
         struct ring_buffer_event *event;                                \
         struct ftrace_raw_##call *entry;                                \
         struct ring_buffer *buffer;                                     \
@@ -569,7 +701,7 @@ static void ftrace_raw_event_##call(proto)				\
         __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
                                                                         \
         event = trace_current_buffer_lock_reserve(&buffer,              \
-                                 event_##call.id,                       \
+                                 event_call->id,                        \
                                  sizeof(*entry) + __data_size,          \
                                  irq_flags, pc);                        \
         if (!event)                                                     \
@@ -584,9 +716,17 @@ static void ftrace_raw_event_##call(proto)				\
         if (!filter_current_check_discard(buffer, event_call, entry, event)) \
                 trace_nowake_buffer_unlock_commit(buffer,               \
                                                   event, irq_flags, pc); \
+}
+
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, call, proto, args)                       \
+                                                                        \
+static void ftrace_raw_event_##call(proto)                              \
+{                                                                       \
+        ftrace_raw_event_id_##template(&event_##call, args);            \
 }                                                                       \
                                                                         \
-static int ftrace_raw_reg_event_##call(void *ptr)                       \
+static int ftrace_raw_reg_event_##call(struct ftrace_event_call *unused)\
 {                                                                       \
         int ret;                                                        \
                                                                         \
@@ -597,7 +737,7 @@ static int ftrace_raw_reg_event_##call(void *ptr)			\
         return ret;                                                     \
 }                                                                       \
                                                                         \
-static void ftrace_raw_unreg_event_##call(void *ptr)                    \
+static void ftrace_raw_unreg_event_##call(struct ftrace_event_call *unused)\
 {                                                                       \
         unregister_trace_##call(ftrace_raw_event_##call);               \
 }                                                                       \
@@ -606,7 +746,7 @@ static struct trace_event ftrace_event_type_##call = {			\
         .trace                  = ftrace_raw_output_##call,             \
 };                                                                      \
                                                                         \
-static int ftrace_raw_init_event_##call(void)                           \
+static int ftrace_raw_init_event_##call(struct ftrace_event_call *unused)\
 {                                                                       \
         int id;                                                         \
                                                                         \
@@ -616,7 +756,36 @@ static int ftrace_raw_init_event_##call(void)				\
         event_##call.id = id;                                           \
         INIT_LIST_HEAD(&event_##call.fields);                           \
         return 0;                                                       \
-}                                                                       \
+}
+
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
+        DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args))
+
+#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
+
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)
+
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, call, proto, args)                       \
+                                                                        \
+static struct ftrace_event_call __used                                  \
+__attribute__((__aligned__(4)))                                         \
+__attribute__((section("_ftrace_events"))) event_##call = {             \
+        .name                   = #call,                                \
+        .system                 = __stringify(TRACE_SYSTEM),            \
+        .event                  = &ftrace_event_type_##call,            \
+        .raw_init               = ftrace_raw_init_event_##call,         \
+        .regfunc                = ftrace_raw_reg_event_##call,          \
+        .unregfunc              = ftrace_raw_unreg_event_##call,        \
+        .show_format            = ftrace_format_##template,             \
+        .define_fields          = ftrace_define_fields_##template,      \
+        _TRACE_PROFILE_INIT(call)                                       \
+}
+
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, call, proto, args, print)          \
                                                                         \
 static struct ftrace_event_call __used                                  \
 __attribute__((__aligned__(4)))                                         \
@@ -628,7 +797,7 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
         .regfunc                = ftrace_raw_reg_event_##call,          \
         .unregfunc              = ftrace_raw_unreg_event_##call,        \
         .show_format            = ftrace_format_##call,                 \
-        .define_fields          = ftrace_define_fields_##call,          \
+        .define_fields          = ftrace_define_fields_##template,      \
         _TRACE_PROFILE_INIT(call)                                       \
 }
 
@@ -646,6 +815,7 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
  *      struct ftrace_event_call *event_call = &event_<call>;
  *      extern void perf_tp_event(int, u64, u64, void *, int);
  *      struct ftrace_raw_##call *entry;
+ *      struct perf_trace_buf *trace_buf;
  *      u64 __addr = 0, __count = 1;
  *      unsigned long irq_flags;
  *      struct trace_entry *ent;
@@ -670,14 +840,25 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
  *      __cpu = smp_processor_id();
  *
  *      if (in_nmi())
- *              raw_data = rcu_dereference(trace_profile_buf_nmi);
+ *              trace_buf = rcu_dereference(perf_trace_buf_nmi);
  *      else
- *              raw_data = rcu_dereference(trace_profile_buf);
+ *              trace_buf = rcu_dereference(perf_trace_buf);
  *
- *      if (!raw_data)
+ *      if (!trace_buf)
  *              goto end;
  *
- *      raw_data = per_cpu_ptr(raw_data, __cpu);
+ *      trace_buf = per_cpu_ptr(trace_buf, __cpu);
+ *
+ *      // Avoid recursion from perf that could mess up the buffer
+ *      if (trace_buf->recursion++)
+ *              goto end_recursion;
+ *
+ *      raw_data = trace_buf->buf;
+ *
+ *      // Make recursion update visible before entering perf_tp_event
+ *      // so that we protect from perf recursions.
+ *
+ *      barrier();
  *
  *      //zero dead bytes from alignment to avoid stack leak to userspace:
  *      *(u64 *)(&raw_data[__entry_size - sizeof(u64)]) = 0ULL;
@@ -704,21 +885,26 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
 #undef __perf_count
 #define __perf_count(c) __count = (c)
 
-#undef TRACE_EVENT
-#define TRACE_EVENT(call, proto, args, tstruct, assign, print)          \
-static void ftrace_profile_##call(proto)                                \
+#undef DECLARE_EVENT_CLASS
+#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)  \
+static void                                                             \
+ftrace_profile_templ_##call(struct ftrace_event_call *event_call,       \
+                            proto)                                      \
 {                                                                       \
         struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
-        struct ftrace_event_call *event_call = &event_##call;           \
-        extern void perf_tp_event(int, u64, u64, void *, int);  \
+        extern int perf_swevent_get_recursion_context(void);            \
+        extern void perf_swevent_put_recursion_context(int rctx);       \
+        extern void perf_tp_event(int, u64, u64, void *, int);          \
         struct ftrace_raw_##call *entry;                                \
         u64 __addr = 0, __count = 1;                                    \
         unsigned long irq_flags;                                        \
         struct trace_entry *ent;                                        \
         int __entry_size;                                               \
         int __data_size;                                                \
+        char *trace_buf;                                                \
         char *raw_data;                                                 \
         int __cpu;                                                      \
+        int rctx;                                                       \
         int pc;                                                         \
                                                                         \
         pc = preempt_count();                                           \
@@ -733,17 +919,22 @@ static void ftrace_profile_##call(proto)				\
                 return;                                                 \
                                                                         \
         local_irq_save(irq_flags);                                      \
+                                                                        \
+        rctx = perf_swevent_get_recursion_context();                    \
+        if (rctx < 0)                                                   \
+                goto end_recursion;                                     \
+                                                                        \
         __cpu = smp_processor_id();                                     \
                                                                         \
         if (in_nmi())                                                   \
-                raw_data = rcu_dereference(trace_profile_buf_nmi);              \
+                trace_buf = rcu_dereference(perf_trace_buf_nmi);        \
         else                                                            \
-                raw_data = rcu_dereference(trace_profile_buf);          \
+                trace_buf = rcu_dereference(perf_trace_buf);            \
                                                                         \
-        if (!raw_data)                                                  \
+        if (!trace_buf)                                                 \
                 goto end;                                               \
                                                                         \
-        raw_data = per_cpu_ptr(raw_data, __cpu);                        \
+        raw_data = per_cpu_ptr(trace_buf, __cpu);                       \
                                                                         \
         *(u64 *)(&raw_data[__entry_size - sizeof(u64)]) = 0ULL;         \
         entry = (struct ftrace_raw_##call *)raw_data;                   \
@@ -759,10 +950,25 @@ static void ftrace_profile_##call(proto)				\
                              __entry_size);                             \
                                                                         \
 end:                                                                    \
+        perf_swevent_put_recursion_context(rctx);                       \
+end_recursion:                                                          \
         local_irq_restore(irq_flags);                                   \
                                                                         \
 }
 
+#undef DEFINE_EVENT
+#define DEFINE_EVENT(template, call, proto, args)               \
+static void ftrace_profile_##call(proto)                        \
+{                                                               \
+        struct ftrace_event_call *event_call = &event_##call;   \
+                                                                \
+        ftrace_profile_templ_##template(event_call, args);      \
+}
+
+#undef DEFINE_EVENT_PRINT
+#define DEFINE_EVENT_PRINT(template, name, proto, args, print)  \
+        DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args))
+
 #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
 #endif /* CONFIG_EVENT_PROFILE */
 
diff --git a/include/trace/power.h b/include/trace/power.h
deleted file mode 100644
index ef204666e98..00000000000
--- a/include/trace/power.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _TRACE_POWER_H
-#define _TRACE_POWER_H
-
-#include <linux/ktime.h>
-#include <linux/tracepoint.h>
-
-enum {
-        POWER_NONE = 0,
-        POWER_CSTATE = 1,
-        POWER_PSTATE = 2,
-};
-
-struct power_trace {
-        ktime_t                 stamp;
-        ktime_t                 end;
-        int                     type;
-        int                     state;
-};
-
-DECLARE_TRACE(power_start,
-        TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
-              TP_ARGS(it, type, state));
-
-DECLARE_TRACE(power_mark,
-        TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
-              TP_ARGS(it, type, state));
-
-DECLARE_TRACE(power_end,
-        TP_PROTO(struct power_trace *it),
-              TP_ARGS(it));
-
-#endif /* _TRACE_POWER_H */
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 5dc283ba5ae..961fda3556b 100644
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -12,51 +12,48 @@
  * A syscall entry in the ftrace syscalls array.
  *
  * @name: name of the syscall
+ * @syscall_nr: number of the syscall
  * @nb_args: number of parameters it takes
  * @types: list of types as strings
  * @args: list of args as strings (args[i] matches types[i])
- * @enter_id: associated ftrace enter event id
- * @exit_id: associated ftrace exit event id
  * @enter_event: associated syscall_enter trace event
  * @exit_event: associated syscall_exit trace event
  */
 struct syscall_metadata {
         const char      *name;
+        int             syscall_nr;
         int             nb_args;
         const char      **types;
         const char      **args;
-        int             enter_id;
-        int             exit_id;
 
         struct ftrace_event_call *enter_event;
         struct ftrace_event_call *exit_event;
 };
 
 #ifdef CONFIG_FTRACE_SYSCALLS
-extern struct syscall_metadata *syscall_nr_to_meta(int nr);
-extern int syscall_name_to_nr(char *name);
-void set_syscall_enter_id(int num, int id);
-void set_syscall_exit_id(int num, int id);
-extern struct trace_event event_syscall_enter;
-extern struct trace_event event_syscall_exit;
-extern int reg_event_syscall_enter(void *ptr);
-extern void unreg_event_syscall_enter(void *ptr);
-extern int reg_event_syscall_exit(void *ptr);
-extern void unreg_event_syscall_exit(void *ptr);
+extern unsigned long arch_syscall_addr(int nr);
+extern int init_syscall_trace(struct ftrace_event_call *call);
+
 extern int syscall_enter_format(struct ftrace_event_call *call,
                                 struct trace_seq *s);
 extern int syscall_exit_format(struct ftrace_event_call *call,
                                 struct trace_seq *s);
 extern int syscall_enter_define_fields(struct ftrace_event_call *call);
 extern int syscall_exit_define_fields(struct ftrace_event_call *call);
+extern int reg_event_syscall_enter(struct ftrace_event_call *call);
+extern void unreg_event_syscall_enter(struct ftrace_event_call *call);
+extern int reg_event_syscall_exit(struct ftrace_event_call *call);
+extern void unreg_event_syscall_exit(struct ftrace_event_call *call);
+extern int
+ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s);
 enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags);
 enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags);
 #endif
 #ifdef CONFIG_EVENT_PROFILE
-int reg_prof_syscall_enter(char *name);
-void unreg_prof_syscall_enter(char *name);
-int reg_prof_syscall_exit(char *name);
-void unreg_prof_syscall_exit(char *name);
+int prof_sysenter_enable(struct ftrace_event_call *call);
+void prof_sysenter_disable(struct ftrace_event_call *call);
+int prof_sysexit_enable(struct ftrace_event_call *call);
+void prof_sysexit_disable(struct ftrace_event_call *call);
 
 #endif
 
diff --git a/include/video/pxa168fb.h b/include/video/pxa168fb.h
index b5cc72fe046..8c2f385a90e 100644
--- a/include/video/pxa168fb.h
+++ b/include/video/pxa168fb.h
@@ -117,8 +117,6 @@ struct pxa168fb_mach_info {
         unsigned        invert_composite_blank:1;
         unsigned        invert_pix_val_ena:1;
         unsigned        invert_pixclock:1;
-        unsigned        invert_vsync:1;
-        unsigned        invert_hsync:1;
         unsigned        panel_rbswap:1;
         unsigned        active:1;
         unsigned        enable_lcd:1;
diff --git a/include/video/sgivw.h b/include/video/sgivw.h
index 55f2a7c024a..f6aa5692e74 100644
--- a/include/video/sgivw.h
+++ b/include/video/sgivw.h
@@ -351,7 +351,7 @@ typedef enum {
 struct dbe_timing_info
 {
   dbe_timing_t type;
-  int flags;                            
+  int flags;
   short width;              /* Monitor resolution               */
   short height;
   int fields_sec;           /* fields/sec  (Hz -3 dec. places */
@@ -389,11 +389,11 @@ struct dbe_timing_info dbeVTimings[] = {
   {
     DBE_VT_640_480_60,
     /*  flags,  width,                  height,         fields_sec,             cfreq */
-    0,          640,                    480,            59940,                  25175,
+    0,          640,                    480,            59940,                  25175,
     /*  htotal, hblank_start,   hblank_end,     hsync_start,    hsync_end */
-    800,        640,                800,                656,            752,
+    800,        640,                    800,            656,            752,
     /*  vtotal, vblank_start,   vblank_end,     vsync_start,    vsync_end */
-    525,        480,                525,                490,                492,
+    525,        480,                    525,            490,                492,
     /*  pll_m,  pll_n,                  pll_p */
     15,     2,                          3
   },
@@ -650,7 +650,7 @@ struct dbe_timing_info dbeVTimings[] = {
     /* pll_m,  pll_n,          pll_p */
     6,      1,              0
   },
-        
+
   {
     DBE_VT_1920_1200_60,
     /* flags,  width,          height,         fields_sec,     cfreq */
@@ -676,7 +676,6 @@ struct dbe_timing_info dbeVTimings[] = {
   }
 };
 
-#define DBE_VT_SIZE  (sizeof(dbeVTimings)/sizeof(dbeVTimings[0]))
 #endif // INCLUDE_TIMING_TABLE_DATA
 
 #endif // ! __SGIVWFB_H__