Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts: arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/poodle.c arch/arm/mach-pxa/spitz.c
author: David Woodhouse <David.Woodhouse@intel.com> 2009-01-05 04:50:33 -0500
committer: David Woodhouse <David.Woodhouse@intel.com> 2009-01-05 04:50:33 -0500
commit: 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch)
tree: 517290fd884d286fe2971137ac89f89e3567785a /include
parent: 160bbab3000dafccbe43688e48208cecf4deb879 (diff)
parent: fe0bdec68b77020281dc814805edfe594ae89e0f (diff)
332 files changed, 12906 insertions, 3742 deletions
diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
index 09d33c7740f0..db8852d8bcf7 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -172,7 +172,7 @@
 /* Defaults for debug_level, debug and normal */
-#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT)
+#define ACPI_DEBUG_DEFAULT          (ACPI_LV_INFO)
 #define ACPI_NORMAL_DEFAULT         (ACPI_LV_INIT | ACPI_LV_DEBUG_OBJECT)
 #define ACPI_DEBUG_ALL              (ACPI_LV_AML_DISASSEMBLE | ACPI_LV_ALL_EXCEPTIONS | ACPI_LV_ALL)
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 029c8c06c151..0515e754449d 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -141,6 +141,10 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
 /*
 * We need to show where it is safe to preempt execution of ACPICA
 */
-#define ACPI_PREEMPTION_POINT() cond_resched()
+#define ACPI_PREEMPTION_POINT()         \
+        do {                            \
+                if (!irqs_disabled())   \
+                        cond_resched(); \
+        } while (0)
 #endif                          /* __ACLINUX_H__ */
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 3795590e152a..0574add2a1e3 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -127,7 +127,7 @@ struct acpi_processor_performance {
        unsigned int state_count;
        struct acpi_processor_px *states;
        struct acpi_psd_package domain_info;
-        cpumask_t shared_cpu_map;
+        cpumask_var_t shared_cpu_map;
        unsigned int shared_type;
 };
@@ -172,7 +172,7 @@ struct acpi_processor_throttling {
        unsigned int state_count;
        struct acpi_processor_tx_tss *states_tss;
        struct acpi_tsd_package domain_info;
-        cpumask_t shared_cpu_map;
+        cpumask_var_t shared_cpu_map;
        int (*acpi_processor_get_throttling) (struct acpi_processor * pr);
        int (*acpi_processor_set_throttling) (struct acpi_processor * pr,
                                              int state);
diff --git a/include/asm-arm/plat-s3c/iic.h b/include/asm-arm/plat-s3c/iic.h
deleted file mode 100644
index 5106acaa1d0e..000000000000
--- a/include/asm-arm/plat-s3c/iic.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/iic.h
- *
- * Copyright (c) 2004 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * S3C2410 - I2C Controller platfrom_device info
- *
- * 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 __ASM_ARCH_IIC_H
-#define __ASM_ARCH_IIC_H __FILE__
-#define S3C_IICFLG_FILTER       (1<<0)  /* enable s3c2440 filter */
-/* Notes:
- *      1) All frequencies are expressed in Hz
- *      2) A value of zero is `do not care`
-*/
-struct s3c2410_platform_i2c {
-        int             bus_num;        /* bus number to use */
-        unsigned int    flags;
-        unsigned int    slave_addr;     /* slave address for controller */
-        unsigned long   bus_freq;       /* standard bus frequency */
-        unsigned long   max_freq;       /* max frequency for the bus */
-        unsigned long   min_freq;       /* min frequency for the bus */
-        unsigned int    sda_delay;      /* pclks (s3c2440 only) */
-};
-#endif /* __ASM_ARCH_IIC_H */
diff --git a/include/asm-arm/plat-s3c/nand.h b/include/asm-arm/plat-s3c/nand.h
deleted file mode 100644
index f4dcd14af059..000000000000
--- a/include/asm-arm/plat-s3c/nand.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/nand.h
- *
- * Copyright (c) 2004 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * S3C2410 - NAND device controller platfrom_device info
- *
- * 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.
-*/
-/* struct s3c2410_nand_set
- *
- * define an set of one or more nand chips registered with an unique mtd
- *
- * nr_chips      = number of chips in this set
- * nr_partitions = number of partitions pointed to be partitoons (or zero)
- * name          = name of set (optional)
- * nr_map        = map for low-layer logical to physical chip numbers (option)
- * partitions    = mtd partition list
-*/
-struct s3c2410_nand_set {
-        unsigned int            disable_ecc : 1;
-        int                     nr_chips;
-        int                     nr_partitions;
-        char                    *name;
-        int                     *nr_map;
-        struct mtd_partition    *partitions;
-        struct nand_ecclayout   *ecc_layout;
-};
-struct s3c2410_platform_nand {
-        /* timing information for controller, all times in nanoseconds */
-        int     tacls;  /* time for active CLE/ALE to nWE/nOE */
-        int     twrph0; /* active time for nWE/nOE */
-        int     twrph1; /* time for release CLE/ALE from nWE/nOE inactive */
-        unsigned int    ignore_unset_ecc : 1;
-        int                     nr_sets;
-        struct s3c2410_nand_set *sets;
-        void                    (*select_chip)(struct s3c2410_nand_set *,
-                                               int chip);
-};
diff --git a/include/asm-arm/plat-s3c/regs-ac97.h b/include/asm-arm/plat-s3c/regs-ac97.h
deleted file mode 100644
index c3878f7acb83..000000000000
--- a/include/asm-arm/plat-s3c/regs-ac97.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-ac97.h
- *
- * Copyright (c) 2006 Simtec Electronics <linux@simtec.co.uk>
- *              http://www.simtec.co.uk/products/SWLINUX/
- *
- * 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.
- *
- * S3C2440 AC97 Controller
-*/
-#ifndef __ASM_ARCH_REGS_AC97_H
-#define __ASM_ARCH_REGS_AC97_H __FILE__
-#define S3C_AC97_GLBCTRL                                (0x00)
-#define S3C_AC97_GLBCTRL_CODECREADYIE                   (1<<22)
-#define S3C_AC97_GLBCTRL_PCMOUTURIE                     (1<<21)
-#define S3C_AC97_GLBCTRL_PCMINORIE                      (1<<20)
-#define S3C_AC97_GLBCTRL_MICINORIE                      (1<<19)
-#define S3C_AC97_GLBCTRL_PCMOUTTIE                      (1<<18)
-#define S3C_AC97_GLBCTRL_PCMINTIE                       (1<<17)
-#define S3C_AC97_GLBCTRL_MICINTIE                       (1<<16)
-#define S3C_AC97_GLBCTRL_PCMOUTTM_OFF                   (0<<12)
-#define S3C_AC97_GLBCTRL_PCMOUTTM_PIO                   (1<<12)
-#define S3C_AC97_GLBCTRL_PCMOUTTM_DMA                   (2<<12)
-#define S3C_AC97_GLBCTRL_PCMOUTTM_MASK                  (3<<12)
-#define S3C_AC97_GLBCTRL_PCMINTM_OFF                    (0<<10)
-#define S3C_AC97_GLBCTRL_PCMINTM_PIO                    (1<<10)
-#define S3C_AC97_GLBCTRL_PCMINTM_DMA                    (2<<10)
-#define S3C_AC97_GLBCTRL_PCMINTM_MASK                   (3<<10)
-#define S3C_AC97_GLBCTRL_MICINTM_OFF                    (0<<8)
-#define S3C_AC97_GLBCTRL_MICINTM_PIO                    (1<<8)
-#define S3C_AC97_GLBCTRL_MICINTM_DMA                    (2<<8)
-#define S3C_AC97_GLBCTRL_MICINTM_MASK                   (3<<8)
-#define S3C_AC97_GLBCTRL_TRANSFERDATAENABLE             (1<<3)
-#define S3C_AC97_GLBCTRL_ACLINKON                       (1<<2)
-#define S3C_AC97_GLBCTRL_WARMRESET                      (1<<1)
-#define S3C_AC97_GLBCTRL_COLDRESET                      (1<<0)
-#define S3C_AC97_GLBSTAT                                (0x04)
-#define S3C_AC97_GLBSTAT_CODECREADY                     (1<<22)
-#define S3C_AC97_GLBSTAT_PCMOUTUR                       (1<<21)
-#define S3C_AC97_GLBSTAT_PCMINORI                       (1<<20)
-#define S3C_AC97_GLBSTAT_MICINORI                       (1<<19)
-#define S3C_AC97_GLBSTAT_PCMOUTTI                       (1<<18)
-#define S3C_AC97_GLBSTAT_PCMINTI                        (1<<17)
-#define S3C_AC97_GLBSTAT_MICINTI                        (1<<16)
-#define S3C_AC97_GLBSTAT_MAINSTATE_IDLE                 (0<<0)
-#define S3C_AC97_GLBSTAT_MAINSTATE_INIT                 (1<<0)
-#define S3C_AC97_GLBSTAT_MAINSTATE_READY                (2<<0)
-#define S3C_AC97_GLBSTAT_MAINSTATE_ACTIVE               (3<<0)
-#define S3C_AC97_GLBSTAT_MAINSTATE_LP                   (4<<0)
-#define S3C_AC97_GLBSTAT_MAINSTATE_WARM                 (5<<0)
-#define S3C_AC97_CODEC_CMD                              (0x08)
-#define S3C_AC97_CODEC_CMD_READ                         (1<<23)
-#define S3C_AC97_STAT                                   (0x0c)
-#define S3C_AC97_PCM_ADDR                               (0x10)
-#define S3C_AC97_PCM_DATA                               (0x18)
-#define S3C_AC97_MIC_DATA                               (0x1C)
-#endif /* __ASM_ARCH_REGS_AC97_H */
diff --git a/include/asm-arm/plat-s3c/regs-iic.h b/include/asm-arm/plat-s3c/regs-iic.h
deleted file mode 100644
index 2f7c17de8ac8..000000000000
--- a/include/asm-arm/plat-s3c/regs-iic.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-iic.h
- *
- * Copyright (c) 2004 Simtec Electronics <linux@simtec.co.uk>
- *              http://www.simtec.co.uk/products/SWLINUX/
- *
- * 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.
- *
- * S3C2410 I2C Controller
-*/
-#ifndef __ASM_ARCH_REGS_IIC_H
-#define __ASM_ARCH_REGS_IIC_H __FILE__
-/* see s3c2410x user guide, v1.1, section 9 (p447) for more info */
-#define S3C2410_IICREG(x) (x)
-#define S3C2410_IICCON    S3C2410_IICREG(0x00)
-#define S3C2410_IICSTAT   S3C2410_IICREG(0x04)
-#define S3C2410_IICADD    S3C2410_IICREG(0x08)
-#define S3C2410_IICDS     S3C2410_IICREG(0x0C)
-#define S3C2440_IICLC     S3C2410_IICREG(0x10)
-#define S3C2410_IICCON_ACKEN            (1<<7)
-#define S3C2410_IICCON_TXDIV_16         (0<<6)
-#define S3C2410_IICCON_TXDIV_512        (1<<6)
-#define S3C2410_IICCON_IRQEN            (1<<5)
-#define S3C2410_IICCON_IRQPEND          (1<<4)
-#define S3C2410_IICCON_SCALE(x)         ((x)&15)
-#define S3C2410_IICCON_SCALEMASK        (0xf)
-#define S3C2410_IICSTAT_MASTER_RX       (2<<6)
-#define S3C2410_IICSTAT_MASTER_TX       (3<<6)
-#define S3C2410_IICSTAT_SLAVE_RX        (0<<6)
-#define S3C2410_IICSTAT_SLAVE_TX        (1<<6)
-#define S3C2410_IICSTAT_MODEMASK        (3<<6)
-#define S3C2410_IICSTAT_START           (1<<5)
-#define S3C2410_IICSTAT_BUSBUSY         (1<<5)
-#define S3C2410_IICSTAT_TXRXEN          (1<<4)
-#define S3C2410_IICSTAT_ARBITR          (1<<3)
-#define S3C2410_IICSTAT_ASSLAVE         (1<<2)
-#define S3C2410_IICSTAT_ADDR0           (1<<1)
-#define S3C2410_IICSTAT_LASTBIT         (1<<0)
-#define S3C2410_IICLC_SDA_DELAY0        (0 << 0)
-#define S3C2410_IICLC_SDA_DELAY5        (1 << 0)
-#define S3C2410_IICLC_SDA_DELAY10       (2 << 0)
-#define S3C2410_IICLC_SDA_DELAY15       (3 << 0)
-#define S3C2410_IICLC_SDA_DELAY_MASK    (3 << 0)
-#define S3C2410_IICLC_FILTER_ON         (1<<2)
-#endif /* __ASM_ARCH_REGS_IIC_H */
diff --git a/include/asm-arm/plat-s3c/regs-nand.h b/include/asm-arm/plat-s3c/regs-nand.h
deleted file mode 100644
index b2caa4bca270..000000000000
--- a/include/asm-arm/plat-s3c/regs-nand.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-nand.h
- *
- * Copyright (c) 2004,2005 Simtec Electronics <linux@simtec.co.uk>
- *                    http://www.simtec.co.uk/products/SWLINUX/
- *
- * 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.
- *
- * S3C2410 NAND register definitions
-*/
-#ifndef __ASM_ARM_REGS_NAND
-#define __ASM_ARM_REGS_NAND
-#define S3C2410_NFREG(x) (x)
-#define S3C2410_NFCONF  S3C2410_NFREG(0x00)
-#define S3C2410_NFCMD   S3C2410_NFREG(0x04)
-#define S3C2410_NFADDR  S3C2410_NFREG(0x08)
-#define S3C2410_NFDATA  S3C2410_NFREG(0x0C)
-#define S3C2410_NFSTAT  S3C2410_NFREG(0x10)
-#define S3C2410_NFECC   S3C2410_NFREG(0x14)
-#define S3C2440_NFCONT   S3C2410_NFREG(0x04)
-#define S3C2440_NFCMD    S3C2410_NFREG(0x08)
-#define S3C2440_NFADDR   S3C2410_NFREG(0x0C)
-#define S3C2440_NFDATA   S3C2410_NFREG(0x10)
-#define S3C2440_NFECCD0  S3C2410_NFREG(0x14)
-#define S3C2440_NFECCD1  S3C2410_NFREG(0x18)
-#define S3C2440_NFECCD   S3C2410_NFREG(0x1C)
-#define S3C2440_NFSTAT   S3C2410_NFREG(0x20)
-#define S3C2440_NFESTAT0 S3C2410_NFREG(0x24)
-#define S3C2440_NFESTAT1 S3C2410_NFREG(0x28)
-#define S3C2440_NFMECC0  S3C2410_NFREG(0x2C)
-#define S3C2440_NFMECC1  S3C2410_NFREG(0x30)
-#define S3C2440_NFSECC   S3C2410_NFREG(0x34)
-#define S3C2440_NFSBLK   S3C2410_NFREG(0x38)
-#define S3C2440_NFEBLK   S3C2410_NFREG(0x3C)
-#define S3C2412_NFSBLK          S3C2410_NFREG(0x20)
-#define S3C2412_NFEBLK          S3C2410_NFREG(0x24)
-#define S3C2412_NFSTAT          S3C2410_NFREG(0x28)
-#define S3C2412_NFMECC_ERR0     S3C2410_NFREG(0x2C)
-#define S3C2412_NFMECC_ERR1     S3C2410_NFREG(0x30)
-#define S3C2412_NFMECC0         S3C2410_NFREG(0x34)
-#define S3C2412_NFMECC1         S3C2410_NFREG(0x38)
-#define S3C2412_NFSECC          S3C2410_NFREG(0x3C)
-#define S3C2410_NFCONF_EN          (1<<15)
-#define S3C2410_NFCONF_512BYTE     (1<<14)
-#define S3C2410_NFCONF_4STEP       (1<<13)
-#define S3C2410_NFCONF_INITECC     (1<<12)
-#define S3C2410_NFCONF_nFCE        (1<<11)
-#define S3C2410_NFCONF_TACLS(x)    ((x)<<8)
-#define S3C2410_NFCONF_TWRPH0(x)   ((x)<<4)
-#define S3C2410_NFCONF_TWRPH1(x)   ((x)<<0)
-#define S3C2410_NFSTAT_BUSY        (1<<0)
-#define S3C2440_NFCONF_BUSWIDTH_8       (0<<0)
-#define S3C2440_NFCONF_BUSWIDTH_16      (1<<0)
-#define S3C2440_NFCONF_ADVFLASH         (1<<3)
-#define S3C2440_NFCONF_TACLS(x)         ((x)<<12)
-#define S3C2440_NFCONF_TWRPH0(x)        ((x)<<8)
-#define S3C2440_NFCONF_TWRPH1(x)        ((x)<<4)
-#define S3C2440_NFCONT_LOCKTIGHT        (1<<13)
-#define S3C2440_NFCONT_SOFTLOCK         (1<<12)
-#define S3C2440_NFCONT_ILLEGALACC_EN    (1<<10)
-#define S3C2440_NFCONT_RNBINT_EN        (1<<9)
-#define S3C2440_NFCONT_RN_FALLING       (1<<8)
-#define S3C2440_NFCONT_SPARE_ECCLOCK    (1<<6)
-#define S3C2440_NFCONT_MAIN_ECCLOCK     (1<<5)
-#define S3C2440_NFCONT_INITECC          (1<<4)
-#define S3C2440_NFCONT_nFCE             (1<<1)
-#define S3C2440_NFCONT_ENABLE           (1<<0)
-#define S3C2440_NFSTAT_READY            (1<<0)
-#define S3C2440_NFSTAT_nCE              (1<<1)
-#define S3C2440_NFSTAT_RnB_CHANGE       (1<<2)
-#define S3C2440_NFSTAT_ILLEGAL_ACCESS   (1<<3)
-#define S3C2412_NFCONF_NANDBOOT         (1<<31)
-#define S3C2412_NFCONF_ECCCLKCON        (1<<30)
-#define S3C2412_NFCONF_ECC_MLC          (1<<24)
-#define S3C2412_NFCONF_TACLS_MASK       (7<<12) /* 1 extra bit of Tacls */
-#define S3C2412_NFCONT_ECC4_DIRWR       (1<<18)
-#define S3C2412_NFCONT_LOCKTIGHT        (1<<17)
-#define S3C2412_NFCONT_SOFTLOCK         (1<<16)
-#define S3C2412_NFCONT_ECC4_ENCINT      (1<<13)
-#define S3C2412_NFCONT_ECC4_DECINT      (1<<12)
-#define S3C2412_NFCONT_MAIN_ECC_LOCK    (1<<7)
-#define S3C2412_NFCONT_INIT_MAIN_ECC    (1<<5)
-#define S3C2412_NFCONT_nFCE1            (1<<2)
-#define S3C2412_NFCONT_nFCE0            (1<<1)
-#define S3C2412_NFSTAT_ECC_ENCDONE      (1<<7)
-#define S3C2412_NFSTAT_ECC_DECDONE      (1<<6)
-#define S3C2412_NFSTAT_ILLEGAL_ACCESS   (1<<5)
-#define S3C2412_NFSTAT_RnB_CHANGE       (1<<4)
-#define S3C2412_NFSTAT_nFCE1            (1<<3)
-#define S3C2412_NFSTAT_nFCE0            (1<<2)
-#define S3C2412_NFSTAT_Res1             (1<<1)
-#define S3C2412_NFSTAT_READY            (1<<0)
-#define S3C2412_NFECCERR_SERRDATA(x)    (((x) >> 21) & 0xf)
-#define S3C2412_NFECCERR_SERRBIT(x)     (((x) >> 18) & 0x7)
-#define S3C2412_NFECCERR_MERRDATA(x)    (((x) >> 7) & 0x3ff)
-#define S3C2412_NFECCERR_MERRBIT(x)     (((x) >> 4) & 0x7)
-#define S3C2412_NFECCERR_SPARE_ERR(x)   (((x) >> 2) & 0x3)
-#define S3C2412_NFECCERR_MAIN_ERR(x)    (((x) >> 2) & 0x3)
-#define S3C2412_NFECCERR_NONE           (0)
-#define S3C2412_NFECCERR_1BIT           (1)
-#define S3C2412_NFECCERR_MULTIBIT       (2)
-#define S3C2412_NFECCERR_ECCAREA        (3)
-#endif /* __ASM_ARM_REGS_NAND */
diff --git a/include/asm-arm/plat-s3c/regs-rtc.h b/include/asm-arm/plat-s3c/regs-rtc.h
deleted file mode 100644
index d5837cf8e402..000000000000
--- a/include/asm-arm/plat-s3c/regs-rtc.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-rtc.h
- *
- * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
- *                    http://www.simtec.co.uk/products/SWLINUX/
- *
- * 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.
- *
- * S3C2410 Internal RTC register definition
-*/
-#ifndef __ASM_ARCH_REGS_RTC_H
-#define __ASM_ARCH_REGS_RTC_H __FILE__
-#define S3C2410_RTCREG(x) (x)
-#define S3C2410_RTCCON        S3C2410_RTCREG(0x40)
-#define S3C2410_RTCCON_RTCEN  (1<<0)
-#define S3C2410_RTCCON_CLKSEL (1<<1)
-#define S3C2410_RTCCON_CNTSEL (1<<2)
-#define S3C2410_RTCCON_CLKRST (1<<3)
-#define S3C2410_TICNT         S3C2410_RTCREG(0x44)
-#define S3C2410_TICNT_ENABLE  (1<<7)
-#define S3C2410_RTCALM        S3C2410_RTCREG(0x50)
-#define S3C2410_RTCALM_ALMEN  (1<<6)
-#define S3C2410_RTCALM_YEAREN (1<<5)
-#define S3C2410_RTCALM_MONEN  (1<<4)
-#define S3C2410_RTCALM_DAYEN  (1<<3)
-#define S3C2410_RTCALM_HOUREN (1<<2)
-#define S3C2410_RTCALM_MINEN  (1<<1)
-#define S3C2410_RTCALM_SECEN  (1<<0)
-#define S3C2410_RTCALM_ALL \
-  S3C2410_RTCALM_ALMEN | S3C2410_RTCALM_YEAREN | S3C2410_RTCALM_MONEN |\
-  S3C2410_RTCALM_DAYEN | S3C2410_RTCALM_HOUREN | S3C2410_RTCALM_MINEN |\
-  S3C2410_RTCALM_SECEN
-#define S3C2410_ALMSEC        S3C2410_RTCREG(0x54)
-#define S3C2410_ALMMIN        S3C2410_RTCREG(0x58)
-#define S3C2410_ALMHOUR       S3C2410_RTCREG(0x5c)
-#define S3C2410_ALMDATE       S3C2410_RTCREG(0x60)
-#define S3C2410_ALMMON        S3C2410_RTCREG(0x64)
-#define S3C2410_ALMYEAR       S3C2410_RTCREG(0x68)
-#define S3C2410_RTCRST        S3C2410_RTCREG(0x6c)
-#define S3C2410_RTCSEC        S3C2410_RTCREG(0x70)
-#define S3C2410_RTCMIN        S3C2410_RTCREG(0x74)
-#define S3C2410_RTCHOUR       S3C2410_RTCREG(0x78)
-#define S3C2410_RTCDATE       S3C2410_RTCREG(0x7c)
-#define S3C2410_RTCDAY        S3C2410_RTCREG(0x80)
-#define S3C2410_RTCMON        S3C2410_RTCREG(0x84)
-#define S3C2410_RTCYEAR       S3C2410_RTCREG(0x88)
-#endif /* __ASM_ARCH_REGS_RTC_H */
diff --git a/include/asm-arm/plat-s3c/regs-watchdog.h b/include/asm-arm/plat-s3c/regs-watchdog.h
deleted file mode 100644
index 4938492470f7..000000000000
--- a/include/asm-arm/plat-s3c/regs-watchdog.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-watchdog.h
- *
- * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
- *                    http://www.simtec.co.uk/products/SWLINUX/
- *
- * 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.
- *
- * S3C2410 Watchdog timer control
-*/
-#ifndef __ASM_ARCH_REGS_WATCHDOG_H
-#define __ASM_ARCH_REGS_WATCHDOG_H
-#define S3C_WDOGREG(x) ((x) + S3C_VA_WATCHDOG)
-#define S3C2410_WTCON      S3C_WDOGREG(0x00)
-#define S3C2410_WTDAT      S3C_WDOGREG(0x04)
-#define S3C2410_WTCNT      S3C_WDOGREG(0x08)
-/* the watchdog can either generate a reset pulse, or an
- * interrupt.
- */
-#define S3C2410_WTCON_RSTEN   (0x01)
-#define S3C2410_WTCON_INTEN   (1<<2)
-#define S3C2410_WTCON_ENABLE  (1<<5)
-#define S3C2410_WTCON_DIV16   (0<<3)
-#define S3C2410_WTCON_DIV32   (1<<3)
-#define S3C2410_WTCON_DIV64   (2<<3)
-#define S3C2410_WTCON_DIV128  (3<<3)
-#define S3C2410_WTCON_PRESCALE(x) ((x) << 8)
-#define S3C2410_WTCON_PRESCALE_MASK (0xff00)
-#endif /* __ASM_ARCH_REGS_WATCHDOG_H */
diff --git a/include/asm-arm/plat-s3c24xx/mci.h b/include/asm-arm/plat-s3c24xx/mci.h
deleted file mode 100644
index 2d0852ac3b27..000000000000
--- a/include/asm-arm/plat-s3c24xx/mci.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ARCH_MCI_H
-#define _ARCH_MCI_H
-struct s3c24xx_mci_pdata {
-        unsigned int    wprotect_invert : 1;
-        unsigned int    detect_invert : 1;   /* set => detect active high. */
-        unsigned int    gpio_detect;
-        unsigned int    gpio_wprotect;
-        unsigned long   ocr_avail;
-        void            (*set_power)(unsigned char power_mode,
-                                     unsigned short vdd);
-};
-#endif /* _ARCH_NCI_H */
diff --git a/include/asm-arm/plat-s3c24xx/regs-spi.h b/include/asm-arm/plat-s3c24xx/regs-spi.h
deleted file mode 100644
index 2b35479ee35c..000000000000
--- a/include/asm-arm/plat-s3c24xx/regs-spi.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-spi.h
- *
- * Copyright (c) 2004 Fetron GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * S3C2410 SPI register definition
-*/
-#ifndef __ASM_ARCH_REGS_SPI_H
-#define __ASM_ARCH_REGS_SPI_H
-#define S3C2410_SPI1    (0x20)
-#define S3C2412_SPI1    (0x100)
-#define S3C2410_SPCON   (0x00)
-#define S3C2412_SPCON_RXFIFO_RB2        (0<<14)
-#define S3C2412_SPCON_RXFIFO_RB4        (1<<14)
-#define S3C2412_SPCON_RXFIFO_RB12       (2<<14)
-#define S3C2412_SPCON_RXFIFO_RB14       (3<<14)
-#define S3C2412_SPCON_TXFIFO_RB2        (0<<12)
-#define S3C2412_SPCON_TXFIFO_RB4        (1<<12)
-#define S3C2412_SPCON_TXFIFO_RB12       (2<<12)
-#define S3C2412_SPCON_TXFIFO_RB14       (3<<12)
-#define S3C2412_SPCON_RXFIFO_RESET      (1<<11) /* RxFIFO reset */
-#define S3C2412_SPCON_TXFIFO_RESET      (1<<10) /* TxFIFO reset */
-#define S3C2412_SPCON_RXFIFO_EN         (1<<9)  /* RxFIFO Enable */
-#define S3C2412_SPCON_TXFIFO_EN         (1<<8)  /* TxFIFO Enable */
-#define S3C2412_SPCON_DIRC_RX     (1<<7)
-#define S3C2410_SPCON_SMOD_DMA    (2<<5)        /* DMA mode */
-#define S3C2410_SPCON_SMOD_INT    (1<<5)        /* interrupt mode */
-#define S3C2410_SPCON_SMOD_POLL   (0<<5)        /* polling mode */
-#define S3C2410_SPCON_ENSCK       (1<<4)        /* Enable SCK */
-#define S3C2410_SPCON_MSTR        (1<<3)        /* Master/Slave select
-                                                   0: slave, 1: master */
-#define S3C2410_SPCON_CPOL_HIGH   (1<<2)        /* Clock polarity select */
-#define S3C2410_SPCON_CPOL_LOW    (0<<2)        /* Clock polarity select */
-#define S3C2410_SPCON_CPHA_FMTB   (1<<1)        /* Clock Phase Select */
-#define S3C2410_SPCON_CPHA_FMTA   (0<<1)        /* Clock Phase Select */
-#define S3C2410_SPCON_TAGD        (1<<0)        /* Tx auto garbage data mode */
-#define S3C2410_SPSTA    (0x04)
-#define S3C2412_SPSTA_RXFIFO_AE         (1<<11)
-#define S3C2412_SPSTA_TXFIFO_AE         (1<<10)
-#define S3C2412_SPSTA_RXFIFO_ERROR      (1<<9)
-#define S3C2412_SPSTA_TXFIFO_ERROR      (1<<8)
-#define S3C2412_SPSTA_RXFIFO_FIFO       (1<<7)
-#define S3C2412_SPSTA_RXFIFO_EMPTY      (1<<6)
-#define S3C2412_SPSTA_TXFIFO_NFULL      (1<<5)
-#define S3C2412_SPSTA_TXFIFO_EMPTY      (1<<4)
-#define S3C2410_SPSTA_DCOL        (1<<2)        /* Data Collision Error */
-#define S3C2410_SPSTA_MULD        (1<<1)        /* Multi Master Error */
-#define S3C2410_SPSTA_READY       (1<<0)        /* Data Tx/Rx ready */
-#define S3C2412_SPSTA_READY_ORG   (1<<3)
-#define S3C2410_SPPIN    (0x08)
-#define S3C2410_SPPIN_ENMUL       (1<<2)        /* Multi Master Error detect */
-#define S3C2410_SPPIN_RESERVED    (1<<1)
-#define S3C2400_SPPIN_nCS         (1<<1)        /* SPI Card Select */
-#define S3C2410_SPPIN_KEEP        (1<<0)        /* Master Out keep */
-#define S3C2410_SPPRE    (0x0C)
-#define S3C2410_SPTDAT   (0x10)
-#define S3C2410_SPRDAT   (0x14)
-#define S3C2412_TXFIFO   (0x18)
-#define S3C2412_RXFIFO   (0x18)
-#define S3C2412_SPFIC    (0x24)
-#endif /* __ASM_ARCH_REGS_SPI_H */
diff --git a/include/asm-arm/plat-s3c24xx/regs-udc.h b/include/asm-arm/plat-s3c24xx/regs-udc.h
deleted file mode 100644
index f0dd4a41b37b..000000000000
--- a/include/asm-arm/plat-s3c24xx/regs-udc.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-udc.h
- *
- * Copyright (C) 2004 Herbert Poetzl <herbert@13thfloor.at>
- *
- * This include file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
-*/
-#ifndef __ASM_ARCH_REGS_UDC_H
-#define __ASM_ARCH_REGS_UDC_H
-#define S3C2410_USBDREG(x) (x)
-#define S3C2410_UDC_FUNC_ADDR_REG       S3C2410_USBDREG(0x0140)
-#define S3C2410_UDC_PWR_REG             S3C2410_USBDREG(0x0144)
-#define S3C2410_UDC_EP_INT_REG          S3C2410_USBDREG(0x0148)
-#define S3C2410_UDC_USB_INT_REG         S3C2410_USBDREG(0x0158)
-#define S3C2410_UDC_EP_INT_EN_REG       S3C2410_USBDREG(0x015c)
-#define S3C2410_UDC_USB_INT_EN_REG      S3C2410_USBDREG(0x016c)
-#define S3C2410_UDC_FRAME_NUM1_REG      S3C2410_USBDREG(0x0170)
-#define S3C2410_UDC_FRAME_NUM2_REG      S3C2410_USBDREG(0x0174)
-#define S3C2410_UDC_EP0_FIFO_REG        S3C2410_USBDREG(0x01c0)
-#define S3C2410_UDC_EP1_FIFO_REG        S3C2410_USBDREG(0x01c4)
-#define S3C2410_UDC_EP2_FIFO_REG        S3C2410_USBDREG(0x01c8)
-#define S3C2410_UDC_EP3_FIFO_REG        S3C2410_USBDREG(0x01cc)
-#define S3C2410_UDC_EP4_FIFO_REG        S3C2410_USBDREG(0x01d0)
-#define S3C2410_UDC_EP1_DMA_CON         S3C2410_USBDREG(0x0200)
-#define S3C2410_UDC_EP1_DMA_UNIT        S3C2410_USBDREG(0x0204)
-#define S3C2410_UDC_EP1_DMA_FIFO        S3C2410_USBDREG(0x0208)
-#define S3C2410_UDC_EP1_DMA_TTC_L       S3C2410_USBDREG(0x020c)
-#define S3C2410_UDC_EP1_DMA_TTC_M       S3C2410_USBDREG(0x0210)
-#define S3C2410_UDC_EP1_DMA_TTC_H       S3C2410_USBDREG(0x0214)
-#define S3C2410_UDC_EP2_DMA_CON         S3C2410_USBDREG(0x0218)
-#define S3C2410_UDC_EP2_DMA_UNIT        S3C2410_USBDREG(0x021c)
-#define S3C2410_UDC_EP2_DMA_FIFO        S3C2410_USBDREG(0x0220)
-#define S3C2410_UDC_EP2_DMA_TTC_L       S3C2410_USBDREG(0x0224)
-#define S3C2410_UDC_EP2_DMA_TTC_M       S3C2410_USBDREG(0x0228)
-#define S3C2410_UDC_EP2_DMA_TTC_H       S3C2410_USBDREG(0x022c)
-#define S3C2410_UDC_EP3_DMA_CON         S3C2410_USBDREG(0x0240)
-#define S3C2410_UDC_EP3_DMA_UNIT        S3C2410_USBDREG(0x0244)
-#define S3C2410_UDC_EP3_DMA_FIFO        S3C2410_USBDREG(0x0248)
-#define S3C2410_UDC_EP3_DMA_TTC_L       S3C2410_USBDREG(0x024c)
-#define S3C2410_UDC_EP3_DMA_TTC_M       S3C2410_USBDREG(0x0250)
-#define S3C2410_UDC_EP3_DMA_TTC_H       S3C2410_USBDREG(0x0254)
-#define S3C2410_UDC_EP4_DMA_CON         S3C2410_USBDREG(0x0258)
-#define S3C2410_UDC_EP4_DMA_UNIT        S3C2410_USBDREG(0x025c)
-#define S3C2410_UDC_EP4_DMA_FIFO        S3C2410_USBDREG(0x0260)
-#define S3C2410_UDC_EP4_DMA_TTC_L       S3C2410_USBDREG(0x0264)
-#define S3C2410_UDC_EP4_DMA_TTC_M       S3C2410_USBDREG(0x0268)
-#define S3C2410_UDC_EP4_DMA_TTC_H       S3C2410_USBDREG(0x026c)
-#define S3C2410_UDC_INDEX_REG           S3C2410_USBDREG(0x0178)
-/* indexed registers */
-#define S3C2410_UDC_MAXP_REG            S3C2410_USBDREG(0x0180)
-#define S3C2410_UDC_EP0_CSR_REG         S3C2410_USBDREG(0x0184)
-#define S3C2410_UDC_IN_CSR1_REG         S3C2410_USBDREG(0x0184)
-#define S3C2410_UDC_IN_CSR2_REG         S3C2410_USBDREG(0x0188)
-#define S3C2410_UDC_OUT_CSR1_REG        S3C2410_USBDREG(0x0190)
-#define S3C2410_UDC_OUT_CSR2_REG        S3C2410_USBDREG(0x0194)
-#define S3C2410_UDC_OUT_FIFO_CNT1_REG   S3C2410_USBDREG(0x0198)
-#define S3C2410_UDC_OUT_FIFO_CNT2_REG   S3C2410_USBDREG(0x019c)
-#define S3C2410_UDC_FUNCADDR_UPDATE     (1<<7)
-#define S3C2410_UDC_PWR_ISOUP           (1<<7) // R/W
-#define S3C2410_UDC_PWR_RESET           (1<<3) // R
-#define S3C2410_UDC_PWR_RESUME          (1<<2) // R/W
-#define S3C2410_UDC_PWR_SUSPEND         (1<<1) // R
-#define S3C2410_UDC_PWR_ENSUSPEND       (1<<0) // R/W
-#define S3C2410_UDC_PWR_DEFAULT         0x00
-#define S3C2410_UDC_INT_EP4             (1<<4) // R/W (clear only)
-#define S3C2410_UDC_INT_EP3             (1<<3) // R/W (clear only)
-#define S3C2410_UDC_INT_EP2             (1<<2) // R/W (clear only)
-#define S3C2410_UDC_INT_EP1             (1<<1) // R/W (clear only)
-#define S3C2410_UDC_INT_EP0             (1<<0) // R/W (clear only)
-#define S3C2410_UDC_USBINT_RESET        (1<<2) // R/W (clear only)
-#define S3C2410_UDC_USBINT_RESUME       (1<<1) // R/W (clear only)
-#define S3C2410_UDC_USBINT_SUSPEND      (1<<0) // R/W (clear only)
-#define S3C2410_UDC_INTE_EP4            (1<<4) // R/W
-#define S3C2410_UDC_INTE_EP3            (1<<3) // R/W
-#define S3C2410_UDC_INTE_EP2            (1<<2) // R/W
-#define S3C2410_UDC_INTE_EP1            (1<<1) // R/W
-#define S3C2410_UDC_INTE_EP0            (1<<0) // R/W
-#define S3C2410_UDC_USBINTE_RESET       (1<<2) // R/W
-#define S3C2410_UDC_USBINTE_SUSPEND     (1<<0) // R/W
-#define S3C2410_UDC_INDEX_EP0           (0x00)
-#define S3C2410_UDC_INDEX_EP1           (0x01) // ??
-#define S3C2410_UDC_INDEX_EP2           (0x02) // ??
-#define S3C2410_UDC_INDEX_EP3           (0x03) // ??
-#define S3C2410_UDC_INDEX_EP4           (0x04) // ??
-#define S3C2410_UDC_ICSR1_CLRDT         (1<<6) // R/W
-#define S3C2410_UDC_ICSR1_SENTSTL       (1<<5) // R/W (clear only)
-#define S3C2410_UDC_ICSR1_SENDSTL       (1<<4) // R/W
-#define S3C2410_UDC_ICSR1_FFLUSH        (1<<3) // W   (set only)
-#define S3C2410_UDC_ICSR1_UNDRUN        (1<<2) // R/W (clear only)
-#define S3C2410_UDC_ICSR1_PKTRDY        (1<<0) // R/W (set only)
-#define S3C2410_UDC_ICSR2_AUTOSET       (1<<7) // R/W
-#define S3C2410_UDC_ICSR2_ISO           (1<<6) // R/W
-#define S3C2410_UDC_ICSR2_MODEIN        (1<<5) // R/W
-#define S3C2410_UDC_ICSR2_DMAIEN        (1<<4) // R/W
-#define S3C2410_UDC_OCSR1_CLRDT         (1<<7) // R/W
-#define S3C2410_UDC_OCSR1_SENTSTL       (1<<6) // R/W (clear only)
-#define S3C2410_UDC_OCSR1_SENDSTL       (1<<5) // R/W
-#define S3C2410_UDC_OCSR1_FFLUSH        (1<<4) // R/W
-#define S3C2410_UDC_OCSR1_DERROR        (1<<3) // R
-#define S3C2410_UDC_OCSR1_OVRRUN        (1<<2) // R/W (clear only)
-#define S3C2410_UDC_OCSR1_PKTRDY        (1<<0) // R/W (clear only)
-#define S3C2410_UDC_OCSR2_AUTOCLR       (1<<7) // R/W
-#define S3C2410_UDC_OCSR2_ISO           (1<<6) // R/W
-#define S3C2410_UDC_OCSR2_DMAIEN        (1<<5) // R/W
-#define S3C2410_UDC_EP0_CSR_OPKRDY      (1<<0)
-#define S3C2410_UDC_EP0_CSR_IPKRDY      (1<<1)
-#define S3C2410_UDC_EP0_CSR_SENTSTL     (1<<2)
-#define S3C2410_UDC_EP0_CSR_DE          (1<<3)
-#define S3C2410_UDC_EP0_CSR_SE          (1<<4)
-#define S3C2410_UDC_EP0_CSR_SENDSTL     (1<<5)
-#define S3C2410_UDC_EP0_CSR_SOPKTRDY    (1<<6)
-#define S3C2410_UDC_EP0_CSR_SSE (1<<7)
-#define S3C2410_UDC_MAXP_8              (1<<0)
-#define S3C2410_UDC_MAXP_16             (1<<1)
-#define S3C2410_UDC_MAXP_32             (1<<2)
-#define S3C2410_UDC_MAXP_64             (1<<3)
-#endif
diff --git a/include/asm-arm/plat-s3c24xx/udc.h b/include/asm-arm/plat-s3c24xx/udc.h
deleted file mode 100644
index 546bb4008f49..000000000000
--- a/include/asm-arm/plat-s3c24xx/udc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/udc.h
- *
- * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.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.
- *
- *
- *  Changelog:
- *      14-Mar-2005     RTP     Created file
- *      02-Aug-2005     RTP     File rename
- *      07-Sep-2005     BJD     Minor cleanups, changed cmd to enum
- *      18-Jan-2007     HMW     Add per-platform vbus_draw function
-*/
-#ifndef __ASM_ARM_ARCH_UDC_H
-#define __ASM_ARM_ARCH_UDC_H
-enum s3c2410_udc_cmd_e {
-        S3C2410_UDC_P_ENABLE    = 1,    /* Pull-up enable        */
-        S3C2410_UDC_P_DISABLE   = 2,    /* Pull-up disable       */
-        S3C2410_UDC_P_RESET     = 3,    /* UDC reset, in case of */
-};
-struct s3c2410_udc_mach_info {
-        void    (*udc_command)(enum s3c2410_udc_cmd_e);
-        void    (*vbus_draw)(unsigned int ma);
-        unsigned int vbus_pin;
-        unsigned char vbus_pin_inverted;
-};
-extern void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *);
-#endif /* __ASM_ARM_ARCH_UDC_H */
diff --git a/include/asm-frv/bitops.h b/include/asm-frv/bitops.h
index 39456ba0ec17..287f6f697ce2 100644
--- a/include/asm-frv/bitops.h
+++ b/include/asm-frv/bitops.h
@@ -339,6 +339,19 @@ int __ffs(unsigned long x)
        return 31 - bit;
 }
+/**
+ * __fls - find last (most-significant) set bit in a long word
+ * @word: the word to search
+ *
+ * Undefined if no set bit exists, so code should check against 0 first.
+ */
+static inline unsigned long __fls(unsigned long word)
+{
+        unsigned long bit;
+        asm("scan %1,gr0,%0" : "=r"(bit) : "r"(word));
+        return bit;
+}
 /*
 * special slimline version of fls() for calculating ilog2_u32()
 * - note: no protection against n == 0
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
index 4ec0a296bdec..7abdaa91ccd3 100644
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
@@ -251,7 +251,7 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
 #define atomic_long_cmpxchg(l, old, new) \
        (atomic_cmpxchg((atomic_t *)(l), (old), (new)))
 #define atomic_long_xchg(v, new) \
-        (atomic_xchg((atomic_t *)(l), (new)))
+        (atomic_xchg((atomic_t *)(v), (new)))
 #endif  /*  BITS_PER_LONG == 64  */
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 12c07c1866b2..8af276361bf2 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -8,9 +8,17 @@
 #ifdef CONFIG_GENERIC_BUG
 #ifndef __ASSEMBLY__
 struct bug_entry {
+#ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
        unsigned long   bug_addr;
+#else
+        signed int      bug_addr_disp;
+#endif
 #ifdef CONFIG_DEBUG_BUGVERBOSE
+#ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
        const char      *file;
+#else
+        signed int      file_disp;
+#endif
        unsigned short  line;
 #endif
        unsigned short  flags;
@@ -33,15 +41,14 @@ struct bug_entry {
 #ifndef __WARN
 #ifndef __ASSEMBLY__
-extern void warn_on_slowpath(const char *file, const int line);
 extern void warn_slowpath(const char *file, const int line,
                const char *fmt, ...) __attribute__((format(printf, 3, 4)));
 #define WANT_WARN_ON_SLOWPATH
 #endif
-#define __WARN() warn_on_slowpath(__FILE__, __LINE__)
+#define __WARN()                warn_slowpath(__FILE__, __LINE__, NULL)
-#define __WARN_printf(arg...) warn_slowpath(__FILE__, __LINE__, arg)
+#define __WARN_printf(arg...)   warn_slowpath(__FILE__, __LINE__, arg)
 #else
-#define __WARN_printf(arg...) do { printk(arg); __WARN(); } while (0)
+#define __WARN_printf(arg...)   do { printk(arg); __WARN(); } while (0)
 #endif
 #ifndef WARN_ON
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h
index 18546d8eb78e..36fa286adad5 100644
--- a/include/asm-generic/memory_model.h
+++ b/include/asm-generic/memory_model.h
@@ -49,7 +49,7 @@
 /* memmap is virtually contigious.  */
 #define __pfn_to_page(pfn)      (vmemmap + (pfn))
-#define __page_to_pfn(page)     ((page) - vmemmap)
+#define __page_to_pfn(page)     (unsigned long)((page) - vmemmap)
 #elif defined(CONFIG_SPARSEMEM)
 /*
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index ef87f889ef62..72ebe91005a8 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -129,6 +129,10 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres
 #define move_pte(pte, prot, old_addr, new_addr) (pte)
 #endif
+#ifndef pgprot_writecombine
+#define pgprot_writecombine pgprot_noncached
+#endif
 /*
 * When walking page tables, get the address of the next boundary,
 * or the end address of the range if that comes earlier.  Although no
@@ -289,6 +293,52 @@ static inline void ptep_modify_prot_commit(struct mm_struct *mm,
 #define arch_flush_lazy_cpu_mode()      do {} while (0)
 #endif
+#ifndef __HAVE_PFNMAP_TRACKING
+/*
+ * Interface that can be used by architecture code to keep track of
+ * memory type of pfn mappings (remap_pfn_range, vm_insert_pfn)
+ *
+ * track_pfn_vma_new is called when a _new_ pfn mapping is being established
+ * for physical range indicated by pfn and size.
+ */
+static inline int track_pfn_vma_new(struct vm_area_struct *vma, pgprot_t prot,
+                                        unsigned long pfn, unsigned long size)
+{
+        return 0;
+}
+/*
+ * Interface that can be used by architecture code to keep track of
+ * memory type of pfn mappings (remap_pfn_range, vm_insert_pfn)
+ *
+ * track_pfn_vma_copy is called when vma that is covering the pfnmap gets
+ * copied through copy_page_range().
+ */
+static inline int track_pfn_vma_copy(struct vm_area_struct *vma)
+{
+        return 0;
+}
+/*
+ * Interface that can be used by architecture code to keep track of
+ * memory type of pfn mappings (remap_pfn_range, vm_insert_pfn)
+ *
+ * untrack_pfn_vma is called while unmapping a pfnmap for a region.
+ * untrack can be called for a specific region indicated by pfn and size or
+ * can be for the entire vma (in which case size can be zero).
+ */
+static inline void untrack_pfn_vma(struct vm_area_struct *vma,
+                                        unsigned long pfn, unsigned long size)
+{
+}
+#else
+extern int track_pfn_vma_new(struct vm_area_struct *vma, pgprot_t prot,
+                                unsigned long pfn, unsigned long size);
+extern int track_pfn_vma_copy(struct vm_area_struct *vma);
+extern void untrack_pfn_vma(struct vm_area_struct *vma, unsigned long pfn,
+                                unsigned long size);
+#endif
 #endif /* !__ASSEMBLY__ */
 #endif /* _ASM_GENERIC_PGTABLE_H */
diff --git a/include/asm-generic/topology.h b/include/asm-generic/topology.h
index 54bbf6e04ee8..0e9e2bc0ee96 100644
--- a/include/asm-generic/topology.h
+++ b/include/asm-generic/topology.h
@@ -40,6 +40,9 @@
 #ifndef node_to_cpumask
 #define node_to_cpumask(node)   ((void)node, cpu_online_map)
 #endif
+#ifndef cpumask_of_node
+#define cpumask_of_node(node)   ((void)node, cpu_online_mask)
+#endif
 #ifndef node_to_first_cpu
 #define node_to_first_cpu(node) ((void)(node),0)
 #endif
@@ -54,9 +57,18 @@
                                )
 #endif
+#ifndef cpumask_of_pcibus
+#define cpumask_of_pcibus(bus)  (pcibus_to_node(bus) == -1 ?            \
+                                 cpu_all_mask :                         \
+                                 cpumask_of_node(pcibus_to_node(bus)))
+#endif
 #endif  /* CONFIG_NUMA */
-/* returns pointer to cpumask for specified node */
+/*
+ * returns pointer to cpumask for specified node
+ * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)"
+ */
 #ifndef node_to_cpumask_ptr
 #define node_to_cpumask_ptr(v, node)                                    \
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 80744606bad1..c61fab1dd2f8 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -45,6 +45,22 @@
 #define MCOUNT_REC()
 #endif
+#ifdef CONFIG_TRACE_BRANCH_PROFILING
+#define LIKELY_PROFILE()        VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \
+                                *(_ftrace_annotated_branch)                           \
+                                VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .;
+#else
+#define LIKELY_PROFILE()
+#endif
+#ifdef CONFIG_PROFILE_ALL_BRANCHES
+#define BRANCH_PROFILE()        VMLINUX_SYMBOL(__start_branch_profile) = .;   \
+                                *(_ftrace_branch)                             \
+                                VMLINUX_SYMBOL(__stop_branch_profile) = .;
+#else
+#define BRANCH_PROFILE()
+#endif
 /* .data section */
 #define DATA_DATA                                                       \
        *(.data)                                                        \
@@ -60,9 +76,12 @@
        VMLINUX_SYMBOL(__start___markers) = .;                          \
        *(__markers)                                                    \
        VMLINUX_SYMBOL(__stop___markers) = .;                           \
+        . = ALIGN(32);                                                  \
        VMLINUX_SYMBOL(__start___tracepoints) = .;                      \
        *(__tracepoints)                                                \
-        VMLINUX_SYMBOL(__stop___tracepoints) = .;
+        VMLINUX_SYMBOL(__stop___tracepoints) = .;                       \
+        LIKELY_PROFILE()                                                \
+        BRANCH_PROFILE()
 #define RO_DATA(align)                                                  \
        . = ALIGN((align));                                             \
@@ -269,6 +288,16 @@
                *(.kprobes.text)                                        \
                VMLINUX_SYMBOL(__kprobes_text_end) = .;
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+#define IRQENTRY_TEXT                                                   \
+                ALIGN_FUNCTION();                                       \
+                VMLINUX_SYMBOL(__irqentry_text_start) = .;              \
+                *(.irqentry.text)                                       \
+                VMLINUX_SYMBOL(__irqentry_text_end) = .;
+#else
+#define IRQENTRY_TEXT
+#endif
 /* Section used for early init (in .S files) */
 #define HEAD_TEXT  *(.head.text)
diff --git a/include/asm-m32r/bitops.h b/include/asm-m32r/bitops.h
index 6dc9b81bf9f3..aaddf0d57603 100644
--- a/include/asm-m32r/bitops.h
+++ b/include/asm-m32r/bitops.h
@@ -251,6 +251,7 @@ static __inline__ int test_and_change_bit(int nr, volatile void * addr)
 #include <asm-generic/bitops/ffz.h>
 #include <asm-generic/bitops/__ffs.h>
 #include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/__fls.h>
 #include <asm-generic/bitops/fls64.h>
 #ifdef __KERNEL__
diff --git a/include/asm-m32r/smp.h b/include/asm-m32r/smp.h
index c5dd66916692..b96a6d2ffbc3 100644
--- a/include/asm-m32r/smp.h
+++ b/include/asm-m32r/smp.h
@@ -63,8 +63,6 @@ extern volatile int cpu_2_physid[NR_CPUS];
 #define raw_smp_processor_id()  (current_thread_info()->cpu)
 extern cpumask_t cpu_callout_map;
-extern cpumask_t cpu_possible_map;
-extern cpumask_t cpu_present_map;
 static __inline__ int hard_smp_processor_id(void)
 {
diff --git a/include/asm-m32r/system.h b/include/asm-m32r/system.h
index 70a57c8c002b..c980f5ba8de7 100644
--- a/include/asm-m32r/system.h
+++ b/include/asm-m32r/system.h
@@ -23,7 +23,7 @@
 */
 #if defined(CONFIG_FRAME_POINTER) || \
-        !defined(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER)
+        !defined(CONFIG_SCHED_OMIT_FRAME_POINTER)
 #define M32R_PUSH_FP "  push fp\n"
 #define M32R_POP_FP  "  pop  fp\n"
 #else
diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h
index 3e8106442d5a..9bde784e7bad 100644
--- a/include/asm-m68k/bitops.h
+++ b/include/asm-m68k/bitops.h
@@ -315,6 +315,11 @@ static inline int fls(int x)
        return 32 - cnt;
 }
+static inline int __fls(int x)
+{
+        return fls(x) - 1;
+}
 #include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>
diff --git a/include/asm-m68k/byteorder.h b/include/asm-m68k/byteorder.h
index 81d420b35c80..b354acdafec8 100644
--- a/include/asm-m68k/byteorder.h
+++ b/include/asm-m68k/byteorder.h
@@ -4,22 +4,16 @@
 #include <asm/types.h>
 #include <linux/compiler.h>
-#ifdef __GNUC__
+#define __BIG_ENDIAN
+#define __SWAB_64_THRU_32__
-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 val)
+static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
 {
        __asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val));
        return val;
 }
-#define __arch__swab32(x) ___arch__swab32(x)
+#define __arch_swab32 __arch_swab32
-#endif
+#include <linux/byteorder.h>
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-#include <linux/byteorder/big_endian.h>
 #endif /* _M68K_BYTEORDER_H */
diff --git a/include/asm-m68k/machw.h b/include/asm-m68k/machw.h
index 35624998291c..2b4de0c2ce4a 100644
--- a/include/asm-m68k/machw.h
+++ b/include/asm-m68k/machw.h
@@ -26,28 +26,6 @@
 #include <linux/types.h>
 #if 0
-/* Mac SCSI Controller 5380 */
-#define MAC_5380_BAS    (0x50F10000) /* This is definitely wrong!! */
-struct MAC_5380 {
-        u_char  scsi_data;
-        u_char  char_dummy1;
-        u_char  scsi_icr;
-        u_char  char_dummy2;
-        u_char  scsi_mode;
-        u_char  char_dummy3;
-        u_char  scsi_tcr;
-        u_char  char_dummy4;
-        u_char  scsi_idstat;
-        u_char  char_dummy5;
-        u_char  scsi_dmastat;
-        u_char  char_dummy6;
-        u_char  scsi_targrcv;
-        u_char  char_dummy7;
-        u_char  scsi_inircv;
-};
-#define mac_scsi       ((*(volatile struct MAC_5380 *)MAC_5380_BAS))
 /*
 ** SCC Z8530
 */
diff --git a/include/asm-mn10300/bitops.h b/include/asm-mn10300/bitops.h
index cc6d40c05cf3..0b610f482abb 100644
--- a/include/asm-mn10300/bitops.h
+++ b/include/asm-mn10300/bitops.h
@@ -196,6 +196,17 @@ int fls(int x)
 }
 /**
+ * __fls - find last (most-significant) set bit in a long word
+ * @word: the word to search
+ *
+ * Undefined if no set bit exists, so code should check against 0 first.
+ */
+static inline unsigned long __fls(unsigned long word)
+{
+        return __ilog2_u32(word);
+}
+/**
 * ffs - find first bit set
 * @x: the word to search
 *
diff --git a/include/asm-mn10300/uaccess.h b/include/asm-mn10300/uaccess.h
index 46b9b647f3c3..8a3a4dd55763 100644
--- a/include/asm-mn10300/uaccess.h
+++ b/include/asm-mn10300/uaccess.h
@@ -266,7 +266,7 @@ extern int __get_user_unknown(void);
                "       .section        .fixup,\"ax\"   \n"             \
                "4:                                     \n"             \
                "       mov             %5,%0           \n"             \
-                "       jmp             2b              \n"             \
+                "       jmp             3b              \n"             \
                "       .previous                       \n"             \
                "       .section        __ex_table,\"a\"\n"             \
                "       .balign         4               \n"             \
diff --git a/include/asm-xtensa/bitops.h b/include/asm-xtensa/bitops.h
index 23261e8f2e5a..6c3930397bd3 100644
--- a/include/asm-xtensa/bitops.h
+++ b/include/asm-xtensa/bitops.h
@@ -82,6 +82,16 @@ static inline int fls (unsigned int x)
        return 32 - __cntlz(x);
 }
+/**
+ * __fls - find last (most-significant) set bit in a long word
+ * @word: the word to search
+ *
+ * Undefined if no set bit exists, so code should check against 0 first.
+ */
+static inline unsigned long __fls(unsigned long word)
+{
+        return 31 - __cntlz(word);
+}
 #else
 /* Use the generic implementation if we don't have the nsa/nsau instructions. */
@@ -90,6 +100,7 @@ static inline int fls (unsigned int x)
 # include <asm-generic/bitops/__ffs.h>
 # include <asm-generic/bitops/ffz.h>
 # include <asm-generic/bitops/fls.h>
+# include <asm-generic/bitops/__fls.h>
 #endif
diff --git a/include/crypto/aes.h b/include/crypto/aes.h
index 40008d67ee3d..656a4c66a568 100644
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -23,10 +23,10 @@ struct crypto_aes_ctx {
        u32 key_dec[AES_MAX_KEYLENGTH_U32];
 };
-extern u32 crypto_ft_tab[4][256];
+extern const u32 crypto_ft_tab[4][256];
-extern u32 crypto_fl_tab[4][256];
+extern const u32 crypto_fl_tab[4][256];
-extern u32 crypto_it_tab[4][256];
+extern const u32 crypto_it_tab[4][256];
-extern u32 crypto_il_tab[4][256];
+extern const u32 crypto_il_tab[4][256];
 int crypto_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
                unsigned int key_len);
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 60d06e784be3..010545436efa 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -22,9 +22,18 @@ struct seq_file;
 struct crypto_type {
        unsigned int (*ctxsize)(struct crypto_alg *alg, u32 type, u32 mask);
+        unsigned int (*extsize)(struct crypto_alg *alg,
+                                const struct crypto_type *frontend);
        int (*init)(struct crypto_tfm *tfm, u32 type, u32 mask);
-        void (*exit)(struct crypto_tfm *tfm);
+        int (*init_tfm)(struct crypto_tfm *tfm,
+                        const struct crypto_type *frontend);
        void (*show)(struct seq_file *m, struct crypto_alg *alg);
+        struct crypto_alg *(*lookup)(const char *name, u32 type, u32 mask);
+        unsigned int type;
+        unsigned int maskclear;
+        unsigned int maskset;
+        unsigned int tfmsize;
 };
 struct crypto_instance {
@@ -239,6 +248,11 @@ static inline struct crypto_hash *crypto_spawn_hash(struct crypto_spawn *spawn)
        return __crypto_hash_cast(crypto_spawn_tfm(spawn, type, mask));
 }
+static inline void *crypto_hash_ctx(struct crypto_hash *tfm)
+{
+        return crypto_tfm_ctx(&tfm->base);
+}
 static inline void *crypto_hash_ctx_aligned(struct crypto_hash *tfm)
 {
        return crypto_tfm_ctx_aligned(&tfm->base);
diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index ee48ef8fb2ea..cd16d6e668ce 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -15,10 +15,40 @@
 #include <linux/crypto.h>
+struct shash_desc {
+        struct crypto_shash *tfm;
+        u32 flags;
+        void *__ctx[] CRYPTO_MINALIGN_ATTR;
+};
+struct shash_alg {
+        int (*init)(struct shash_desc *desc);
+        int (*reinit)(struct shash_desc *desc);
+        int (*update)(struct shash_desc *desc, const u8 *data,
+                      unsigned int len);
+        int (*final)(struct shash_desc *desc, u8 *out);
+        int (*finup)(struct shash_desc *desc, const u8 *data,
+                     unsigned int len, u8 *out);
+        int (*digest)(struct shash_desc *desc, const u8 *data,
+                      unsigned int len, u8 *out);
+        int (*setkey)(struct crypto_shash *tfm, const u8 *key,
+                      unsigned int keylen);
+        unsigned int descsize;
+        unsigned int digestsize;
+        struct crypto_alg base;
+};
 struct crypto_ahash {
        struct crypto_tfm base;
 };
+struct crypto_shash {
+        struct crypto_tfm base;
+};
 static inline struct crypto_ahash *__crypto_ahash_cast(struct crypto_tfm *tfm)
 {
        return (struct crypto_ahash *)tfm;
@@ -87,6 +117,11 @@ static inline unsigned int crypto_ahash_reqsize(struct crypto_ahash *tfm)
        return crypto_ahash_crt(tfm)->reqsize;
 }
+static inline void *ahash_request_ctx(struct ahash_request *req)
+{
+        return req->__ctx;
+}
 static inline int crypto_ahash_setkey(struct crypto_ahash *tfm,
                                      const u8 *key, unsigned int keylen)
 {
@@ -101,6 +136,14 @@ static inline int crypto_ahash_digest(struct ahash_request *req)
        return crt->digest(req);
 }
+static inline void crypto_ahash_export(struct ahash_request *req, u8 *out)
+{
+        memcpy(out, ahash_request_ctx(req),
+               crypto_ahash_reqsize(crypto_ahash_reqtfm(req)));
+}
+int crypto_ahash_import(struct ahash_request *req, const u8 *in);
 static inline int crypto_ahash_init(struct ahash_request *req)
 {
        struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req));
@@ -169,4 +212,86 @@ static inline void ahash_request_set_crypt(struct ahash_request *req,
        req->result = result;
 }
+struct crypto_shash *crypto_alloc_shash(const char *alg_name, u32 type,
+                                        u32 mask);
+static inline struct crypto_tfm *crypto_shash_tfm(struct crypto_shash *tfm)
+{
+        return &tfm->base;
+}
+static inline void crypto_free_shash(struct crypto_shash *tfm)
+{
+        crypto_free_tfm(crypto_shash_tfm(tfm));
+}
+static inline unsigned int crypto_shash_alignmask(
+        struct crypto_shash *tfm)
+{
+        return crypto_tfm_alg_alignmask(crypto_shash_tfm(tfm));
+}
+static inline struct shash_alg *__crypto_shash_alg(struct crypto_alg *alg)
+{
+        return container_of(alg, struct shash_alg, base);
+}
+static inline struct shash_alg *crypto_shash_alg(struct crypto_shash *tfm)
+{
+        return __crypto_shash_alg(crypto_shash_tfm(tfm)->__crt_alg);
+}
+static inline unsigned int crypto_shash_digestsize(struct crypto_shash *tfm)
+{
+        return crypto_shash_alg(tfm)->digestsize;
+}
+static inline u32 crypto_shash_get_flags(struct crypto_shash *tfm)
+{
+        return crypto_tfm_get_flags(crypto_shash_tfm(tfm));
+}
+static inline void crypto_shash_set_flags(struct crypto_shash *tfm, u32 flags)
+{
+        crypto_tfm_set_flags(crypto_shash_tfm(tfm), flags);
+}
+static inline void crypto_shash_clear_flags(struct crypto_shash *tfm, u32 flags)
+{
+        crypto_tfm_clear_flags(crypto_shash_tfm(tfm), flags);
+}
+static inline unsigned int crypto_shash_descsize(struct crypto_shash *tfm)
+{
+        return crypto_shash_alg(tfm)->descsize;
+}
+static inline void *shash_desc_ctx(struct shash_desc *desc)
+{
+        return desc->__ctx;
+}
+int crypto_shash_setkey(struct crypto_shash *tfm, const u8 *key,
+                        unsigned int keylen);
+int crypto_shash_digest(struct shash_desc *desc, const u8 *data,
+                        unsigned int len, u8 *out);
+static inline void crypto_shash_export(struct shash_desc *desc, u8 *out)
+{
+        memcpy(out, shash_desc_ctx(desc), crypto_shash_descsize(desc->tfm));
+}
+int crypto_shash_import(struct shash_desc *desc, const u8 *in);
+static inline int crypto_shash_init(struct shash_desc *desc)
+{
+        return crypto_shash_alg(desc->tfm)->init(desc);
+}
+int crypto_shash_update(struct shash_desc *desc, const u8 *data,
+                        unsigned int len);
+int crypto_shash_final(struct shash_desc *desc, u8 *out);
+int crypto_shash_finup(struct shash_desc *desc, const u8 *data,
+                       unsigned int len, u8 *out);
 #endif  /* _CRYPTO_HASH_H */
diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h
index 917ae57bad4a..82b70564bcab 100644
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
@@ -39,6 +39,12 @@ extern const struct crypto_type crypto_ahash_type;
 int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err);
 int crypto_hash_walk_first(struct ahash_request *req,
                           struct crypto_hash_walk *walk);
+int crypto_hash_walk_first_compat(struct hash_desc *hdesc,
+                                  struct crypto_hash_walk *walk,
+                                  struct scatterlist *sg, unsigned int len);
+int crypto_register_shash(struct shash_alg *alg);
+int crypto_unregister_shash(struct shash_alg *alg);
 static inline void *crypto_ahash_ctx(struct crypto_ahash *tfm)
 {
@@ -63,16 +69,16 @@ static inline struct ahash_request *ahash_dequeue_request(
        return ahash_request_cast(crypto_dequeue_request(queue));
 }
-static inline void *ahash_request_ctx(struct ahash_request *req)
-{
-        return req->__ctx;
-}
 static inline int ahash_tfm_in_queue(struct crypto_queue *queue,
                                          struct crypto_ahash *tfm)
 {
        return crypto_tfm_in_queue(queue, crypto_ahash_tfm(tfm));
 }
+static inline void *crypto_shash_ctx(struct crypto_shash *tfm)
+{
+        return crypto_tfm_ctx(&tfm->base);
+}
 #endif  /* _CRYPTO_INTERNAL_HASH_H */
diff --git a/include/drm/Kbuild b/include/drm/Kbuild
index 82b6983b7fbb..b940fdfa3b25 100644
--- a/include/drm/Kbuild
+++ b/include/drm/Kbuild
@@ -1,4 +1,4 @@
-unifdef-y += drm.h drm_sarea.h
+unifdef-y += drm.h drm_sarea.h drm_mode.h
 unifdef-y += i810_drm.h
 unifdef-y += i830_drm.h
 unifdef-y += i915_drm.h
diff --git a/include/drm/drm.h b/include/drm/drm.h
index f46ba4b57da4..32e5096554e9 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -173,6 +173,7 @@ enum drm_map_type {
        _DRM_AGP = 3,             /**< AGP/GART */
        _DRM_SCATTER_GATHER = 4,  /**< Scatter/gather memory for PCI DMA */
        _DRM_CONSISTENT = 5,      /**< Consistent memory for PCI DMA */
+        _DRM_GEM = 6,             /**< GEM object */
 };
 /**
@@ -598,6 +599,8 @@ struct drm_gem_open {
        uint64_t size;
 };
+#include "drm_mode.h"
 #define DRM_IOCTL_BASE                  'd'
 #define DRM_IO(nr)                      _IO(DRM_IOCTL_BASE,nr)
 #define DRM_IOR(nr,type)                _IOR(DRM_IOCTL_BASE,nr,type)
@@ -634,6 +637,9 @@ struct drm_gem_open {
 #define DRM_IOCTL_SET_SAREA_CTX         DRM_IOW( 0x1c, struct drm_ctx_priv_map)
 #define DRM_IOCTL_GET_SAREA_CTX         DRM_IOWR(0x1d, struct drm_ctx_priv_map)
+#define DRM_IOCTL_SET_MASTER            DRM_IO(0x1e)
+#define DRM_IOCTL_DROP_MASTER           DRM_IO(0x1f)
 #define DRM_IOCTL_ADD_CTX               DRM_IOWR(0x20, struct drm_ctx)
 #define DRM_IOCTL_RM_CTX                DRM_IOWR(0x21, struct drm_ctx)
 #define DRM_IOCTL_MOD_CTX               DRM_IOW( 0x22, struct drm_ctx)
@@ -664,6 +670,24 @@ struct drm_gem_open {
 #define DRM_IOCTL_UPDATE_DRAW           DRM_IOW(0x3f, struct drm_update_draw)
+#define DRM_IOCTL_MODE_GETRESOURCES     DRM_IOWR(0xA0, struct drm_mode_card_res)
+#define DRM_IOCTL_MODE_GETCRTC          DRM_IOWR(0xA1, struct drm_mode_crtc)
+#define DRM_IOCTL_MODE_SETCRTC          DRM_IOWR(0xA2, struct drm_mode_crtc)
+#define DRM_IOCTL_MODE_CURSOR           DRM_IOWR(0xA3, struct drm_mode_cursor)
+#define DRM_IOCTL_MODE_GETGAMMA         DRM_IOWR(0xA4, struct drm_mode_crtc_lut)
+#define DRM_IOCTL_MODE_SETGAMMA         DRM_IOWR(0xA5, struct drm_mode_crtc_lut)
+#define DRM_IOCTL_MODE_GETENCODER       DRM_IOWR(0xA6, struct drm_mode_get_encoder)
+#define DRM_IOCTL_MODE_GETCONNECTOR     DRM_IOWR(0xA7, struct drm_mode_get_connector)
+#define DRM_IOCTL_MODE_ATTACHMODE       DRM_IOWR(0xA8, struct drm_mode_mode_cmd)
+#define DRM_IOCTL_MODE_DETACHMODE       DRM_IOWR(0xA9, struct drm_mode_mode_cmd)
+#define DRM_IOCTL_MODE_GETPROPERTY      DRM_IOWR(0xAA, struct drm_mode_get_property)
+#define DRM_IOCTL_MODE_SETPROPERTY      DRM_IOWR(0xAB, struct drm_mode_connector_set_property)
+#define DRM_IOCTL_MODE_GETPROPBLOB      DRM_IOWR(0xAC, struct drm_mode_get_blob)
+#define DRM_IOCTL_MODE_GETFB            DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
+#define DRM_IOCTL_MODE_ADDFB            DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
+#define DRM_IOCTL_MODE_RMFB             DRM_IOWR(0xAF, unsigned int)
 /**
 * Device specific ioctls should only be in their respective headers
 * The device specific ioctl range is from 0x40 to 0x99.
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index d5e8e5c89548..afb7858c068d 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -105,6 +105,7 @@ struct drm_device;
 #define DRIVER_FB_DMA      0x400
 #define DRIVER_IRQ_VBL2    0x800
 #define DRIVER_GEM         0x1000
+#define DRIVER_MODESET     0x2000
 /***********************************************************************/
 /** \name Begin the DRM... */
@@ -238,11 +239,11 @@ struct drm_device;
 */
 #define LOCK_TEST_WITH_RETURN( dev, file_priv )                         \
 do {                                                                    \
-        if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||           \
+        if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock) ||                \
-             dev->lock.file_priv != file_priv ) {                       \
+            file_priv->master->lock.file_priv != file_priv)     {                       \
                DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\
-                           __func__, _DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ),\
+                           __func__, _DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock),\
-                           dev->lock.file_priv, file_priv );            \
+                           file_priv->master->lock.file_priv, file_priv);               \
                return -EINVAL;                                         \
        }                                                               \
 } while (0)
@@ -276,6 +277,7 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
 #define DRM_AUTH        0x1
 #define DRM_MASTER      0x2
 #define DRM_ROOT_ONLY   0x4
+#define DRM_CONTROL_ALLOW 0x8
 struct drm_ioctl_desc {
        unsigned int cmd;
@@ -379,21 +381,26 @@ struct drm_buf_entry {
 /** File private data */
 struct drm_file {
        int authenticated;
-        int master;
        pid_t pid;
        uid_t uid;
        drm_magic_t magic;
        unsigned long ioctl_count;
        struct list_head lhead;
        struct drm_minor *minor;
-        int remove_auth_on_close;
        unsigned long lock_count;
        /** Mapping of mm object handles to object pointers. */
        struct idr object_idr;
        /** Lock for synchronization of access to object_idr. */
        spinlock_t table_lock;
        struct file *filp;
        void *driver_priv;
+        int is_master; /* this file private is a master for a minor */
+        struct drm_master *master; /* master this node is currently associated with
+                                      N.B. not always minor->master */
+        struct list_head fbs;
 };
 /** Wait queue */
@@ -523,6 +530,8 @@ struct drm_map_list {
        struct drm_hash_item hash;
        struct drm_map *map;                    /**< mapping */
        uint64_t user_token;
+        struct drm_master *master;
+        struct drm_mm_node *file_offset_node;   /**< fake offset */
 };
 typedef struct drm_map drm_local_map_t;
@@ -563,6 +572,14 @@ struct drm_ati_pcigart_info {
 };
 /**
+ * GEM specific mm private for tracking GEM objects
+ */
+struct drm_gem_mm {
+        struct drm_mm offset_manager;   /**< Offset mgmt for buffer objects */
+        struct drm_open_hash offset_hash; /**< User token hash table for maps */
+};
+/**
 * This structure defines the drm_mm memory object, which will be used by the
 * DRM for its buffer objects.
 */
@@ -579,6 +596,9 @@ struct drm_gem_object {
        /** File representing the shmem storage */
        struct file *filp;
+        /* Mapping info for this object */
+        struct drm_map_list map_list;
        /**
         * Size of the object, in bytes.  Immutable over the object's
         * lifetime.
@@ -612,6 +632,33 @@ struct drm_gem_object {
        void *driver_private;
 };
+#include "drm_crtc.h"
+/* per-master structure */
+struct drm_master {
+        struct kref refcount; /* refcount for this master */
+        struct list_head head; /**< each minor contains a list of masters */
+        struct drm_minor *minor; /**< link back to minor we are a master for */
+        char *unique;                   /**< Unique identifier: e.g., busid */
+        int unique_len;                 /**< Length of unique field */
+        int unique_size;                /**< amount allocated */
+        int blocked;                    /**< Blocked due to VC switch? */
+        /** \name Authentication */
+        /*@{ */
+        struct drm_open_hash magiclist;
+        struct list_head magicfree;
+        /*@} */
+        struct drm_lock_data lock;      /**< Information on hardware lock */
+        void *driver_priv; /**< Private structure for driver to use */
+};
 /**
 * DRM driver structure. This structure represent the common code for
 * a family of cards. There will one drm_device for each card present
@@ -712,6 +759,10 @@ struct drm_driver {
        void (*set_version) (struct drm_device *dev,
                             struct drm_set_version *sv);
+        /* Master routines */
+        int (*master_create)(struct drm_device *dev, struct drm_master *master);
+        void (*master_destroy)(struct drm_device *dev, struct drm_master *master);
        int (*proc_init)(struct drm_minor *minor);
        void (*proc_cleanup)(struct drm_minor *minor);
@@ -724,6 +775,9 @@ struct drm_driver {
        int (*gem_init_object) (struct drm_gem_object *obj);
        void (*gem_free_object) (struct drm_gem_object *obj);
+        /* Driver private ops for this object */
+        struct vm_operations_struct *gem_vm_ops;
        int major;
        int minor;
        int patchlevel;
@@ -737,10 +791,14 @@ struct drm_driver {
        int num_ioctls;
        struct file_operations fops;
        struct pci_driver pci_driver;
+        /* List of devices hanging off this driver */
+        struct list_head device_list;
 };
 #define DRM_MINOR_UNASSIGNED 0
 #define DRM_MINOR_LEGACY 1
+#define DRM_MINOR_CONTROL 2
+#define DRM_MINOR_RENDER 3
 /**
 * DRM minor structure. This structure represents a drm minor number.
@@ -752,6 +810,9 @@ struct drm_minor {
        struct device kdev;             /**< Linux device */
        struct drm_device *dev;
        struct proc_dir_entry *dev_root;  /**< proc directory entry */
+        struct drm_master *master; /* currently active master for this node */
+        struct list_head master_list;
+        struct drm_mode_group mode_group;
 };
 /**
@@ -759,13 +820,10 @@ struct drm_minor {
 * may contain multiple heads.
 */
 struct drm_device {
-        char *unique;                   /**< Unique identifier: e.g., busid */
+        struct list_head driver_item;   /**< list of devices per driver */
-        int unique_len;                 /**< Length of unique field */
        char *devname;                  /**< For /proc/interrupts */
        int if_version;                 /**< Highest interface version set */
-        int blocked;                    /**< Blocked due to VC switch? */
        /** \name Locks */
        /*@{ */
        spinlock_t count_lock;          /**< For inuse, drm_device::open_count, drm_device::buf_use */
@@ -788,12 +846,7 @@ struct drm_device {
        atomic_t counts[15];
        /*@} */
-        /** \name Authentication */
-        /*@{ */
        struct list_head filelist;
-        struct drm_open_hash magiclist; /**< magic hash table */
-        struct list_head magicfree;
-        /*@} */
        /** \name Memory management */
        /*@{ */
@@ -810,7 +863,7 @@ struct drm_device {
        struct idr ctx_idr;
        struct list_head vmalist;       /**< List of vmas (for debugging) */
-        struct drm_lock_data lock;      /**< Information on hardware lock */
        /*@} */
        /** \name DMA queues (contexts) */
@@ -858,6 +911,7 @@ struct drm_device {
        int *vblank_enabled;            /* so we don't call enable more than
                                           once per disable */
        int *vblank_inmodeset;          /* Display driver is setting mode */
+        u32 *last_vblank_wait;          /* Last vblank seqno waited per CRTC */
        struct timer_list vblank_disable_timer;
        u32 max_vblank_count;           /**< size of vblank counter register */
@@ -881,12 +935,15 @@ struct drm_device {
        struct drm_sg_mem *sg;  /**< Scatter gather memory */
        int num_crtcs;                  /**< Number of CRTCs on this device */
        void *dev_private;              /**< device private data */
+        void *mm_private;
+        struct address_space *dev_mapping;
        struct drm_sigdata sigdata;        /**< For block_all_signals */
        sigset_t sigmask;
        struct drm_driver *driver;
        drm_local_map_t *agp_buffer_map;
        unsigned int agp_buffer_token;
+        struct drm_minor *control;              /**< Control node for card */
        struct drm_minor *primary;              /**< render type primary screen head */
        /** \name Drawable information */
@@ -895,6 +952,8 @@ struct drm_device {
        struct idr drw_idr;
        /*@} */
+        struct drm_mode_config mode_config;     /**< Current mode config */
        /** \name GEM information */
        /*@{ */
        spinlock_t object_name_lock;
@@ -997,6 +1056,8 @@ extern int drm_release(struct inode *inode, struct file *filp);
                                /* Mapping support (drm_vm.h) */
 extern int drm_mmap(struct file *filp, struct vm_area_struct *vma);
+extern int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma);
+extern void drm_vm_open_locked(struct vm_area_struct *vma);
 extern unsigned long drm_core_get_map_ofs(struct drm_map * map);
 extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
 extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);
@@ -1153,6 +1214,8 @@ extern int drm_vblank_get(struct drm_device *dev, int crtc);
 extern void drm_vblank_put(struct drm_device *dev, int crtc);
 extern void drm_vblank_cleanup(struct drm_device *dev);
 /* Modesetting support */
+extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc);
+extern void drm_vblank_post_modeset(struct drm_device *dev, int crtc);
 extern int drm_modeset_ctl(struct drm_device *dev, void *data,
                           struct drm_file *file_priv);
@@ -1189,6 +1252,13 @@ extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle);
 extern void drm_agp_chipset_flush(struct drm_device *dev);
                                /* Stub support (drm_stub.h) */
+extern int drm_setmaster_ioctl(struct drm_device *dev, void *data,
+                               struct drm_file *file_priv);
+extern int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
+                                struct drm_file *file_priv);
+struct drm_master *drm_master_create(struct drm_minor *minor);
+extern struct drm_master *drm_master_get(struct drm_master *master);
+extern void drm_master_put(struct drm_master **master);
 extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
                       struct drm_driver *driver);
 extern int drm_put_dev(struct drm_device *dev);
@@ -1231,7 +1301,11 @@ struct drm_sysfs_class;
 extern struct class *drm_sysfs_create(struct module *owner, char *name);
 extern void drm_sysfs_destroy(void);
 extern int drm_sysfs_device_add(struct drm_minor *minor);
+extern void drm_sysfs_hotplug_event(struct drm_device *dev);
 extern void drm_sysfs_device_remove(struct drm_minor *minor);
+extern char *drm_get_connector_status_name(enum drm_connector_status status);
+extern int drm_sysfs_connector_add(struct drm_connector *connector);
+extern void drm_sysfs_connector_remove(struct drm_connector *connector);
 /*
 * Basic memory manager support (drm_mm.c)
@@ -1251,10 +1325,12 @@ extern int drm_mm_add_space_to_tail(struct drm_mm *mm, unsigned long size);
 /* Graphics Execution Manager library functions (drm_gem.c) */
 int drm_gem_init(struct drm_device *dev);
+void drm_gem_destroy(struct drm_device *dev);
 void drm_gem_object_free(struct kref *kref);
 struct drm_gem_object *drm_gem_object_alloc(struct drm_device *dev,
                                            size_t size);
 void drm_gem_object_handle_free(struct kref *kref);
+int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
 static inline void
 drm_gem_object_reference(struct drm_gem_object *obj)
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
new file mode 100644
index 000000000000..0acb07f31fa4
--- /dev/null
+++ b/include/drm/drm_crtc.h
@@ -0,0 +1,733 @@
+/*
+ * Copyright © 2006 Keith Packard
+ * Copyright © 2007-2008 Dave Airlie
+ * Copyright © 2007-2008 Intel Corporation
+ *   Jesse Barnes <jesse.barnes@intel.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef __DRM_CRTC_H__
+#define __DRM_CRTC_H__
+#include <linux/i2c.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+#include <linux/idr.h>
+#include <linux/fb.h>
+struct drm_device;
+struct drm_mode_set;
+struct drm_framebuffer;
+#define DRM_MODE_OBJECT_CRTC 0xcccccccc
+#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0
+#define DRM_MODE_OBJECT_ENCODER 0xe0e0e0e0
+#define DRM_MODE_OBJECT_MODE 0xdededede
+#define DRM_MODE_OBJECT_PROPERTY 0xb0b0b0b0
+#define DRM_MODE_OBJECT_FB 0xfbfbfbfb
+#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb
+struct drm_mode_object {
+        uint32_t id;
+        uint32_t type;
+};
+/*
+ * Note on terminology:  here, for brevity and convenience, we refer to connector
+ * control chips as 'CRTCs'.  They can control any type of connector, VGA, LVDS,
+ * DVI, etc.  And 'screen' refers to the whole of the visible display, which
+ * may span multiple monitors (and therefore multiple CRTC and connector
+ * structures).
+ */
+enum drm_mode_status {
+    MODE_OK     = 0,    /* Mode OK */
+    MODE_HSYNC,         /* hsync out of range */
+    MODE_VSYNC,         /* vsync out of range */
+    MODE_H_ILLEGAL,     /* mode has illegal horizontal timings */
+    MODE_V_ILLEGAL,     /* mode has illegal horizontal timings */
+    MODE_BAD_WIDTH,     /* requires an unsupported linepitch */
+    MODE_NOMODE,        /* no mode with a maching name */
+    MODE_NO_INTERLACE,  /* interlaced mode not supported */
+    MODE_NO_DBLESCAN,   /* doublescan mode not supported */
+    MODE_NO_VSCAN,      /* multiscan mode not supported */
+    MODE_MEM,           /* insufficient video memory */
+    MODE_VIRTUAL_X,     /* mode width too large for specified virtual size */
+    MODE_VIRTUAL_Y,     /* mode height too large for specified virtual size */
+    MODE_MEM_VIRT,      /* insufficient video memory given virtual size */
+    MODE_NOCLOCK,       /* no fixed clock available */
+    MODE_CLOCK_HIGH,    /* clock required is too high */
+    MODE_CLOCK_LOW,     /* clock required is too low */
+    MODE_CLOCK_RANGE,   /* clock/mode isn't in a ClockRange */
+    MODE_BAD_HVALUE,    /* horizontal timing was out of range */
+    MODE_BAD_VVALUE,    /* vertical timing was out of range */
+    MODE_BAD_VSCAN,     /* VScan value out of range */
+    MODE_HSYNC_NARROW,  /* horizontal sync too narrow */
+    MODE_HSYNC_WIDE,    /* horizontal sync too wide */
+    MODE_HBLANK_NARROW, /* horizontal blanking too narrow */
+    MODE_HBLANK_WIDE,   /* horizontal blanking too wide */
+    MODE_VSYNC_NARROW,  /* vertical sync too narrow */
+    MODE_VSYNC_WIDE,    /* vertical sync too wide */
+    MODE_VBLANK_NARROW, /* vertical blanking too narrow */
+    MODE_VBLANK_WIDE,   /* vertical blanking too wide */
+    MODE_PANEL,         /* exceeds panel dimensions */
+    MODE_INTERLACE_WIDTH, /* width too large for interlaced mode */
+    MODE_ONE_WIDTH,     /* only one width is supported */
+    MODE_ONE_HEIGHT,    /* only one height is supported */
+    MODE_ONE_SIZE,      /* only one resolution is supported */
+    MODE_NO_REDUCED,    /* monitor doesn't accept reduced blanking */
+    MODE_UNVERIFIED = -3, /* mode needs to reverified */
+    MODE_BAD = -2,      /* unspecified reason */
+    MODE_ERROR  = -1    /* error condition */
+};
+#define DRM_MODE_TYPE_CLOCK_CRTC_C (DRM_MODE_TYPE_CLOCK_C | \
+                                    DRM_MODE_TYPE_CRTC_C)
+#define DRM_MODE(nm, t, c, hd, hss, hse, ht, hsk, vd, vss, vse, vt, vs, f) \
+        .name = nm, .status = 0, .type = (t), .clock = (c), \
+        .hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \
+        .htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \
+        .vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \
+        .vscan = (vs), .flags = (f), .vrefresh = 0
+#define CRTC_INTERLACE_HALVE_V 0x1 /* halve V values for interlacing */
+struct drm_display_mode {
+        /* Header */
+        struct list_head head;
+        struct drm_mode_object base;
+        char name[DRM_DISPLAY_MODE_LEN];
+        int connector_count;
+        enum drm_mode_status status;
+        int type;
+        /* Proposed mode values */
+        int clock;
+        int hdisplay;
+        int hsync_start;
+        int hsync_end;
+        int htotal;
+        int hskew;
+        int vdisplay;
+        int vsync_start;
+        int vsync_end;
+        int vtotal;
+        int vscan;
+        unsigned int flags;
+        /* Addressable image size (may be 0 for projectors, etc.) */
+        int width_mm;
+        int height_mm;
+        /* Actual mode we give to hw */
+        int clock_index;
+        int synth_clock;
+        int crtc_hdisplay;
+        int crtc_hblank_start;
+        int crtc_hblank_end;
+        int crtc_hsync_start;
+        int crtc_hsync_end;
+        int crtc_htotal;
+        int crtc_hskew;
+        int crtc_vdisplay;
+        int crtc_vblank_start;
+        int crtc_vblank_end;
+        int crtc_vsync_start;
+        int crtc_vsync_end;
+        int crtc_vtotal;
+        int crtc_hadjusted;
+        int crtc_vadjusted;
+        /* Driver private mode info */
+        int private_size;
+        int *private;
+        int private_flags;
+        int vrefresh;
+        float hsync;
+};
+enum drm_connector_status {
+        connector_status_connected = 1,
+        connector_status_disconnected = 2,
+        connector_status_unknown = 3,
+};
+enum subpixel_order {
+        SubPixelUnknown = 0,
+        SubPixelHorizontalRGB,
+        SubPixelHorizontalBGR,
+        SubPixelVerticalRGB,
+        SubPixelVerticalBGR,
+        SubPixelNone,
+};
+/*
+ * Describes a given display (e.g. CRT or flat panel) and its limitations.
+ */
+struct drm_display_info {
+        char name[DRM_DISPLAY_INFO_LEN];
+        /* Input info */
+        bool serration_vsync;
+        bool sync_on_green;
+        bool composite_sync;
+        bool separate_syncs;
+        bool blank_to_black;
+        unsigned char video_level;
+        bool digital;
+        /* Physical size */
+        unsigned int width_mm;
+        unsigned int height_mm;
+        /* Display parameters */
+        unsigned char gamma; /* FIXME: storage format */
+        bool gtf_supported;
+        bool standard_color;
+        enum {
+                monochrome = 0,
+                rgb,
+                other,
+                unknown,
+        } display_type;
+        bool active_off_supported;
+        bool suspend_supported;
+        bool standby_supported;
+        /* Color info FIXME: storage format */
+        unsigned short redx, redy;
+        unsigned short greenx, greeny;
+        unsigned short bluex, bluey;
+        unsigned short whitex, whitey;
+        /* Clock limits FIXME: storage format */
+        unsigned int min_vfreq, max_vfreq;
+        unsigned int min_hfreq, max_hfreq;
+        unsigned int pixel_clock;
+        /* White point indices FIXME: storage format */
+        unsigned int wpx1, wpy1;
+        unsigned int wpgamma1;
+        unsigned int wpx2, wpy2;
+        unsigned int wpgamma2;
+        enum subpixel_order subpixel_order;
+        char *raw_edid; /* if any */
+};
+struct drm_framebuffer_funcs {
+        void (*destroy)(struct drm_framebuffer *framebuffer);
+        int (*create_handle)(struct drm_framebuffer *fb,
+                             struct drm_file *file_priv,
+                             unsigned int *handle);
+};
+struct drm_framebuffer {
+        struct drm_device *dev;
+        struct list_head head;
+        struct drm_mode_object base;
+        const struct drm_framebuffer_funcs *funcs;
+        unsigned int pitch;
+        unsigned int width;
+        unsigned int height;
+        /* depth can be 15 or 16 */
+        unsigned int depth;
+        int bits_per_pixel;
+        int flags;
+        void *fbdev;
+        u32 pseudo_palette[17];
+        struct list_head filp_head;
+};
+struct drm_property_blob {
+        struct drm_mode_object base;
+        struct list_head head;
+        unsigned int length;
+        void *data;
+};
+struct drm_property_enum {
+        uint64_t value;
+        struct list_head head;
+        char name[DRM_PROP_NAME_LEN];
+};
+struct drm_property {
+        struct list_head head;
+        struct drm_mode_object base;
+        uint32_t flags;
+        char name[DRM_PROP_NAME_LEN];
+        uint32_t num_values;
+        uint64_t *values;
+        struct list_head enum_blob_list;
+};
+struct drm_crtc;
+struct drm_connector;
+struct drm_encoder;
+/**
+ * drm_crtc_funcs - control CRTCs for a given device
+ * @dpms: control display power levels
+ * @save: save CRTC state
+ * @resore: restore CRTC state
+ * @lock: lock the CRTC
+ * @unlock: unlock the CRTC
+ * @shadow_allocate: allocate shadow pixmap
+ * @shadow_create: create shadow pixmap for rotation support
+ * @shadow_destroy: free shadow pixmap
+ * @mode_fixup: fixup proposed mode
+ * @mode_set: set the desired mode on the CRTC
+ * @gamma_set: specify color ramp for CRTC
+ * @destroy: deinit and free object.
+ *
+ * The drm_crtc_funcs structure is the central CRTC management structure
+ * in the DRM.  Each CRTC controls one or more connectors (note that the name
+ * CRTC is simply historical, a CRTC may control LVDS, VGA, DVI, TV out, etc.
+ * connectors, not just CRTs).
+ *
+ * Each driver is responsible for filling out this structure at startup time,
+ * in addition to providing other modesetting features, like i2c and DDC
+ * bus accessors.
+ */
+struct drm_crtc_funcs {
+        /* Save CRTC state */
+        void (*save)(struct drm_crtc *crtc); /* suspend? */
+        /* Restore CRTC state */
+        void (*restore)(struct drm_crtc *crtc); /* resume? */
+        /* cursor controls */
+        int (*cursor_set)(struct drm_crtc *crtc, struct drm_file *file_priv,
+                          uint32_t handle, uint32_t width, uint32_t height);
+        int (*cursor_move)(struct drm_crtc *crtc, int x, int y);
+        /* Set gamma on the CRTC */
+        void (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
+                          uint32_t size);
+        /* Object destroy routine */
+        void (*destroy)(struct drm_crtc *crtc);
+        int (*set_config)(struct drm_mode_set *set);
+};
+/**
+ * drm_crtc - central CRTC control structure
+ * @enabled: is this CRTC enabled?
+ * @x: x position on screen
+ * @y: y position on screen
+ * @desired_mode: new desired mode
+ * @desired_x: desired x for desired_mode
+ * @desired_y: desired y for desired_mode
+ * @funcs: CRTC control functions
+ *
+ * Each CRTC may have one or more connectors associated with it.  This structure
+ * allows the CRTC to be controlled.
+ */
+struct drm_crtc {
+        struct drm_device *dev;
+        struct list_head head;
+        struct drm_mode_object base;
+        /* framebuffer the connector is currently bound to */
+        struct drm_framebuffer *fb;
+        bool enabled;
+        struct drm_display_mode mode;
+        int x, y;
+        struct drm_display_mode *desired_mode;
+        int desired_x, desired_y;
+        const struct drm_crtc_funcs *funcs;
+        /* CRTC gamma size for reporting to userspace */
+        uint32_t gamma_size;
+        uint16_t *gamma_store;
+        /* if you are using the helper */
+        void *helper_private;
+};
+/**
+ * drm_connector_funcs - control connectors on a given device
+ * @dpms: set power state (see drm_crtc_funcs above)
+ * @save: save connector state
+ * @restore: restore connector state
+ * @mode_valid: is this mode valid on the given connector?
+ * @mode_fixup: try to fixup proposed mode for this connector
+ * @mode_set: set this mode
+ * @detect: is this connector active?
+ * @get_modes: get mode list for this connector
+ * @set_property: property for this connector may need update
+ * @destroy: make object go away
+ *
+ * Each CRTC may have one or more connectors attached to it.  The functions
+ * below allow the core DRM code to control connectors, enumerate available modes,
+ * etc.
+ */
+struct drm_connector_funcs {
+        void (*dpms)(struct drm_connector *connector, int mode);
+        void (*save)(struct drm_connector *connector);
+        void (*restore)(struct drm_connector *connector);
+        enum drm_connector_status (*detect)(struct drm_connector *connector);
+        void (*fill_modes)(struct drm_connector *connector, uint32_t max_width, uint32_t max_height);
+        int (*set_property)(struct drm_connector *connector, struct drm_property *property,
+                             uint64_t val);
+        void (*destroy)(struct drm_connector *connector);
+};
+struct drm_encoder_funcs {
+        void (*destroy)(struct drm_encoder *encoder);
+};
+#define DRM_CONNECTOR_MAX_UMODES 16
+#define DRM_CONNECTOR_MAX_PROPERTY 16
+#define DRM_CONNECTOR_LEN 32
+#define DRM_CONNECTOR_MAX_ENCODER 2
+/**
+ * drm_encoder - central DRM encoder structure
+ */
+struct drm_encoder {
+        struct drm_device *dev;
+        struct list_head head;
+        struct drm_mode_object base;
+        int encoder_type;
+        uint32_t possible_crtcs;
+        uint32_t possible_clones;
+        struct drm_crtc *crtc;
+        const struct drm_encoder_funcs *funcs;
+        void *helper_private;
+};
+/**
+ * drm_connector - central DRM connector control structure
+ * @crtc: CRTC this connector is currently connected to, NULL if none
+ * @interlace_allowed: can this connector handle interlaced modes?
+ * @doublescan_allowed: can this connector handle doublescan?
+ * @available_modes: modes available on this connector (from get_modes() + user)
+ * @initial_x: initial x position for this connector
+ * @initial_y: initial y position for this connector
+ * @status: connector connected?
+ * @funcs: connector control functions
+ *
+ * Each connector may be connected to one or more CRTCs, or may be clonable by
+ * another connector if they can share a CRTC.  Each connector also has a specific
+ * position in the broader display (referred to as a 'screen' though it could
+ * span multiple monitors).
+ */
+struct drm_connector {
+        struct drm_device *dev;
+        struct device kdev;
+        struct device_attribute *attr;
+        struct list_head head;
+        struct drm_mode_object base;
+        int connector_type;
+        int connector_type_id;
+        bool interlace_allowed;
+        bool doublescan_allowed;
+        struct list_head modes; /* list of modes on this connector */
+        int initial_x, initial_y;
+        enum drm_connector_status status;
+        /* these are modes added by probing with DDC or the BIOS */
+        struct list_head probed_modes;
+        struct drm_display_info display_info;
+        const struct drm_connector_funcs *funcs;
+        struct list_head user_modes;
+        struct drm_property_blob *edid_blob_ptr;
+        u32 property_ids[DRM_CONNECTOR_MAX_PROPERTY];
+        uint64_t property_values[DRM_CONNECTOR_MAX_PROPERTY];
+        void *helper_private;
+        uint32_t encoder_ids[DRM_CONNECTOR_MAX_ENCODER];
+        uint32_t force_encoder_id;
+        struct drm_encoder *encoder; /* currently active encoder */
+};
+/**
+ * struct drm_mode_set
+ *
+ * Represents a single crtc the connectors that it drives with what mode
+ * and from which framebuffer it scans out from.
+ *
+ * This is used to set modes.
+ */
+struct drm_mode_set {
+        struct list_head head;
+        struct drm_framebuffer *fb;
+        struct drm_crtc *crtc;
+        struct drm_display_mode *mode;
+        uint32_t x;
+        uint32_t y;
+        struct drm_connector **connectors;
+        size_t num_connectors;
+};
+/**
+ * struct drm_mode_config_funcs - configure CRTCs for a given screen layout
+ * @resize: adjust CRTCs as necessary for the proposed layout
+ *
+ * Currently only a resize hook is available.  DRM will call back into the
+ * driver with a new screen width and height.  If the driver can't support
+ * the proposed size, it can return false.  Otherwise it should adjust
+ * the CRTC<->connector mappings as needed and update its view of the screen.
+ */
+struct drm_mode_config_funcs {
+        struct drm_framebuffer *(*fb_create)(struct drm_device *dev, struct drm_file *file_priv, struct drm_mode_fb_cmd *mode_cmd);
+        int (*fb_changed)(struct drm_device *dev);
+};
+struct drm_mode_group {
+        uint32_t num_crtcs;
+        uint32_t num_encoders;
+        uint32_t num_connectors;
+        /* list of object IDs for this group */
+        uint32_t *id_list;
+};
+/**
+ * drm_mode_config - Mode configuration control structure
+ *
+ */
+struct drm_mode_config {
+        struct mutex mutex; /* protects configuration and IDR */
+        struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, connector, modes - just makes life easier */
+        /* this is limited to one for now */
+        int num_fb;
+        struct list_head fb_list;
+        int num_connector;
+        struct list_head connector_list;
+        int num_encoder;
+        struct list_head encoder_list;
+        int num_crtc;
+        struct list_head crtc_list;
+        struct list_head property_list;
+        /* in-kernel framebuffers - hung of filp_head in drm_framebuffer */
+        struct list_head fb_kernel_list;
+        int min_width, min_height;
+        int max_width, max_height;
+        struct drm_mode_config_funcs *funcs;
+        unsigned long fb_base;
+        /* pointers to standard properties */
+        struct list_head property_blob_list;
+        struct drm_property *edid_property;
+        struct drm_property *dpms_property;
+        /* DVI-I properties */
+        struct drm_property *dvi_i_subconnector_property;
+        struct drm_property *dvi_i_select_subconnector_property;
+        /* TV properties */
+        struct drm_property *tv_subconnector_property;
+        struct drm_property *tv_select_subconnector_property;
+        struct drm_property *tv_mode_property;
+        struct drm_property *tv_left_margin_property;
+        struct drm_property *tv_right_margin_property;
+        struct drm_property *tv_top_margin_property;
+        struct drm_property *tv_bottom_margin_property;
+        /* Optional properties */
+        struct drm_property *scaling_mode_property;
+        struct drm_property *dithering_mode_property;
+};
+#define obj_to_crtc(x) container_of(x, struct drm_crtc, base)
+#define obj_to_connector(x) container_of(x, struct drm_connector, base)
+#define obj_to_encoder(x) container_of(x, struct drm_encoder, base)
+#define obj_to_mode(x) container_of(x, struct drm_display_mode, base)
+#define obj_to_fb(x) container_of(x, struct drm_framebuffer, base)
+#define obj_to_property(x) container_of(x, struct drm_property, base)
+#define obj_to_blob(x) container_of(x, struct drm_property_blob, base)
+extern void drm_crtc_init(struct drm_device *dev,
+                          struct drm_crtc *crtc,
+                          const struct drm_crtc_funcs *funcs);
+extern void drm_crtc_cleanup(struct drm_crtc *crtc);
+extern void drm_connector_init(struct drm_device *dev,
+                            struct drm_connector *connector,
+                            const struct drm_connector_funcs *funcs,
+                            int connector_type);
+extern void drm_connector_cleanup(struct drm_connector *connector);
+extern void drm_encoder_init(struct drm_device *dev,
+                             struct drm_encoder *encoder,
+                             const struct drm_encoder_funcs *funcs,
+                             int encoder_type);
+extern void drm_encoder_cleanup(struct drm_encoder *encoder);
+extern char *drm_get_connector_name(struct drm_connector *connector);
+extern char *drm_get_dpms_name(int val);
+extern char *drm_get_dvi_i_subconnector_name(int val);
+extern char *drm_get_dvi_i_select_name(int val);
+extern char *drm_get_tv_subconnector_name(int val);
+extern char *drm_get_tv_select_name(int val);
+extern void drm_fb_release(struct file *filp);
+extern int drm_mode_group_init_legacy_group(struct drm_device *dev, struct drm_mode_group *group);
+extern struct edid *drm_get_edid(struct drm_connector *connector,
+                                 struct i2c_adapter *adapter);
+extern unsigned char *drm_do_probe_ddc_edid(struct i2c_adapter *adapter);
+extern int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
+extern void drm_mode_probed_add(struct drm_connector *connector, struct drm_display_mode *mode);
+extern void drm_mode_remove(struct drm_connector *connector, struct drm_display_mode *mode);
+extern struct drm_display_mode *drm_mode_duplicate(struct drm_device *dev,
+                                                   struct drm_display_mode *mode);
+extern void drm_mode_debug_printmodeline(struct drm_display_mode *mode);
+extern void drm_mode_config_init(struct drm_device *dev);
+extern void drm_mode_config_cleanup(struct drm_device *dev);
+extern void drm_mode_set_name(struct drm_display_mode *mode);
+extern bool drm_mode_equal(struct drm_display_mode *mode1, struct drm_display_mode *mode2);
+extern int drm_mode_width(struct drm_display_mode *mode);
+extern int drm_mode_height(struct drm_display_mode *mode);
+/* for us by fb module */
+extern int drm_mode_attachmode_crtc(struct drm_device *dev,
+                                    struct drm_crtc *crtc,
+                                    struct drm_display_mode *mode);
+extern int drm_mode_detachmode_crtc(struct drm_device *dev, struct drm_display_mode *mode);
+extern struct drm_display_mode *drm_mode_create(struct drm_device *dev);
+extern void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode);
+extern void drm_mode_list_concat(struct list_head *head,
+                                 struct list_head *new);
+extern void drm_mode_validate_size(struct drm_device *dev,
+                                   struct list_head *mode_list,
+                                   int maxX, int maxY, int maxPitch);
+extern void drm_mode_prune_invalid(struct drm_device *dev,
+                                   struct list_head *mode_list, bool verbose);
+extern void drm_mode_sort(struct list_head *mode_list);
+extern int drm_mode_vrefresh(struct drm_display_mode *mode);
+extern void drm_mode_set_crtcinfo(struct drm_display_mode *p,
+                                  int adjust_flags);
+extern void drm_mode_connector_list_update(struct drm_connector *connector);
+extern int drm_mode_connector_update_edid_property(struct drm_connector *connector,
+                                                struct edid *edid);
+extern int drm_connector_property_set_value(struct drm_connector *connector,
+                                         struct drm_property *property,
+                                         uint64_t value);
+extern int drm_connector_property_get_value(struct drm_connector *connector,
+                                         struct drm_property *property,
+                                         uint64_t *value);
+extern struct drm_display_mode *drm_crtc_mode_create(struct drm_device *dev);
+extern void drm_framebuffer_set_object(struct drm_device *dev,
+                                       unsigned long handle);
+extern int drm_framebuffer_init(struct drm_device *dev,
+                                struct drm_framebuffer *fb,
+                                const struct drm_framebuffer_funcs *funcs);
+extern void drm_framebuffer_cleanup(struct drm_framebuffer *fb);
+extern int drmfb_probe(struct drm_device *dev, struct drm_crtc *crtc);
+extern int drmfb_remove(struct drm_device *dev, struct drm_framebuffer *fb);
+extern void drm_crtc_probe_connector_modes(struct drm_device *dev, int maxX, int maxY);
+extern bool drm_crtc_in_use(struct drm_crtc *crtc);
+extern int drm_connector_attach_property(struct drm_connector *connector,
+                                      struct drm_property *property, uint64_t init_val);
+extern struct drm_property *drm_property_create(struct drm_device *dev, int flags,
+                                                const char *name, int num_values);
+extern void drm_property_destroy(struct drm_device *dev, struct drm_property *property);
+extern int drm_property_add_enum(struct drm_property *property, int index,
+                                 uint64_t value, const char *name);
+extern int drm_mode_create_dvi_i_properties(struct drm_device *dev);
+extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats,
+                                     char *formats[]);
+extern int drm_mode_create_scaling_mode_property(struct drm_device *dev);
+extern int drm_mode_create_dithering_property(struct drm_device *dev);
+extern char *drm_get_encoder_name(struct drm_encoder *encoder);
+extern int drm_mode_connector_attach_encoder(struct drm_connector *connector,
+                                             struct drm_encoder *encoder);
+extern void drm_mode_connector_detach_encoder(struct drm_connector *connector,
+                                           struct drm_encoder *encoder);
+extern bool drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
+                                         int gamma_size);
+extern void *drm_mode_object_find(struct drm_device *dev, uint32_t id, uint32_t type);
+/* IOCTLs */
+extern int drm_mode_getresources(struct drm_device *dev,
+                                 void *data, struct drm_file *file_priv);
+extern int drm_mode_getcrtc(struct drm_device *dev,
+                            void *data, struct drm_file *file_priv);
+extern int drm_mode_getconnector(struct drm_device *dev,
+                              void *data, struct drm_file *file_priv);
+extern int drm_mode_setcrtc(struct drm_device *dev,
+                            void *data, struct drm_file *file_priv);
+extern int drm_mode_cursor_ioctl(struct drm_device *dev,
+                                void *data, struct drm_file *file_priv);
+extern int drm_mode_addfb(struct drm_device *dev,
+                          void *data, struct drm_file *file_priv);
+extern int drm_mode_rmfb(struct drm_device *dev,
+                         void *data, struct drm_file *file_priv);
+extern int drm_mode_getfb(struct drm_device *dev,
+                          void *data, struct drm_file *file_priv);
+extern int drm_mode_addmode_ioctl(struct drm_device *dev,
+                                  void *data, struct drm_file *file_priv);
+extern int drm_mode_rmmode_ioctl(struct drm_device *dev,
+                                 void *data, struct drm_file *file_priv);
+extern int drm_mode_attachmode_ioctl(struct drm_device *dev,
+                                     void *data, struct drm_file *file_priv);
+extern int drm_mode_detachmode_ioctl(struct drm_device *dev,
+                                     void *data, struct drm_file *file_priv);
+extern int drm_mode_getproperty_ioctl(struct drm_device *dev,
+                                      void *data, struct drm_file *file_priv);
+extern int drm_mode_getblob_ioctl(struct drm_device *dev,
+                                  void *data, struct drm_file *file_priv);
+extern int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
+                                              void *data, struct drm_file *file_priv);
+extern int drm_mode_hotplug_ioctl(struct drm_device *dev,
+                                  void *data, struct drm_file *file_priv);
+extern int drm_mode_replacefb(struct drm_device *dev,
+                              void *data, struct drm_file *file_priv);
+extern int drm_mode_getencoder(struct drm_device *dev,
+                               void *data, struct drm_file *file_priv);
+extern int drm_mode_gamma_get_ioctl(struct drm_device *dev,
+                                    void *data, struct drm_file *file_priv);
+extern int drm_mode_gamma_set_ioctl(struct drm_device *dev,
+                                    void *data, struct drm_file *file_priv);
+#endif /* __DRM_CRTC_H__ */
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
new file mode 100644
index 000000000000..4bc04cf460a7
--- /dev/null
+++ b/include/drm/drm_crtc_helper.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright © 2006 Keith Packard
+ * Copyright © 2007-2008 Dave Airlie
+ * Copyright © 2007-2008 Intel Corporation
+ *   Jesse Barnes <jesse.barnes@intel.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+/*
+ * The DRM mode setting helper functions are common code for drivers to use if
+ * they wish.  Drivers are not forced to use this code in their
+ * implementations but it would be useful if they code they do use at least
+ * provides a consistent interface and operation to userspace
+ */
+#ifndef __DRM_CRTC_HELPER_H__
+#define __DRM_CRTC_HELPER_H__
+#include <linux/i2c.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+#include <linux/idr.h>
+#include <linux/fb.h>
+struct drm_crtc_helper_funcs {
+        /*
+         * Control power levels on the CRTC.  If the mode passed in is
+         * unsupported, the provider must use the next lowest power level.
+         */
+        void (*dpms)(struct drm_crtc *crtc, int mode);
+        void (*prepare)(struct drm_crtc *crtc);
+        void (*commit)(struct drm_crtc *crtc);
+        /* Provider can fixup or change mode timings before modeset occurs */
+        bool (*mode_fixup)(struct drm_crtc *crtc,
+                           struct drm_display_mode *mode,
+                           struct drm_display_mode *adjusted_mode);
+        /* Actually set the mode */
+        void (*mode_set)(struct drm_crtc *crtc, struct drm_display_mode *mode,
+                         struct drm_display_mode *adjusted_mode, int x, int y,
+                         struct drm_framebuffer *old_fb);
+        /* Move the crtc on the current fb to the given position *optional* */
+        void (*mode_set_base)(struct drm_crtc *crtc, int x, int y,
+                              struct drm_framebuffer *old_fb);
+};
+struct drm_encoder_helper_funcs {
+        void (*dpms)(struct drm_encoder *encoder, int mode);
+        void (*save)(struct drm_encoder *encoder);
+        void (*restore)(struct drm_encoder *encoder);
+        bool (*mode_fixup)(struct drm_encoder *encoder,
+                           struct drm_display_mode *mode,
+                           struct drm_display_mode *adjusted_mode);
+        void (*prepare)(struct drm_encoder *encoder);
+        void (*commit)(struct drm_encoder *encoder);
+        void (*mode_set)(struct drm_encoder *encoder,
+                         struct drm_display_mode *mode,
+                         struct drm_display_mode *adjusted_mode);
+        /* detect for DAC style encoders */
+        enum drm_connector_status (*detect)(struct drm_encoder *encoder,
+                                            struct drm_connector *connector);
+};
+struct drm_connector_helper_funcs {
+        int (*get_modes)(struct drm_connector *connector);
+        int (*mode_valid)(struct drm_connector *connector,
+                          struct drm_display_mode *mode);
+        struct drm_encoder *(*best_encoder)(struct drm_connector *connector);
+};
+extern void drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY);
+extern void drm_helper_disable_unused_functions(struct drm_device *dev);
+extern int drm_helper_hotplug_stage_two(struct drm_device *dev);
+extern bool drm_helper_initial_config(struct drm_device *dev, bool can_grow);
+extern int drm_crtc_helper_set_config(struct drm_mode_set *set);
+extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
+                                     struct drm_display_mode *mode,
+                                     int x, int y,
+                                     struct drm_framebuffer *old_fb);
+extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc);
+extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
+                                          struct drm_mode_fb_cmd *mode_cmd);
+static inline void drm_crtc_helper_add(struct drm_crtc *crtc,
+                                       const struct drm_crtc_helper_funcs *funcs)
+{
+        crtc->helper_private = (void *)funcs;
+}
+static inline void drm_encoder_helper_add(struct drm_encoder *encoder,
+                                          const struct drm_encoder_helper_funcs *funcs)
+{
+        encoder->helper_private = (void *)funcs;
+}
+static inline void drm_connector_helper_add(struct drm_connector *connector,
+                                            const struct drm_connector_helper_funcs *funcs)
+{
+        connector->helper_private = (void *)funcs;
+}
+extern int drm_helper_resume_force_mode(struct drm_device *dev);
+#endif
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
new file mode 100644
index 000000000000..c707c15f5164
--- /dev/null
+++ b/include/drm/drm_edid.h
@@ -0,0 +1,202 @@
+/*
+ * Copyright © 2007-2008 Intel Corporation
+ *   Jesse Barnes <jesse.barnes@intel.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef __DRM_EDID_H__
+#define __DRM_EDID_H__
+#include <linux/types.h>
+#define EDID_LENGTH 128
+#define DDC_ADDR 0x50
+#ifdef BIG_ENDIAN
+#error "EDID structure is little endian, need big endian versions"
+#else
+struct est_timings {
+        u8 t1;
+        u8 t2;
+        u8 mfg_rsvd;
+} __attribute__((packed));
+struct std_timing {
+        u8 hsize; /* need to multiply by 8 then add 248 */
+        u8 vfreq:6; /* need to add 60 */
+        u8 aspect_ratio:2; /* 00=16:10, 01=4:3, 10=5:4, 11=16:9 */
+} __attribute__((packed));
+/* If detailed data is pixel timing */
+struct detailed_pixel_timing {
+        u8 hactive_lo;
+        u8 hblank_lo;
+        u8 hblank_hi:4;
+        u8 hactive_hi:4;
+        u8 vactive_lo;
+        u8 vblank_lo;
+        u8 vblank_hi:4;
+        u8 vactive_hi:4;
+        u8 hsync_offset_lo;
+        u8 hsync_pulse_width_lo;
+        u8 vsync_pulse_width_lo:4;
+        u8 vsync_offset_lo:4;
+        u8 hsync_pulse_width_hi:2;
+        u8 hsync_offset_hi:2;
+        u8 vsync_pulse_width_hi:2;
+        u8 vsync_offset_hi:2;
+        u8 width_mm_lo;
+        u8 height_mm_lo;
+        u8 height_mm_hi:4;
+        u8 width_mm_hi:4;
+        u8 hborder;
+        u8 vborder;
+        u8 unknown0:1;
+        u8 vsync_positive:1;
+        u8 hsync_positive:1;
+        u8 separate_sync:2;
+        u8 stereo:1;
+        u8 unknown6:1;
+        u8 interlaced:1;
+} __attribute__((packed));
+/* If it's not pixel timing, it'll be one of the below */
+struct detailed_data_string {
+        u8 str[13];
+} __attribute__((packed));
+struct detailed_data_monitor_range {
+        u8 min_vfreq;
+        u8 max_vfreq;
+        u8 min_hfreq_khz;
+        u8 max_hfreq_khz;
+        u8 pixel_clock_mhz; /* need to multiply by 10 */
+        u16 sec_gtf_toggle; /* A000=use above, 20=use below */ /* FIXME: byte order */
+        u8 hfreq_start_khz; /* need to multiply by 2 */
+        u8 c; /* need to divide by 2 */
+        u16 m; /* FIXME: byte order */
+        u8 k;
+        u8 j; /* need to divide by 2 */
+} __attribute__((packed));
+struct detailed_data_wpindex {
+        u8 white_y_lo:2;
+        u8 white_x_lo:2;
+        u8 pad:4;
+        u8 white_x_hi;
+        u8 white_y_hi;
+        u8 gamma; /* need to divide by 100 then add 1 */
+} __attribute__((packed));
+struct detailed_data_color_point {
+        u8 windex1;
+        u8 wpindex1[3];
+        u8 windex2;
+        u8 wpindex2[3];
+} __attribute__((packed));
+struct detailed_non_pixel {
+        u8 pad1;
+        u8 type; /* ff=serial, fe=string, fd=monitor range, fc=monitor name
+                    fb=color point data, fa=standard timing data,
+                    f9=undefined, f8=mfg. reserved */
+        u8 pad2;
+        union {
+                struct detailed_data_string str;
+                struct detailed_data_monitor_range range;
+                struct detailed_data_wpindex color;
+                struct std_timing timings[5];
+        } data;
+} __attribute__((packed));
+#define EDID_DETAIL_STD_MODES 0xfa
+#define EDID_DETAIL_MONITOR_CPDATA 0xfb
+#define EDID_DETAIL_MONITOR_NAME 0xfc
+#define EDID_DETAIL_MONITOR_RANGE 0xfd
+#define EDID_DETAIL_MONITOR_STRING 0xfe
+#define EDID_DETAIL_MONITOR_SERIAL 0xff
+struct detailed_timing {
+        u16 pixel_clock; /* need to multiply by 10 KHz */ /* FIXME: byte order */
+        union {
+                struct detailed_pixel_timing pixel_data;
+                struct detailed_non_pixel other_data;
+        } data;
+} __attribute__((packed));
+struct edid {
+        u8 header[8];
+        /* Vendor & product info */
+        u8 mfg_id[2];
+        u8 prod_code[2];
+        u32 serial; /* FIXME: byte order */
+        u8 mfg_week;
+        u8 mfg_year;
+        /* EDID version */
+        u8 version;
+        u8 revision;
+        /* Display info: */
+        /*   input definition */
+        u8 serration_vsync:1;
+        u8 sync_on_green:1;
+        u8 composite_sync:1;
+        u8 separate_syncs:1;
+        u8 blank_to_black:1;
+        u8 video_level:2;
+        u8 digital:1; /* bits below must be zero if set */
+        u8 width_cm;
+        u8 height_cm;
+        u8 gamma;
+        /*   feature support */
+        u8 default_gtf:1;
+        u8 preferred_timing:1;
+        u8 standard_color:1;
+        u8 display_type:2; /* 00=mono, 01=rgb, 10=non-rgb, 11=unknown */
+        u8 pm_active_off:1;
+        u8 pm_suspend:1;
+        u8 pm_standby:1;
+        /* Color characteristics */
+        u8 red_green_lo;
+        u8 black_white_lo;
+        u8 red_x;
+        u8 red_y;
+        u8 green_x;
+        u8 green_y;
+        u8 blue_x;
+        u8 blue_y;
+        u8 white_x;
+        u8 white_y;
+        /* Est. timings and mfg rsvd timings*/
+        struct est_timings established_timings;
+        /* Standard timings 1-8*/
+        struct std_timing standard_timings[8];
+        /* Detailing timings 1-4 */
+        struct detailed_timing detailed_timings[4];
+        /* Number of 128 byte ext. blocks */
+        u8 extensions;
+        /* Checksum */
+        u8 checksum;
+} __attribute__((packed));
+#endif /* little endian structs */
+#define EDID_PRODUCT_ID(e) ((e)->prod_code[0] | ((e)->prod_code[1] << 8))
+#endif /* __DRM_EDID_H__ */
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
new file mode 100644
index 000000000000..601d2bd839f6
--- /dev/null
+++ b/include/drm/drm_mode.h
@@ -0,0 +1,271 @@
+/*
+ * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
+ * Copyright (c) 2007 Jakob Bornecrantz <wallbraker@gmail.com>
+ * Copyright (c) 2008 Red Hat Inc.
+ * Copyright (c) 2007-2008 Tungsten Graphics, Inc., Cedar Park, TX., USA
+ * Copyright (c) 2007-2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#ifndef _DRM_MODE_H
+#define _DRM_MODE_H
+#if !defined(__KERNEL__) && !defined(_KERNEL)
+#include <stdint.h>
+#else
+#include <linux/kernel.h>
+#endif
+#define DRM_DISPLAY_INFO_LEN    32
+#define DRM_CONNECTOR_NAME_LEN  32
+#define DRM_DISPLAY_MODE_LEN    32
+#define DRM_PROP_NAME_LEN       32
+#define DRM_MODE_TYPE_BUILTIN   (1<<0)
+#define DRM_MODE_TYPE_CLOCK_C   ((1<<1) | DRM_MODE_TYPE_BUILTIN)
+#define DRM_MODE_TYPE_CRTC_C    ((1<<2) | DRM_MODE_TYPE_BUILTIN)
+#define DRM_MODE_TYPE_PREFERRED (1<<3)
+#define DRM_MODE_TYPE_DEFAULT   (1<<4)
+#define DRM_MODE_TYPE_USERDEF   (1<<5)
+#define DRM_MODE_TYPE_DRIVER    (1<<6)
+/* Video mode flags */
+/* bit compatible with the xorg definitions. */
+#define DRM_MODE_FLAG_PHSYNC    (1<<0)
+#define DRM_MODE_FLAG_NHSYNC    (1<<1)
+#define DRM_MODE_FLAG_PVSYNC    (1<<2)
+#define DRM_MODE_FLAG_NVSYNC    (1<<3)
+#define DRM_MODE_FLAG_INTERLACE (1<<4)
+#define DRM_MODE_FLAG_DBLSCAN   (1<<5)
+#define DRM_MODE_FLAG_CSYNC     (1<<6)
+#define DRM_MODE_FLAG_PCSYNC    (1<<7)
+#define DRM_MODE_FLAG_NCSYNC    (1<<8)
+#define DRM_MODE_FLAG_HSKEW     (1<<9) /* hskew provided */
+#define DRM_MODE_FLAG_BCAST     (1<<10)
+#define DRM_MODE_FLAG_PIXMUX    (1<<11)
+#define DRM_MODE_FLAG_DBLCLK    (1<<12)
+#define DRM_MODE_FLAG_CLKDIV2   (1<<13)
+/* DPMS flags */
+/* bit compatible with the xorg definitions. */
+#define DRM_MODE_DPMS_ON        0
+#define DRM_MODE_DPMS_STANDBY   1
+#define DRM_MODE_DPMS_SUSPEND   2
+#define DRM_MODE_DPMS_OFF       3
+/* Scaling mode options */
+#define DRM_MODE_SCALE_NON_GPU          0
+#define DRM_MODE_SCALE_FULLSCREEN       1
+#define DRM_MODE_SCALE_NO_SCALE         2
+#define DRM_MODE_SCALE_ASPECT           3
+/* Dithering mode options */
+#define DRM_MODE_DITHERING_OFF  0
+#define DRM_MODE_DITHERING_ON   1
+struct drm_mode_modeinfo {
+        uint32_t clock;
+        uint16_t hdisplay, hsync_start, hsync_end, htotal, hskew;
+        uint16_t vdisplay, vsync_start, vsync_end, vtotal, vscan;
+        uint32_t vrefresh; /* vertical refresh * 1000 */
+        uint32_t flags;
+        uint32_t type;
+        char name[DRM_DISPLAY_MODE_LEN];
+};
+struct drm_mode_card_res {
+        uint64_t fb_id_ptr;
+        uint64_t crtc_id_ptr;
+        uint64_t connector_id_ptr;
+        uint64_t encoder_id_ptr;
+        uint32_t count_fbs;
+        uint32_t count_crtcs;
+        uint32_t count_connectors;
+        uint32_t count_encoders;
+        uint32_t min_width, max_width;
+        uint32_t min_height, max_height;
+};
+struct drm_mode_crtc {
+        uint64_t set_connectors_ptr;
+        uint32_t count_connectors;
+        uint32_t crtc_id; /**< Id */
+        uint32_t fb_id; /**< Id of framebuffer */
+        uint32_t x, y; /**< Position on the frameuffer */
+        uint32_t gamma_size;
+        uint32_t mode_valid;
+        struct drm_mode_modeinfo mode;
+};
+#define DRM_MODE_ENCODER_NONE   0
+#define DRM_MODE_ENCODER_DAC    1
+#define DRM_MODE_ENCODER_TMDS   2
+#define DRM_MODE_ENCODER_LVDS   3
+#define DRM_MODE_ENCODER_TVDAC  4
+struct drm_mode_get_encoder {
+        uint32_t encoder_id;
+        uint32_t encoder_type;
+        uint32_t crtc_id; /**< Id of crtc */
+        uint32_t possible_crtcs;
+        uint32_t possible_clones;
+};
+/* This is for connectors with multiple signal types. */
+/* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */
+#define DRM_MODE_SUBCONNECTOR_Automatic 0
+#define DRM_MODE_SUBCONNECTOR_Unknown   0
+#define DRM_MODE_SUBCONNECTOR_DVID      3
+#define DRM_MODE_SUBCONNECTOR_DVIA      4
+#define DRM_MODE_SUBCONNECTOR_Composite 5
+#define DRM_MODE_SUBCONNECTOR_SVIDEO    6
+#define DRM_MODE_SUBCONNECTOR_Component 8
+#define DRM_MODE_CONNECTOR_Unknown      0
+#define DRM_MODE_CONNECTOR_VGA          1
+#define DRM_MODE_CONNECTOR_DVII         2
+#define DRM_MODE_CONNECTOR_DVID         3
+#define DRM_MODE_CONNECTOR_DVIA         4
+#define DRM_MODE_CONNECTOR_Composite    5
+#define DRM_MODE_CONNECTOR_SVIDEO       6
+#define DRM_MODE_CONNECTOR_LVDS         7
+#define DRM_MODE_CONNECTOR_Component    8
+#define DRM_MODE_CONNECTOR_9PinDIN      9
+#define DRM_MODE_CONNECTOR_DisplayPort  10
+#define DRM_MODE_CONNECTOR_HDMIA        11
+#define DRM_MODE_CONNECTOR_HDMIB        12
+struct drm_mode_get_connector {
+        uint64_t encoders_ptr;
+        uint64_t modes_ptr;
+        uint64_t props_ptr;
+        uint64_t prop_values_ptr;
+        uint32_t count_modes;
+        uint32_t count_props;
+        uint32_t count_encoders;
+        uint32_t encoder_id; /**< Current Encoder */
+        uint32_t connector_id; /**< Id */
+        uint32_t connector_type;
+        uint32_t connector_type_id;
+        uint32_t connection;
+        uint32_t mm_width, mm_height; /**< HxW in millimeters */
+        uint32_t subpixel;
+};
+#define DRM_MODE_PROP_PENDING   (1<<0)
+#define DRM_MODE_PROP_RANGE     (1<<1)
+#define DRM_MODE_PROP_IMMUTABLE (1<<2)
+#define DRM_MODE_PROP_ENUM      (1<<3) /* enumerated type with text strings */
+#define DRM_MODE_PROP_BLOB      (1<<4)
+struct drm_mode_property_enum {
+        uint64_t value;
+        char name[DRM_PROP_NAME_LEN];
+};
+struct drm_mode_get_property {
+        uint64_t values_ptr; /* values and blob lengths */
+        uint64_t enum_blob_ptr; /* enum and blob id ptrs */
+        uint32_t prop_id;
+        uint32_t flags;
+        char name[DRM_PROP_NAME_LEN];
+        uint32_t count_values;
+        uint32_t count_enum_blobs;
+};
+struct drm_mode_connector_set_property {
+        uint64_t value;
+        uint32_t prop_id;
+        uint32_t connector_id;
+};
+struct drm_mode_get_blob {
+        uint32_t blob_id;
+        uint32_t length;
+        uint64_t data;
+};
+struct drm_mode_fb_cmd {
+        uint32_t fb_id;
+        uint32_t width, height;
+        uint32_t pitch;
+        uint32_t bpp;
+        uint32_t depth;
+        /* driver specific handle */
+        uint32_t handle;
+};
+struct drm_mode_mode_cmd {
+        uint32_t connector_id;
+        struct drm_mode_modeinfo mode;
+};
+#define DRM_MODE_CURSOR_BO      (1<<0)
+#define DRM_MODE_CURSOR_MOVE    (1<<1)
+/*
+ * depending on the value in flags diffrent members are used.
+ *
+ * CURSOR_BO uses
+ *    crtc
+ *    width
+ *    height
+ *    handle - if 0 turns the cursor of
+ *
+ * CURSOR_MOVE uses
+ *    crtc
+ *    x
+ *    y
+ */
+struct drm_mode_cursor {
+        uint32_t flags;
+        uint32_t crtc_id;
+        int32_t x;
+        int32_t y;
+        uint32_t width;
+        uint32_t height;
+        /* driver specific handle */
+        uint32_t handle;
+};
+struct drm_mode_crtc_lut {
+        uint32_t crtc_id;
+        uint32_t gamma_size;
+        /* pointers to arrays */
+        uint64_t red;
+        uint64_t green;
+        uint64_t blue;
+};
+#endif
diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h
index 480037331e4e..ee5389d22c64 100644
--- a/include/drm/drm_sarea.h
+++ b/include/drm/drm_sarea.h
@@ -36,12 +36,12 @@
 /* SAREA area needs to be at least a page */
 #if defined(__alpha__)
-#define SAREA_MAX                       0x2000
+#define SAREA_MAX                       0x2000U
 #elif defined(__ia64__)
-#define SAREA_MAX                       0x10000 /* 64kB */
+#define SAREA_MAX                       0x10000U        /* 64kB */
 #else
 /* Intel 830M driver needs at least 8k SAREA */
-#define SAREA_MAX                       0x2000
+#define SAREA_MAX                       0x2000U
 #endif
 /** Maximum number of drawables in the SAREA */
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 152b34da927c..b3bcf72dc656 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -113,8 +113,31 @@ typedef struct _drm_i915_sarea {
        int pipeB_y;
        int pipeB_w;
        int pipeB_h;
+        /* fill out some space for old userspace triple buffer */
+        drm_handle_t unused_handle;
+        uint32_t unused1, unused2, unused3;
+        /* buffer object handles for static buffers. May change
+         * over the lifetime of the client.
+         */
+        uint32_t front_bo_handle;
+        uint32_t back_bo_handle;
+        uint32_t unused_bo_handle;
+        uint32_t depth_bo_handle;
 } drm_i915_sarea_t;
+/* due to userspace building against these headers we need some compat here */
+#define planeA_x pipeA_x
+#define planeA_y pipeA_y
+#define planeA_w pipeA_w
+#define planeA_h pipeA_h
+#define planeB_x pipeB_x
+#define planeB_y pipeB_y
+#define planeB_w pipeB_w
+#define planeB_h pipeB_h
 /* Flags for perf_boxes
 */
 #define I915_BOX_RING_EMPTY    0x1
@@ -160,6 +183,7 @@ typedef struct _drm_i915_sarea {
 #define DRM_I915_GEM_SET_TILING 0x21
 #define DRM_I915_GEM_GET_TILING 0x22
 #define DRM_I915_GEM_GET_APERTURE 0x23
+#define DRM_I915_GEM_MMAP_GTT   0x24
 #define DRM_IOCTL_I915_INIT             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
 #define DRM_IOCTL_I915_FLUSH            DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
@@ -177,6 +201,8 @@ typedef struct _drm_i915_sarea {
 #define DRM_IOCTL_I915_SET_VBLANK_PIPE  DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
 #define DRM_IOCTL_I915_GET_VBLANK_PIPE  DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
 #define DRM_IOCTL_I915_VBLANK_SWAP      DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
+#define DRM_IOCTL_I915_GEM_INIT         DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_INIT, struct drm_i915_gem_init)
+#define DRM_IOCTL_I915_GEM_EXECBUFFER   DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER, struct drm_i915_gem_execbuffer)
 #define DRM_IOCTL_I915_GEM_PIN          DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
 #define DRM_IOCTL_I915_GEM_UNPIN        DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
 #define DRM_IOCTL_I915_GEM_BUSY         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
@@ -187,6 +213,7 @@ typedef struct _drm_i915_sarea {
 #define DRM_IOCTL_I915_GEM_PREAD        DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PREAD, struct drm_i915_gem_pread)
 #define DRM_IOCTL_I915_GEM_PWRITE       DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PWRITE, struct drm_i915_gem_pwrite)
 #define DRM_IOCTL_I915_GEM_MMAP         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct drm_i915_gem_mmap)
+#define DRM_IOCTL_I915_GEM_MMAP_GTT     DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_gtt)
 #define DRM_IOCTL_I915_GEM_SET_DOMAIN   DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SET_DOMAIN, struct drm_i915_gem_set_domain)
 #define DRM_IOCTL_I915_GEM_SW_FINISH    DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SW_FINISH, struct drm_i915_gem_sw_finish)
 #define DRM_IOCTL_I915_GEM_SET_TILING   DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling)
@@ -196,7 +223,7 @@ typedef struct _drm_i915_sarea {
 /* Allow drivers to submit batchbuffers directly to hardware, relying
 * on the security mechanisms provided by hardware.
 */
-typedef struct _drm_i915_batchbuffer {
+typedef struct drm_i915_batchbuffer {
        int start;              /* agp offset */
        int used;               /* nr bytes in use */
        int DR1;                /* hw flags for GFX_OP_DRAWRECT_INFO */
@@ -382,6 +409,18 @@ struct drm_i915_gem_mmap {
        uint64_t addr_ptr;
 };
+struct drm_i915_gem_mmap_gtt {
+        /** Handle for the object being mapped. */
+        uint32_t handle;
+        uint32_t pad;
+        /**
+         * Fake offset to use for subsequent mmap call
+         *
+         * This is a fixed-size type for 32/64 compatibility.
+         */
+        uint64_t offset;
+};
 struct drm_i915_gem_set_domain {
        /** Handle for the object */
        uint32_t handle;
diff --git a/include/keys/keyring-type.h b/include/keys/keyring-type.h
new file mode 100644
index 000000000000..843f872a4b63
--- /dev/null
+++ b/include/keys/keyring-type.h
@@ -0,0 +1,31 @@
+/* Keyring key type
+ *
+ * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+#ifndef _KEYS_KEYRING_TYPE_H
+#define _KEYS_KEYRING_TYPE_H
+#include <linux/key.h>
+#include <linux/rcupdate.h>
+/*
+ * the keyring payload contains a list of the keys to which the keyring is
+ * subscribed
+ */
+struct keyring_list {
+        struct rcu_head rcu;            /* RCU deletion hook */
+        unsigned short  maxkeys;        /* max keys this list can hold */
+        unsigned short  nkeys;          /* number of keys currently held */
+        unsigned short  delkey;         /* key to be unlinked by RCU */
+        struct key      *keys[0];
+};
+#endif /* _KEYS_KEYRING_TYPE_H */
diff --git a/include/linux/8250_pci.h b/include/linux/8250_pci.h
index 3209dd46ea7d..b24ff086a662 100644
--- a/include/linux/8250_pci.h
+++ b/include/linux/8250_pci.h
@@ -31,7 +31,7 @@ struct pciserial_board {
 struct serial_private;
 struct serial_private *
-pciserial_init_ports(struct pci_dev *dev, struct pciserial_board *board);
+pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board);
 void pciserial_remove_ports(struct serial_private *priv);
 void pciserial_suspend_ports(struct serial_private *priv);
 void pciserial_resume_ports(struct serial_private *priv);
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index e531783e5d78..95ac82340c3b 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -313,6 +313,7 @@ unifdef-y += ptrace.h
 unifdef-y += qnx4_fs.h
 unifdef-y += quota.h
 unifdef-y += random.h
+unifdef-y += irqnr.h
 unifdef-y += reboot.h
 unifdef-y += reiserfs_fs.h
 unifdef-y += reiserfs_xattr.h
diff --git a/include/linux/aio.h b/include/linux/aio.h
index f6b8cf99b596..b16a957030f8 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -5,6 +5,7 @@
 #include <linux/workqueue.h>
 #include <linux/aio_abi.h>
 #include <linux/uio.h>
+#include <linux/rcupdate.h>
 #include <asm/atomic.h>
@@ -183,7 +184,7 @@ struct kioctx {
        /* This needs improving */
        unsigned long           user_id;
-        struct kioctx           *next;
+        struct hlist_node       list;
        wait_queue_head_t       wait;
@@ -199,6 +200,8 @@ struct kioctx {
        struct aio_ring_info    ring_info;
        struct delayed_work     wq;
+        struct rcu_head         rcu_head;
 };
 /* prototypes */
diff --git a/include/linux/atm.h b/include/linux/atm.h
index c791ddd96939..d3b292174aeb 100644
--- a/include/linux/atm.h
+++ b/include/linux/atm.h
@@ -231,10 +231,21 @@ static __inline__ int atmpvc_addr_in_use(struct sockaddr_atmpvc addr)
 */
 struct atmif_sioc {
-    int number;
+        int number;
-    int length;
+        int length;
-    void __user *arg;
+        void __user *arg;
 };
+#ifdef __KERNEL__
+#ifdef CONFIG_COMPAT
+#include <linux/compat.h>
+struct compat_atmif_sioc {
+        int number;
+        int length;
+        compat_uptr_t arg;
+};
+#endif
+#endif
 typedef unsigned short atm_backend_t;
 #endif
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index a3d07c29d16c..086e5c362d3a 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -100,6 +100,10 @@ struct atm_dev_stats {
                                        /* use backend to make new if */
 #define ATM_ADDPARTY    _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
                                        /* add party to p2mp call */
+#ifdef CONFIG_COMPAT
+/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */
+#define COMPAT_ATM_ADDPARTY     _IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf)
+#endif
 #define ATM_DROPPARTY   _IOW('a', ATMIOC_SPECIAL+5,int)
                                        /* drop party from p2mp call */
@@ -224,6 +228,13 @@ struct atm_cirange {
 extern struct proc_dir_entry *atm_proc_root;
 #endif
+#ifdef CONFIG_COMPAT
+#include <linux/compat.h>
+struct compat_atm_iobuf {
+        int length;
+        compat_uptr_t buffer;
+};
+#endif
 struct k_atm_aal_stats {
 #define __HANDLE_ITEM(i) atomic_t i
@@ -379,6 +390,10 @@ struct atmdev_ops { /* only send is required */
        int (*open)(struct atm_vcc *vcc);
        void (*close)(struct atm_vcc *vcc);
        int (*ioctl)(struct atm_dev *dev,unsigned int cmd,void __user *arg);
+#ifdef CONFIG_COMPAT
+        int (*compat_ioctl)(struct atm_dev *dev,unsigned int cmd,
+                            void __user *arg);
+#endif
        int (*getsockopt)(struct atm_vcc *vcc,int level,int optname,
            void __user *optval,int optlen);
        int (*setsockopt)(struct atm_vcc *vcc,int level,int optname,
diff --git a/include/linux/audit.h b/include/linux/audit.h
index 8f0672d13eb1..67e5dbfc2961 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -99,6 +99,8 @@
 #define AUDIT_OBJ_PID           1318    /* ptrace target */
 #define AUDIT_TTY               1319    /* Input on an administrative TTY */
 #define AUDIT_EOE               1320    /* End of multi-record event */
+#define AUDIT_BPRM_FCAPS        1321    /* Information about fcaps increasing perms */
+#define AUDIT_CAPSET            1322    /* Record showing argument to sys_capset */
 #define AUDIT_AVC               1400    /* SE Linux avc denial or grant */
 #define AUDIT_SELINUX_ERR       1401    /* Internal SE Linux Errors */
@@ -245,6 +247,18 @@
 #define AUDIT_GREATER_THAN_OR_EQUAL     (AUDIT_GREATER_THAN|AUDIT_EQUAL)
 #define AUDIT_OPERATORS                 (AUDIT_EQUAL|AUDIT_NOT_EQUAL|AUDIT_BIT_MASK)
+enum {
+        Audit_equal,
+        Audit_not_equal,
+        Audit_bitmask,
+        Audit_bittest,
+        Audit_lt,
+        Audit_gt,
+        Audit_le,
+        Audit_ge,
+        Audit_bad
+};
 /* Status symbols */
                                /* Mask values */
 #define AUDIT_STATUS_ENABLED            0x0001
@@ -371,6 +385,8 @@ struct audit_krule {
        struct audit_watch      *watch; /* associated watch */
        struct audit_tree       *tree;  /* associated watched tree */
        struct list_head        rlist;  /* entry in audit_{watch,tree}.rules list */
+        struct list_head        list;   /* for AUDIT_LIST* purposes only */
+        u64                     prio;
 };
 struct audit_field {
@@ -441,67 +457,74 @@ extern int  audit_set_loginuid(struct task_struct *task, uid_t loginuid);
 #define audit_get_loginuid(t) ((t)->loginuid)
 #define audit_get_sessionid(t) ((t)->sessionid)
 extern void audit_log_task_context(struct audit_buffer *ab);
-extern int __audit_ipc_obj(struct kern_ipc_perm *ipcp);
+extern void __audit_ipc_obj(struct kern_ipc_perm *ipcp);
-extern int __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode);
+extern void __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode);
 extern int audit_bprm(struct linux_binprm *bprm);
-extern int audit_socketcall(int nargs, unsigned long *args);
+extern void audit_socketcall(int nargs, unsigned long *args);
 extern int audit_sockaddr(int len, void *addr);
-extern int __audit_fd_pair(int fd1, int fd2);
+extern void __audit_fd_pair(int fd1, int fd2);
 extern int audit_set_macxattr(const char *name);
-extern int __audit_mq_open(int oflag, mode_t mode, struct mq_attr __user *u_attr);
+extern void __audit_mq_open(int oflag, mode_t mode, struct mq_attr *attr);
-extern int __audit_mq_timedsend(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec __user *u_abs_timeout);
+extern void __audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec *abs_timeout);
-extern int __audit_mq_timedreceive(mqd_t mqdes, size_t msg_len, unsigned int __user *u_msg_prio, const struct timespec __user *u_abs_timeout);
+extern void __audit_mq_notify(mqd_t mqdes, const struct sigevent *notification);
-extern int __audit_mq_notify(mqd_t mqdes, const struct sigevent __user *u_notification);
+extern void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat);
-extern int __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat);
+extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm,
+                                  const struct cred *new,
-static inline int audit_ipc_obj(struct kern_ipc_perm *ipcp)
+                                  const struct cred *old);
+extern void __audit_log_capset(pid_t pid, const struct cred *new, const struct cred *old);
+static inline void audit_ipc_obj(struct kern_ipc_perm *ipcp)
 {
        if (unlikely(!audit_dummy_context()))
-                return __audit_ipc_obj(ipcp);
+                __audit_ipc_obj(ipcp);
-        return 0;
 }
-static inline int audit_fd_pair(int fd1, int fd2)
+static inline void audit_fd_pair(int fd1, int fd2)
 {
        if (unlikely(!audit_dummy_context()))
-                return __audit_fd_pair(fd1, fd2);
+                __audit_fd_pair(fd1, fd2);
-        return 0;
 }
-static inline int audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode)
+static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode)
 {
        if (unlikely(!audit_dummy_context()))
-                return __audit_ipc_set_perm(qbytes, uid, gid, mode);
+                __audit_ipc_set_perm(qbytes, uid, gid, mode);
-        return 0;
 }
-static inline int audit_mq_open(int oflag, mode_t mode, struct mq_attr __user *u_attr)
+static inline void audit_mq_open(int oflag, mode_t mode, struct mq_attr *attr)
 {
        if (unlikely(!audit_dummy_context()))
-                return __audit_mq_open(oflag, mode, u_attr);
+                __audit_mq_open(oflag, mode, attr);
-        return 0;
 }
-static inline int audit_mq_timedsend(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec __user *u_abs_timeout)
+static inline void audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec *abs_timeout)
 {
        if (unlikely(!audit_dummy_context()))
-                return __audit_mq_timedsend(mqdes, msg_len, msg_prio, u_abs_timeout);
+                __audit_mq_sendrecv(mqdes, msg_len, msg_prio, abs_timeout);
-        return 0;
 }
-static inline int audit_mq_timedreceive(mqd_t mqdes, size_t msg_len, unsigned int __user *u_msg_prio, const struct timespec __user *u_abs_timeout)
+static inline void audit_mq_notify(mqd_t mqdes, const struct sigevent *notification)
 {
        if (unlikely(!audit_dummy_context()))
-                return __audit_mq_timedreceive(mqdes, msg_len, u_msg_prio, u_abs_timeout);
+                __audit_mq_notify(mqdes, notification);
-        return 0;
 }
-static inline int audit_mq_notify(mqd_t mqdes, const struct sigevent __user *u_notification)
+static inline void audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)
 {
        if (unlikely(!audit_dummy_context()))
-                return __audit_mq_notify(mqdes, u_notification);
+                __audit_mq_getsetattr(mqdes, mqstat);
-        return 0;
 }
-static inline int audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)
+static inline int audit_log_bprm_fcaps(struct linux_binprm *bprm,
+                                       const struct cred *new,
+                                       const struct cred *old)
 {
        if (unlikely(!audit_dummy_context()))
-                return __audit_mq_getsetattr(mqdes, mqstat);
+                return __audit_log_bprm_fcaps(bprm, new, old);
        return 0;
 }
+static inline void audit_log_capset(pid_t pid, const struct cred *new,
+                                   const struct cred *old)
+{
+        if (unlikely(!audit_dummy_context()))
+                __audit_log_capset(pid, new, old);
+}
 extern int audit_n_rules;
 extern int audit_signals;
 #else
@@ -522,18 +545,19 @@ extern int audit_signals;
 #define audit_get_loginuid(t) (-1)
 #define audit_get_sessionid(t) (-1)
 #define audit_log_task_context(b) do { ; } while (0)
-#define audit_ipc_obj(i) ({ 0; })
+#define audit_ipc_obj(i) ((void)0)
-#define audit_ipc_set_perm(q,u,g,m) ({ 0; })
+#define audit_ipc_set_perm(q,u,g,m) ((void)0)
 #define audit_bprm(p) ({ 0; })
-#define audit_socketcall(n,a) ({ 0; })
+#define audit_socketcall(n,a) ((void)0)
-#define audit_fd_pair(n,a) ({ 0; })
+#define audit_fd_pair(n,a) ((void)0)
 #define audit_sockaddr(len, addr) ({ 0; })
 #define audit_set_macxattr(n) do { ; } while (0)
-#define audit_mq_open(o,m,a) ({ 0; })
+#define audit_mq_open(o,m,a) ((void)0)
-#define audit_mq_timedsend(d,l,p,t) ({ 0; })
+#define audit_mq_sendrecv(d,l,p,t) ((void)0)
-#define audit_mq_timedreceive(d,l,p,t) ({ 0; })
+#define audit_mq_notify(d,n) ((void)0)
-#define audit_mq_notify(d,n) ({ 0; })
+#define audit_mq_getsetattr(d,s) ((void)0)
-#define audit_mq_getsetattr(d,s) ({ 0; })
+#define audit_log_bprm_fcaps(b, ncr, ocr) ({ 0; })
+#define audit_log_capset(pid, ncr, ocr) ((void)0)
 #define audit_ptrace(t) ((void)0)
 #define audit_n_rules 0
 #define audit_signals 0
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 7394b5b349ff..6cbfbe297180 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -35,16 +35,20 @@ struct linux_binprm{
        struct mm_struct *mm;
        unsigned long p; /* current top of mem */
        unsigned int sh_bang:1,
-                     misc_bang:1;
+                misc_bang:1,
+                cred_prepared:1,/* true if creds already prepared (multiple
+                                 * preps happen for interpreters) */
+                cap_effective:1;/* true if has elevated effective capabilities,
+                                 * false if not; except for init which inherits
+                                 * its parent's caps anyway */
 #ifdef __alpha__
        unsigned int taso:1;
 #endif
        unsigned int recursion_depth;
        struct file * file;
-        int e_uid, e_gid;
+        struct cred *cred;      /* new credentials */
-        kernel_cap_t cap_post_exec_permitted;
+        int unsafe;             /* how unsafe this exec is (mask of LSM_UNSAFE_*) */
-        bool cap_effective;
+        unsigned int per_clear; /* bits to clear in current->personality */
-        void *security;
        int argc, envc;
        char * filename;        /* Name of binary as seen by procps */
        char * interp;          /* Name of the binary really executed. Most
@@ -101,7 +105,7 @@ extern int setup_arg_pages(struct linux_binprm * bprm,
                           int executable_stack);
 extern int bprm_mm_init(struct linux_binprm *bprm);
 extern int copy_strings_kernel(int argc,char ** argv,struct linux_binprm *bprm);
-extern void compute_creds(struct linux_binprm *binprm);
+extern void install_exec_creds(struct linux_binprm *bprm);
 extern int do_coredump(long signr, int exit_code, struct pt_regs * regs);
 extern int set_binfmt(struct linux_binfmt *new);
 extern void free_bprm(struct linux_binprm *);
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 6a642098e5c3..18462c5b8fff 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -90,10 +90,11 @@ struct bio {
        unsigned int            bi_comp_cpu;    /* completion CPU */
+        atomic_t                bi_cnt;         /* pin count */
        struct bio_vec          *bi_io_vec;     /* the actual vec list */
        bio_end_io_t            *bi_end_io;
-        atomic_t                bi_cnt;         /* pin count */
        void                    *bi_private;
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
@@ -101,6 +102,13 @@ struct bio {
 #endif
        bio_destructor_t        *bi_destructor; /* destructor */
+        /*
+         * We can inline a number of vecs at the end of the bio, to avoid
+         * double allocations for a small number of bio_vecs. This member
+         * MUST obviously be kept at the very end of the bio.
+         */
+        struct bio_vec          bi_inline_vecs[0];
 };
 /*
@@ -117,6 +125,7 @@ struct bio {
 #define BIO_CPU_AFFINE  8       /* complete bio on same CPU as submitted */
 #define BIO_NULL_MAPPED 9       /* contains invalid user pages */
 #define BIO_FS_INTEGRITY 10     /* fs owns integrity data, not block layer */
+#define BIO_QUIET       11      /* Make BIO Quiet */
 #define bio_flagged(bio, flag)  ((bio)->bi_flags & (1 << (flag)))
 /*
@@ -211,6 +220,11 @@ static inline void *bio_data(struct bio *bio)
        return NULL;
 }
+static inline int bio_has_allocated_vec(struct bio *bio)
+{
+        return bio->bi_io_vec && bio->bi_io_vec != bio->bi_inline_vecs;
+}
 /*
 * will die
 */
@@ -332,7 +346,7 @@ struct bio_pair {
 extern struct bio_pair *bio_split(struct bio *bi, int first_sectors);
 extern void bio_pair_release(struct bio_pair *dbio);
-extern struct bio_set *bioset_create(int, int);
+extern struct bio_set *bioset_create(unsigned int, unsigned int);
 extern void bioset_free(struct bio_set *);
 extern struct bio *bio_alloc(gfp_t, int);
@@ -377,6 +391,7 @@ extern struct bio *bio_copy_user_iov(struct request_queue *,
 extern int bio_uncopy_user(struct bio *);
 void zero_fill_bio(struct bio *bio);
 extern struct bio_vec *bvec_alloc_bs(gfp_t, int, unsigned long *, struct bio_set *);
+extern void bvec_free_bs(struct bio_set *, struct bio_vec *, unsigned int);
 extern unsigned int bvec_nr_vecs(unsigned short idx);
 /*
@@ -395,13 +410,17 @@ static inline void bio_set_completion_cpu(struct bio *bio, unsigned int cpu)
 */
 #define BIO_POOL_SIZE 2
 #define BIOVEC_NR_POOLS 6
+#define BIOVEC_MAX_IDX  (BIOVEC_NR_POOLS - 1)
 struct bio_set {
+        struct kmem_cache *bio_slab;
+        unsigned int front_pad;
        mempool_t *bio_pool;
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
        mempool_t *bio_integrity_pool;
 #endif
-        mempool_t *bvec_pools[BIOVEC_NR_POOLS];
+        mempool_t *bvec_pool;
 };
 struct biovec_slab {
@@ -411,6 +430,7 @@ struct biovec_slab {
 };
 extern struct bio_set *fs_bio_set;
+extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly;
 /*
 * a small number of entries is fine, not going to be performance critical.
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index a08c33a26ca9..2878811c6134 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -137,9 +137,12 @@ extern void bitmap_copy_le(void *dst, const unsigned long *src, int nbits);
                (1UL<<((nbits) % BITS_PER_LONG))-1 : ~0UL               \
 )
+#define small_const_nbits(nbits) \
+        (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG)
 static inline void bitmap_zero(unsigned long *dst, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                *dst = 0UL;
        else {
                int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
@@ -150,7 +153,7 @@ static inline void bitmap_zero(unsigned long *dst, int nbits)
 static inline void bitmap_fill(unsigned long *dst, int nbits)
 {
        size_t nlongs = BITS_TO_LONGS(nbits);
-        if (nlongs > 1) {
+        if (!small_const_nbits(nbits)) {
                int len = (nlongs - 1) * sizeof(unsigned long);
                memset(dst, 0xff,  len);
        }
@@ -160,7 +163,7 @@ static inline void bitmap_fill(unsigned long *dst, int nbits)
 static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,
                        int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                *dst = *src;
        else {
                int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
@@ -171,7 +174,7 @@ static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,
 static inline void bitmap_and(unsigned long *dst, const unsigned long *src1,
                        const unsigned long *src2, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                *dst = *src1 & *src2;
        else
                __bitmap_and(dst, src1, src2, nbits);
@@ -180,7 +183,7 @@ static inline void bitmap_and(unsigned long *dst, const unsigned long *src1,
 static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,
                        const unsigned long *src2, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                *dst = *src1 | *src2;
        else
                __bitmap_or(dst, src1, src2, nbits);
@@ -189,7 +192,7 @@ static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,
 static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1,
                        const unsigned long *src2, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                *dst = *src1 ^ *src2;
        else
                __bitmap_xor(dst, src1, src2, nbits);
@@ -198,7 +201,7 @@ static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1,
 static inline void bitmap_andnot(unsigned long *dst, const unsigned long *src1,
                        const unsigned long *src2, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                *dst = *src1 & ~(*src2);
        else
                __bitmap_andnot(dst, src1, src2, nbits);
@@ -207,7 +210,7 @@ static inline void bitmap_andnot(unsigned long *dst, const unsigned long *src1,
 static inline void bitmap_complement(unsigned long *dst, const unsigned long *src,
                        int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                *dst = ~(*src) & BITMAP_LAST_WORD_MASK(nbits);
        else
                __bitmap_complement(dst, src, nbits);
@@ -216,7 +219,7 @@ static inline void bitmap_complement(unsigned long *dst, const unsigned long *sr
 static inline int bitmap_equal(const unsigned long *src1,
                        const unsigned long *src2, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                return ! ((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits));
        else
                return __bitmap_equal(src1, src2, nbits);
@@ -225,7 +228,7 @@ static inline int bitmap_equal(const unsigned long *src1,
 static inline int bitmap_intersects(const unsigned long *src1,
                        const unsigned long *src2, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                return ((*src1 & *src2) & BITMAP_LAST_WORD_MASK(nbits)) != 0;
        else
                return __bitmap_intersects(src1, src2, nbits);
@@ -234,7 +237,7 @@ static inline int bitmap_intersects(const unsigned long *src1,
 static inline int bitmap_subset(const unsigned long *src1,
                        const unsigned long *src2, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                return ! ((*src1 & ~(*src2)) & BITMAP_LAST_WORD_MASK(nbits));
        else
                return __bitmap_subset(src1, src2, nbits);
@@ -242,7 +245,7 @@ static inline int bitmap_subset(const unsigned long *src1,
 static inline int bitmap_empty(const unsigned long *src, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                return ! (*src & BITMAP_LAST_WORD_MASK(nbits));
        else
                return __bitmap_empty(src, nbits);
@@ -250,7 +253,7 @@ static inline int bitmap_empty(const unsigned long *src, int nbits)
 static inline int bitmap_full(const unsigned long *src, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits));
        else
                return __bitmap_full(src, nbits);
@@ -258,7 +261,7 @@ static inline int bitmap_full(const unsigned long *src, int nbits)
 static inline int bitmap_weight(const unsigned long *src, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
        return __bitmap_weight(src, nbits);
 }
@@ -266,7 +269,7 @@ static inline int bitmap_weight(const unsigned long *src, int nbits)
 static inline void bitmap_shift_right(unsigned long *dst,
                        const unsigned long *src, int n, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                *dst = *src >> n;
        else
                __bitmap_shift_right(dst, src, n, nbits);
@@ -275,7 +278,7 @@ static inline void bitmap_shift_right(unsigned long *dst,
 static inline void bitmap_shift_left(unsigned long *dst,
                        const unsigned long *src, int n, int nbits)
 {
-        if (nbits <= BITS_PER_LONG)
+        if (small_const_nbits(nbits))
                *dst = (*src << n) & BITMAP_LAST_WORD_MASK(nbits);
        else
                __bitmap_shift_left(dst, src, n, nbits);
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 024f2b027244..61829139795a 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -134,9 +134,20 @@ extern unsigned long find_first_bit(const unsigned long *addr,
 */
 extern unsigned long find_first_zero_bit(const unsigned long *addr,
                                         unsigned long size);
 #endif /* CONFIG_GENERIC_FIND_FIRST_BIT */
+#ifdef CONFIG_GENERIC_FIND_LAST_BIT
+/**
+ * find_last_bit - find the last set bit in a memory region
+ * @addr: The address to start the search at
+ * @size: The maximum size to search
+ *
+ * Returns the bit number of the first set bit, or size.
+ */
+extern unsigned long find_last_bit(const unsigned long *addr,
+                                   unsigned long size);
+#endif /* CONFIG_GENERIC_FIND_LAST_BIT */
 #ifdef CONFIG_GENERIC_FIND_NEXT_BIT
 /**
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 031a315c0509..7035cec583b6 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -26,7 +26,6 @@ struct scsi_ioctl_command;
 struct request_queue;
 struct elevator_queue;
-typedef struct elevator_queue elevator_t;
 struct request_pm_state;
 struct blk_trace;
 struct request;
@@ -313,7 +312,7 @@ struct request_queue
         */
        struct list_head        queue_head;
        struct request          *last_merge;
-        elevator_t              *elevator;
+        struct elevator_queue   *elevator;
        /*
         * the queue request freelist, one for reads and one for writes
@@ -449,6 +448,7 @@ struct request_queue
 #define QUEUE_FLAG_FAIL_IO     12       /* fake timeout */
 #define QUEUE_FLAG_STACKABLE   13       /* supports request stacking */
 #define QUEUE_FLAG_NONROT      14       /* non-rotational device (SSD) */
+#define QUEUE_FLAG_VIRT        QUEUE_FLAG_NONROT /* paravirt device */
 static inline int queue_is_locked(struct request_queue *q)
 {
@@ -522,22 +522,32 @@ enum {
         * TAG_FLUSH    : ordering by tag w/ pre and post flushes
         * TAG_FUA      : ordering by tag w/ pre flush and FUA write
         */
-        QUEUE_ORDERED_NONE      = 0x00,
+        QUEUE_ORDERED_BY_DRAIN          = 0x01,
-        QUEUE_ORDERED_DRAIN     = 0x01,
+        QUEUE_ORDERED_BY_TAG            = 0x02,
-        QUEUE_ORDERED_TAG       = 0x02,
+        QUEUE_ORDERED_DO_PREFLUSH       = 0x10,
+        QUEUE_ORDERED_DO_BAR            = 0x20,
-        QUEUE_ORDERED_PREFLUSH  = 0x10,
+        QUEUE_ORDERED_DO_POSTFLUSH      = 0x40,
-        QUEUE_ORDERED_POSTFLUSH = 0x20,
+        QUEUE_ORDERED_DO_FUA            = 0x80,
-        QUEUE_ORDERED_FUA       = 0x40,
+        QUEUE_ORDERED_NONE              = 0x00,
-        QUEUE_ORDERED_DRAIN_FLUSH = QUEUE_ORDERED_DRAIN |
-                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_POSTFLUSH,
+        QUEUE_ORDERED_DRAIN             = QUEUE_ORDERED_BY_DRAIN |
-        QUEUE_ORDERED_DRAIN_FUA = QUEUE_ORDERED_DRAIN |
+                                          QUEUE_ORDERED_DO_BAR,
-                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_FUA,
+        QUEUE_ORDERED_DRAIN_FLUSH       = QUEUE_ORDERED_DRAIN |
-        QUEUE_ORDERED_TAG_FLUSH = QUEUE_ORDERED_TAG |
+                                          QUEUE_ORDERED_DO_PREFLUSH |
-                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_POSTFLUSH,
+                                          QUEUE_ORDERED_DO_POSTFLUSH,
-        QUEUE_ORDERED_TAG_FUA   = QUEUE_ORDERED_TAG |
+        QUEUE_ORDERED_DRAIN_FUA         = QUEUE_ORDERED_DRAIN |
-                        QUEUE_ORDERED_PREFLUSH | QUEUE_ORDERED_FUA,
+                                          QUEUE_ORDERED_DO_PREFLUSH |
+                                          QUEUE_ORDERED_DO_FUA,
+        QUEUE_ORDERED_TAG               = QUEUE_ORDERED_BY_TAG |
+                                          QUEUE_ORDERED_DO_BAR,
+        QUEUE_ORDERED_TAG_FLUSH         = QUEUE_ORDERED_TAG |
+                                          QUEUE_ORDERED_DO_PREFLUSH |
+                                          QUEUE_ORDERED_DO_POSTFLUSH,
+        QUEUE_ORDERED_TAG_FUA           = QUEUE_ORDERED_TAG |
+                                          QUEUE_ORDERED_DO_PREFLUSH |
+                                          QUEUE_ORDERED_DO_FUA,
        /*
         * Ordered operation sequence
@@ -585,7 +595,6 @@ enum {
 #define blk_fua_rq(rq)          ((rq)->cmd_flags & REQ_FUA)
 #define blk_discard_rq(rq)      ((rq)->cmd_flags & REQ_DISCARD)
 #define blk_bidi_rq(rq)         ((rq)->next_rq != NULL)
-#define blk_empty_barrier(rq)   (blk_barrier_rq(rq) && blk_fs_request(rq) && !(rq)->hard_nr_sectors)
 /* rq->queuelist of dequeued request must be list_empty() */
 #define blk_queued_rq(rq)       (!list_empty(&(rq)->queuelist))
@@ -855,10 +864,10 @@ extern void blk_queue_rq_timed_out(struct request_queue *, rq_timed_out_fn *);
 extern void blk_queue_rq_timeout(struct request_queue *, unsigned int);
 extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev);
 extern int blk_queue_ordered(struct request_queue *, unsigned, prepare_flush_fn *);
-extern int blk_do_ordered(struct request_queue *, struct request **);
+extern bool blk_do_ordered(struct request_queue *, struct request **);
 extern unsigned blk_ordered_cur_seq(struct request_queue *);
 extern unsigned blk_ordered_req_seq(struct request *);
-extern void blk_ordered_complete_seq(struct request_queue *, unsigned, int);
+extern bool blk_ordered_complete_seq(struct request_queue *, unsigned, int);
 extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *);
 extern void blk_dump_rq_flags(struct request *, char *);
@@ -977,7 +986,6 @@ static inline void put_dev_sector(Sector p)
 struct work_struct;
 int kblockd_schedule_work(struct request_queue *q, struct work_struct *work);
-void kblockd_flush_work(struct work_struct *work);
 #define MODULE_ALIAS_BLOCKDEV(major,minor) \
        MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index bdf505d33e77..1dba3493d520 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -160,7 +160,6 @@ struct blk_trace {
 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
 extern void blk_trace_shutdown(struct request_queue *);
-extern void __blk_add_trace(struct blk_trace *, sector_t, int, int, u32, int, int, void *);
 extern int do_blk_trace_setup(struct request_queue *q,
        char *name, dev_t dev, struct blk_user_trace_setup *buts);
 extern void __trace_note_message(struct blk_trace *, const char *fmt, ...);
@@ -186,168 +185,8 @@ extern void __trace_note_message(struct blk_trace *, const char *fmt, ...);
        } while (0)
 #define BLK_TN_MAX_MSG          128
-/**
+extern void blk_add_driver_data(struct request_queue *q, struct request *rq,
- * blk_add_trace_rq - Add a trace for a request oriented action
+                                void *data, size_t len);
- * @q:          queue the io is for
- * @rq:         the source request
- * @what:       the action
- *
- * Description:
- *     Records an action against a request. Will log the bio offset + size.
- *
- **/
-static inline void blk_add_trace_rq(struct request_queue *q, struct request *rq,
-                                    u32 what)
-{
-        struct blk_trace *bt = q->blk_trace;
-        int rw = rq->cmd_flags & 0x03;
-        if (likely(!bt))
-                return;
-        if (blk_discard_rq(rq))
-                rw |= (1 << BIO_RW_DISCARD);
-        if (blk_pc_request(rq)) {
-                what |= BLK_TC_ACT(BLK_TC_PC);
-                __blk_add_trace(bt, 0, rq->data_len, rw, what, rq->errors, sizeof(rq->cmd), rq->cmd);
-        } else  {
-                what |= BLK_TC_ACT(BLK_TC_FS);
-                __blk_add_trace(bt, rq->hard_sector, rq->hard_nr_sectors << 9, rw, what, rq->errors, 0, NULL);
-        }
-}
-/**
- * blk_add_trace_bio - Add a trace for a bio oriented action
- * @q:          queue the io is for
- * @bio:        the source bio
- * @what:       the action
- *
- * Description:
- *     Records an action against a bio. Will log the bio offset + size.
- *
- **/
-static inline void blk_add_trace_bio(struct request_queue *q, struct bio *bio,
-                                     u32 what)
-{
-        struct blk_trace *bt = q->blk_trace;
-        if (likely(!bt))
-                return;
-        __blk_add_trace(bt, bio->bi_sector, bio->bi_size, bio->bi_rw, what, !bio_flagged(bio, BIO_UPTODATE), 0, NULL);
-}
-/**
- * blk_add_trace_generic - Add a trace for a generic action
- * @q:          queue the io is for
- * @bio:        the source bio
- * @rw:         the data direction
- * @what:       the action
- *
- * Description:
- *     Records a simple trace
- *
- **/
-static inline void blk_add_trace_generic(struct request_queue *q,
-                                         struct bio *bio, int rw, u32 what)
-{
-        struct blk_trace *bt = q->blk_trace;
-        if (likely(!bt))
-                return;
-        if (bio)
-                blk_add_trace_bio(q, bio, what);
-        else
-                __blk_add_trace(bt, 0, 0, rw, what, 0, 0, NULL);
-}
-/**
- * blk_add_trace_pdu_int - Add a trace for a bio with an integer payload
- * @q:          queue the io is for
- * @what:       the action
- * @bio:        the source bio
- * @pdu:        the integer payload
- *
- * Description:
- *     Adds a trace with some integer payload. This might be an unplug
- *     option given as the action, with the depth at unplug time given
- *     as the payload
- *
- **/
-static inline void blk_add_trace_pdu_int(struct request_queue *q, u32 what,
-                                         struct bio *bio, unsigned int pdu)
-{
-        struct blk_trace *bt = q->blk_trace;
-        __be64 rpdu = cpu_to_be64(pdu);
-        if (likely(!bt))
-                return;
-        if (bio)
-                __blk_add_trace(bt, bio->bi_sector, bio->bi_size, bio->bi_rw, what, !bio_flagged(bio, BIO_UPTODATE), sizeof(rpdu), &rpdu);
-        else
-                __blk_add_trace(bt, 0, 0, 0, what, 0, sizeof(rpdu), &rpdu);
-}
-/**
- * blk_add_trace_remap - Add a trace for a remap operation
- * @q:          queue the io is for
- * @bio:        the source bio
- * @dev:        target device
- * @from:       source sector
- * @to:         target sector
- *
- * Description:
- *     Device mapper or raid target sometimes need to split a bio because
- *     it spans a stripe (or similar). Add a trace for that action.
- *
- **/
-static inline void blk_add_trace_remap(struct request_queue *q, struct bio *bio,
-                                       dev_t dev, sector_t from, sector_t to)
-{
-        struct blk_trace *bt = q->blk_trace;
-        struct blk_io_trace_remap r;
-        if (likely(!bt))
-                return;
-        r.device = cpu_to_be32(dev);
-        r.device_from = cpu_to_be32(bio->bi_bdev->bd_dev);
-        r.sector = cpu_to_be64(to);
-        __blk_add_trace(bt, from, bio->bi_size, bio->bi_rw, BLK_TA_REMAP, !bio_flagged(bio, BIO_UPTODATE), sizeof(r), &r);
-}
-/**
- * blk_add_driver_data - Add binary message with driver-specific data
- * @q:          queue the io is for
- * @rq:         io request
- * @data:       driver-specific data
- * @len:        length of driver-specific data
- *
- * Description:
- *     Some drivers might want to write driver-specific data per request.
- *
- **/
-static inline void blk_add_driver_data(struct request_queue *q,
-                                       struct request *rq,
-                                       void *data, size_t len)
-{
-        struct blk_trace *bt = q->blk_trace;
-        if (likely(!bt))
-                return;
-        if (blk_pc_request(rq))
-                __blk_add_trace(bt, 0, rq->data_len, 0, BLK_TA_DRV_DATA,
-                                rq->errors, len, data);
-        else
-                __blk_add_trace(bt, rq->hard_sector, rq->hard_nr_sectors << 9,
-                                0, BLK_TA_DRV_DATA, rq->errors, len, data);
-}
 extern int blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
                           char __user *arg);
 extern int blk_trace_startstop(struct request_queue *q, int start);
@@ -356,13 +195,8 @@ extern int blk_trace_remove(struct request_queue *q);
 #else /* !CONFIG_BLK_DEV_IO_TRACE */
 #define blk_trace_ioctl(bdev, cmd, arg)         (-ENOTTY)
 #define blk_trace_shutdown(q)                   do { } while (0)
-#define blk_add_trace_rq(q, rq, what)           do { } while (0)
-#define blk_add_trace_bio(q, rq, what)          do { } while (0)
-#define blk_add_trace_generic(q, rq, rw, what)  do { } while (0)
-#define blk_add_trace_pdu_int(q, what, bio, pdu)        do { } while (0)
-#define blk_add_trace_remap(q, bio, dev, f, t)  do {} while (0)
-#define blk_add_driver_data(q, rq, data, len)   do {} while (0)
 #define do_blk_trace_setup(q, name, dev, buts)  (-ENOTTY)
+#define blk_add_driver_data(q, rq, data, len)   do {} while (0)
 #define blk_trace_setup(q, name, dev, arg)      (-ENOTTY)
 #define blk_trace_startstop(q, start)           (-ENOTTY)
 #define blk_trace_remove(q)                     (-ENOTTY)
diff --git a/include/linux/blockgroup_lock.h b/include/linux/blockgroup_lock.h
index 8607312983bd..e44b88ba552b 100644
--- a/include/linux/blockgroup_lock.h
+++ b/include/linux/blockgroup_lock.h
@@ -53,7 +53,10 @@ static inline void bgl_lock_init(struct blockgroup_lock *bgl)
 * The accessor is a macro so we can embed a blockgroup_lock into different
 * superblock types
 */
-#define sb_bgl_lock(sb, block_group) \
+static inline spinlock_t *
-        (&(sb)->s_blockgroup_lock.locks[(block_group) & (NR_BG_LOCKS-1)].lock)
+bgl_lock_ptr(struct blockgroup_lock *bgl, unsigned int block_group)
+{
+        return &bgl->locks[(block_group) & (NR_BG_LOCKS-1)].lock;
+}
 #endif
diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h
index 777dbf695d44..27b1bcffe408 100644
--- a/include/linux/bottom_half.h
+++ b/include/linux/bottom_half.h
@@ -2,7 +2,6 @@
 #define _LINUX_BH_H
 extern void local_bh_disable(void);
-extern void __local_bh_enable(void);
 extern void _local_bh_enable(void);
 extern void local_bh_enable(void);
 extern void local_bh_enable_ip(unsigned long ip);
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 3ce64b90118c..8605f8a74df9 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -35,6 +35,7 @@ enum bh_state_bits {
        BH_Ordered,     /* ordered write */
        BH_Eopnotsupp,  /* operation not supported (barrier) */
        BH_Unwritten,   /* Buffer is allocated on disk but not written */
+        BH_Quiet,       /* Buffer Error Prinks to be quiet */
        BH_PrivateStart,/* not a state bit, but the first bit available
                         * for private allocation by other entities
diff --git a/include/linux/capability.h b/include/linux/capability.h
index 9d1fe30b6f6c..e22f48c2a46f 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -53,6 +53,7 @@ typedef struct __user_cap_data_struct {
 #define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX
 #define VFS_CAP_REVISION_MASK   0xFF000000
+#define VFS_CAP_REVISION_SHIFT  24
 #define VFS_CAP_FLAGS_MASK      ~VFS_CAP_REVISION_MASK
 #define VFS_CAP_FLAGS_EFFECTIVE 0x000001
@@ -68,6 +69,9 @@ typedef struct __user_cap_data_struct {
 #define VFS_CAP_U32             VFS_CAP_U32_2
 #define VFS_CAP_REVISION        VFS_CAP_REVISION_2
+#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
+extern int file_caps_enabled;
+#endif
 struct vfs_cap_data {
        __le32 magic_etc;            /* Little endian */
@@ -96,6 +100,13 @@ typedef struct kernel_cap_struct {
        __u32 cap[_KERNEL_CAPABILITY_U32S];
 } kernel_cap_t;
+/* exact same as vfs_cap_data but in cpu endian and always filled completely */
+struct cpu_vfs_cap_data {
+        __u32 magic_etc;
+        kernel_cap_t permitted;
+        kernel_cap_t inheritable;
+};
 #define _USER_CAP_HEADER_SIZE  (sizeof(struct __user_cap_header_struct))
 #define _KERNEL_CAP_T_SIZE     (sizeof(kernel_cap_t))
@@ -454,6 +465,13 @@ static inline int cap_isclear(const kernel_cap_t a)
        return 1;
 }
+/*
+ * Check if "a" is a subset of "set".
+ * return 1 if ALL of the capabilities in "a" are also in "set"
+ *      cap_issubset(0101, 1111) will return 1
+ * return 0 if ANY of the capabilities in "a" are not in "set"
+ *      cap_issubset(1111, 0101) will return 0
+ */
 static inline int cap_issubset(const kernel_cap_t a, const kernel_cap_t set)
 {
        kernel_cap_t dest;
@@ -501,8 +519,6 @@ extern const kernel_cap_t __cap_empty_set;
 extern const kernel_cap_t __cap_full_set;
 extern const kernel_cap_t __cap_init_eff_set;
-kernel_cap_t cap_set_effective(const kernel_cap_t pE_new);
 /**
 * has_capability - Determine if a task has a superior capability available
 * @t: The task in question
@@ -514,9 +530,14 @@ kernel_cap_t cap_set_effective(const kernel_cap_t pE_new);
 * Note that this does not set PF_SUPERPRIV on the task.
 */
 #define has_capability(t, cap) (security_capable((t), (cap)) == 0)
+#define has_capability_noaudit(t, cap) (security_capable_noaudit((t), (cap)) == 0)
 extern int capable(int cap);
+/* audit system wants to get cap info from files as well */
+struct dentry;
+extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
 #endif /* __KERNEL__ */
 #endif /* !_LINUX_CAPABILITY_H */
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index 9c22396e8b50..9c8d31bacf46 100644
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -54,3 +54,9 @@ SUBSYS(freezer)
 #endif
 /* */
+#ifdef CONFIG_NET_CLS_CGROUP
+SUBSYS(net_cls)
+#endif
+/* */
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index ed3a5d473e52..cea153697ec7 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -82,13 +82,13 @@ struct clock_event_device {
        int                     shift;
        int                     rating;
        int                     irq;
-        cpumask_t               cpumask;
+        const struct cpumask    *cpumask;
        int                     (*set_next_event)(unsigned long evt,
                                                  struct clock_event_device *);
        void                    (*set_mode)(enum clock_event_mode mode,
                                            struct clock_event_device *);
        void                    (*event_handler)(struct clock_event_device *);
-        void                    (*broadcast)(cpumask_t mask);
+        void                    (*broadcast)(const struct cpumask *mask);
        struct list_head        list;
        enum clock_event_mode   mode;
        ktime_t                 next_event;
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 5c8351b859f0..af40f8eb86f0 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -61,3 +61,8 @@
 #define  noinline                       __attribute__((noinline))
 #define __attribute_const__             __attribute__((__const__))
 #define __maybe_unused                  __attribute__((unused))
+#define __gcc_header(x) #x
+#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
+#define gcc_header(x) _gcc_header(x)
+#include gcc_header(__GNUC__)
diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h
index e5eb795f78a1..8005effc04f1 100644
--- a/include/linux/compiler-gcc3.h
+++ b/include/linux/compiler-gcc3.h
@@ -2,8 +2,9 @@
 #error "Please don't include <linux/compiler-gcc3.h> directly, include <linux/compiler.h> instead."
 #endif
-/* These definitions are for GCC v3.x.  */
+#if __GNUC_MINOR__ < 2
-#include <linux/compiler-gcc.h>
+# error Sorry, your compiler is too old - please upgrade it.
+#endif
 #if __GNUC_MINOR__ >= 3
 # define __used                 __attribute__((__used__))
diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index 974f5b7bb205..09992718f9e8 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -2,8 +2,10 @@
 #error "Please don't include <linux/compiler-gcc4.h> directly, include <linux/compiler.h> instead."
 #endif
-/* These definitions are for GCC v4.x.  */
+/* GCC 4.1.[01] miscompiles __weak */
-#include <linux/compiler-gcc.h>
+#if __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ <= 1
+# error Your version of gcc miscompiles the __weak directive
+#endif
 #define __used                  __attribute__((__used__))
 #define __must_check            __attribute__((warn_unused_result))
@@ -16,7 +18,7 @@
 */
 #define uninitialized_var(x) x = x
-#if !(__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+#if __GNUC_MINOR__ >= 3
 /* Mark functions as cold. gcc will assume any path leading to a call
   to them will be unlikely.  This means a lot of manual unlikely()s
   are unnecessary now for any paths leading to the usual suspects
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 98115d9d04da..d95da1020f1c 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -36,12 +36,8 @@ extern void __chk_io_ptr(const volatile void __iomem *);
 #ifdef __KERNEL__
-#if __GNUC__ >= 4
+#ifdef __GNUC__
-# include <linux/compiler-gcc4.h>
+#include <linux/compiler-gcc.h>
-#elif __GNUC__ == 3 && __GNUC_MINOR__ >= 2
-# include <linux/compiler-gcc3.h>
-#else
-# error Sorry, your compiler is too old/not recognized.
 #endif
 #define notrace __attribute__((no_instrument_function))
@@ -59,8 +55,88 @@ extern void __chk_io_ptr(const volatile void __iomem *);
 * specific implementations come from the above header files
 */
-#define likely(x)       __builtin_expect(!!(x), 1)
+struct ftrace_branch_data {
-#define unlikely(x)     __builtin_expect(!!(x), 0)
+        const char *func;
+        const char *file;
+        unsigned line;
+        union {
+                struct {
+                        unsigned long correct;
+                        unsigned long incorrect;
+                };
+                struct {
+                        unsigned long miss;
+                        unsigned long hit;
+                };
+        };
+};
+/*
+ * Note: DISABLE_BRANCH_PROFILING can be used by special lowlevel code
+ * to disable branch tracing on a per file basis.
+ */
+#if defined(CONFIG_TRACE_BRANCH_PROFILING) && !defined(DISABLE_BRANCH_PROFILING)
+void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+#define likely_notrace(x)       __builtin_expect(!!(x), 1)
+#define unlikely_notrace(x)     __builtin_expect(!!(x), 0)
+#define __branch_check__(x, expect) ({                                  \
+                        int ______r;                                    \
+                        static struct ftrace_branch_data                \
+                                __attribute__((__aligned__(4)))         \
+                                __attribute__((section("_ftrace_annotated_branch"))) \
+                                ______f = {                             \
+                                .func = __func__,                       \
+                                .file = __FILE__,                       \
+                                .line = __LINE__,                       \
+                        };                                              \
+                        ______r = likely_notrace(x);                    \
+                        ftrace_likely_update(&______f, ______r, expect); \
+                        ______r;                                        \
+                })
+/*
+ * Using __builtin_constant_p(x) to ignore cases where the return
+ * value is always the same.  This idea is taken from a similar patch
+ * written by Daniel Walker.
+ */
+# ifndef likely
+#  define likely(x)     (__builtin_constant_p(x) ? !!(x) : __branch_check__(x, 1))
+# endif
+# ifndef unlikely
+#  define unlikely(x)   (__builtin_constant_p(x) ? !!(x) : __branch_check__(x, 0))
+# endif
+#ifdef CONFIG_PROFILE_ALL_BRANCHES
+/*
+ * "Define 'is'", Bill Clinton
+ * "Define 'if'", Steven Rostedt
+ */
+#define if(cond) if (__builtin_constant_p((cond)) ? !!(cond) :          \
+        ({                                                              \
+                int ______r;                                            \
+                static struct ftrace_branch_data                        \
+                        __attribute__((__aligned__(4)))                 \
+                        __attribute__((section("_ftrace_branch")))      \
+                        ______f = {                                     \
+                                .func = __func__,                       \
+                                .file = __FILE__,                       \
+                                .line = __LINE__,                       \
+                        };                                              \
+                ______r = !!(cond);                                     \
+                if (______r)                                            \
+                        ______f.hit++;                                  \
+                else                                                    \
+                        ______f.miss++;                                 \
+                ______r;                                                \
+        }))
+#endif /* CONFIG_PROFILE_ALL_BRANCHES */
+#else
+# define likely(x)      __builtin_expect(!!(x), 1)
+# define unlikely(x)    __builtin_expect(!!(x), 0)
+#endif
 /* Optimization barrier */
 #ifndef barrier
diff --git a/include/linux/console.h b/include/linux/console.h
index 248e6e3b9b73..a67a90cf8268 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -153,4 +153,8 @@ void vcs_remove_sysfs(struct tty_struct *tty);
 #define VESA_HSYNC_SUSPEND      2
 #define VESA_POWERDOWN          3
+#ifdef CONFIG_VGA_CONSOLE
+extern bool vgacon_text_force(void);
+#endif
 #endif /* _LINUX_CONSOLE_H */
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 21e1dd43e52a..9f315382610b 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -144,6 +144,7 @@
 typedef struct cpumask { DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t;
 extern cpumask_t _unused_cpumask_arg_;
+#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
 #define cpu_set(cpu, dst) __cpu_set((cpu), &(dst))
 static inline void __cpu_set(int cpu, volatile cpumask_t *dstp)
 {
@@ -267,6 +268,26 @@ static inline void __cpus_shift_left(cpumask_t *dstp,
 {
        bitmap_shift_left(dstp->bits, srcp->bits, n, nbits);
 }
+#endif /* !CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS */
+/**
+ * to_cpumask - convert an NR_CPUS bitmap to a struct cpumask *
+ * @bitmap: the bitmap
+ *
+ * There are a few places where cpumask_var_t isn't appropriate and
+ * static cpumasks must be used (eg. very early boot), yet we don't
+ * expose the definition of 'struct cpumask'.
+ *
+ * This does the conversion, and can be used as a constant initializer.
+ */
+#define to_cpumask(bitmap)                                              \
+        ((struct cpumask *)(1 ? (bitmap)                                \
+                            : (void *)sizeof(__check_is_bitmap(bitmap))))
+static inline int __check_is_bitmap(const unsigned long *bitmap)
+{
+        return 1;
+}
 /*
 * Special-case data structure for "single bit set only" constant CPU masks.
@@ -278,13 +299,14 @@ static inline void __cpus_shift_left(cpumask_t *dstp,
 extern const unsigned long
        cpu_bit_bitmap[BITS_PER_LONG+1][BITS_TO_LONGS(NR_CPUS)];
-static inline const cpumask_t *get_cpu_mask(unsigned int cpu)
+static inline const struct cpumask *get_cpu_mask(unsigned int cpu)
 {
        const unsigned long *p = cpu_bit_bitmap[1 + cpu % BITS_PER_LONG];
        p -= cpu / BITS_PER_LONG;
-        return (const cpumask_t *)p;
+        return to_cpumask(p);
 }
+#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
 /*
 * In cases where we take the address of the cpumask immediately,
 * gcc optimizes it out (it's a constant) and there's no huge stack
@@ -339,36 +361,6 @@ extern cpumask_t cpu_mask_all;
 #endif
 #define CPUMASK_PTR(v, m)       cpumask_t *v = &(m->v)
-#define cpumask_scnprintf(buf, len, src) \
-                        __cpumask_scnprintf((buf), (len), &(src), NR_CPUS)
-static inline int __cpumask_scnprintf(char *buf, int len,
-                                        const cpumask_t *srcp, int nbits)
-{
-        return bitmap_scnprintf(buf, len, srcp->bits, nbits);
-}
-#define cpumask_parse_user(ubuf, ulen, dst) \
-                        __cpumask_parse_user((ubuf), (ulen), &(dst), NR_CPUS)
-static inline int __cpumask_parse_user(const char __user *buf, int len,
-                                        cpumask_t *dstp, int nbits)
-{
-        return bitmap_parse_user(buf, len, dstp->bits, nbits);
-}
-#define cpulist_scnprintf(buf, len, src) \
-                        __cpulist_scnprintf((buf), (len), &(src), NR_CPUS)
-static inline int __cpulist_scnprintf(char *buf, int len,
-                                        const cpumask_t *srcp, int nbits)
-{
-        return bitmap_scnlistprintf(buf, len, srcp->bits, nbits);
-}
-#define cpulist_parse(buf, dst) __cpulist_parse((buf), &(dst), NR_CPUS)
-static inline int __cpulist_parse(const char *buf, cpumask_t *dstp, int nbits)
-{
-        return bitmap_parselist(buf, dstp->bits, nbits);
-}
 #define cpu_remap(oldbit, old, new) \
                __cpu_remap((oldbit), &(old), &(new), NR_CPUS)
 static inline int __cpu_remap(int oldbit,
@@ -400,19 +392,22 @@ static inline void __cpus_fold(cpumask_t *dstp, const cpumask_t *origp,
 {
        bitmap_fold(dstp->bits, origp->bits, sz, nbits);
 }
+#endif /* !CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS */
 #if NR_CPUS == 1
 #define nr_cpu_ids              1
+#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
 #define first_cpu(src)          ({ (void)(src); 0; })
 #define next_cpu(n, src)        ({ (void)(src); 1; })
 #define any_online_cpu(mask)    0
 #define for_each_cpu_mask(cpu, mask)    \
        for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)
+#endif /* !CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS */
 #else /* NR_CPUS > 1 */
 extern int nr_cpu_ids;
+#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
 int __first_cpu(const cpumask_t *srcp);
 int __next_cpu(int n, const cpumask_t *srcp);
 int __any_online_cpu(const cpumask_t *mask);
@@ -424,8 +419,10 @@ int __any_online_cpu(const cpumask_t *mask);
        for ((cpu) = -1;                                \
                (cpu) = next_cpu((cpu), (mask)),        \
                (cpu) < NR_CPUS; )
+#endif /* !CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS */
 #endif
+#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
 #if NR_CPUS <= 64
 #define next_cpu_nr(n, src)             next_cpu(n, src)
@@ -443,77 +440,67 @@ int __next_cpu_nr(int n, const cpumask_t *srcp);
                (cpu) < nr_cpu_ids; )
 #endif /* NR_CPUS > 64 */
+#endif /* !CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS */
 /*
 * The following particular system cpumasks and operations manage
- * possible, present, active and online cpus.  Each of them is a fixed size
+ * possible, present, active and online cpus.
- * bitmap of size NR_CPUS.
 *
- *  #ifdef CONFIG_HOTPLUG_CPU
+ *     cpu_possible_mask- has bit 'cpu' set iff cpu is populatable
- *     cpu_possible_map - has bit 'cpu' set iff cpu is populatable
+ *     cpu_present_mask - has bit 'cpu' set iff cpu is populated
- *     cpu_present_map  - has bit 'cpu' set iff cpu is populated
+ *     cpu_online_mask  - has bit 'cpu' set iff cpu available to scheduler
- *     cpu_online_map   - has bit 'cpu' set iff cpu available to scheduler
+ *     cpu_active_mask  - has bit 'cpu' set iff cpu available to migration
- *     cpu_active_map   - has bit 'cpu' set iff cpu available to migration
- *  #else
- *     cpu_possible_map - has bit 'cpu' set iff cpu is populated
- *     cpu_present_map  - copy of cpu_possible_map
- *     cpu_online_map   - has bit 'cpu' set iff cpu available to scheduler
- *  #endif
 *
- *  In either case, NR_CPUS is fixed at compile time, as the static
+ *  If !CONFIG_HOTPLUG_CPU, present == possible, and active == online.
- *  size of these bitmaps.  The cpu_possible_map is fixed at boot
- *  time, as the set of CPU id's that it is possible might ever
- *  be plugged in at anytime during the life of that system boot.
- *  The cpu_present_map is dynamic(*), representing which CPUs
- *  are currently plugged in.  And cpu_online_map is the dynamic
- *  subset of cpu_present_map, indicating those CPUs available
- *  for scheduling.
 *
- *  If HOTPLUG is enabled, then cpu_possible_map is forced to have
+ *  The cpu_possible_mask is fixed at boot time, as the set of CPU id's
+ *  that it is possible might ever be plugged in at anytime during the
+ *  life of that system boot.  The cpu_present_mask is dynamic(*),
+ *  representing which CPUs are currently plugged in.  And
+ *  cpu_online_mask is the dynamic subset of cpu_present_mask,
+ *  indicating those CPUs available for scheduling.
+ *
+ *  If HOTPLUG is enabled, then cpu_possible_mask is forced to have
 *  all NR_CPUS bits set, otherwise it is just the set of CPUs that
 *  ACPI reports present at boot.
 *
- *  If HOTPLUG is enabled, then cpu_present_map varies dynamically,
+ *  If HOTPLUG is enabled, then cpu_present_mask varies dynamically,
 *  depending on what ACPI reports as currently plugged in, otherwise
- *  cpu_present_map is just a copy of cpu_possible_map.
+ *  cpu_present_mask is just a copy of cpu_possible_mask.
 *
- *  (*) Well, cpu_present_map is dynamic in the hotplug case.  If not
+ *  (*) Well, cpu_present_mask is dynamic in the hotplug case.  If not
- *      hotplug, it's a copy of cpu_possible_map, hence fixed at boot.
+ *      hotplug, it's a copy of cpu_possible_mask, hence fixed at boot.
 *
 * Subtleties:
 * 1) UP arch's (NR_CPUS == 1, CONFIG_SMP not defined) hardcode
 *    assumption that their single CPU is online.  The UP
- *    cpu_{online,possible,present}_maps are placebos.  Changing them
+ *    cpu_{online,possible,present}_masks are placebos.  Changing them
 *    will have no useful affect on the following num_*_cpus()
 *    and cpu_*() macros in the UP case.  This ugliness is a UP
 *    optimization - don't waste any instructions or memory references
 *    asking if you're online or how many CPUs there are if there is
 *    only one CPU.
- * 2) Most SMP arch's #define some of these maps to be some
- *    other map specific to that arch.  Therefore, the following
- *    must be #define macros, not inlines.  To see why, examine
- *    the assembly code produced by the following.  Note that
- *    set1() writes phys_x_map, but set2() writes x_map:
- *        int x_map, phys_x_map;
- *        #define set1(a) x_map = a
- *        inline void set2(int a) { x_map = a; }
- *        #define x_map phys_x_map
- *        main(){ set1(3); set2(5); }
 */
-extern cpumask_t cpu_possible_map;
+extern const struct cpumask *const cpu_possible_mask;
-extern cpumask_t cpu_online_map;
+extern const struct cpumask *const cpu_online_mask;
-extern cpumask_t cpu_present_map;
+extern const struct cpumask *const cpu_present_mask;
-extern cpumask_t cpu_active_map;
+extern const struct cpumask *const cpu_active_mask;
+/* These strip const, as traditionally they weren't const. */
+#define cpu_possible_map        (*(cpumask_t *)cpu_possible_mask)
+#define cpu_online_map          (*(cpumask_t *)cpu_online_mask)
+#define cpu_present_map         (*(cpumask_t *)cpu_present_mask)
+#define cpu_active_map          (*(cpumask_t *)cpu_active_mask)
 #if NR_CPUS > 1
-#define num_online_cpus()       cpus_weight_nr(cpu_online_map)
+#define num_online_cpus()       cpumask_weight(cpu_online_mask)
-#define num_possible_cpus()     cpus_weight_nr(cpu_possible_map)
+#define num_possible_cpus()     cpumask_weight(cpu_possible_mask)
-#define num_present_cpus()      cpus_weight_nr(cpu_present_map)
+#define num_present_cpus()      cpumask_weight(cpu_present_mask)
-#define cpu_online(cpu)         cpu_isset((cpu), cpu_online_map)
+#define cpu_online(cpu)         cpumask_test_cpu((cpu), cpu_online_mask)
-#define cpu_possible(cpu)       cpu_isset((cpu), cpu_possible_map)
+#define cpu_possible(cpu)       cpumask_test_cpu((cpu), cpu_possible_mask)
-#define cpu_present(cpu)        cpu_isset((cpu), cpu_present_map)
+#define cpu_present(cpu)        cpumask_test_cpu((cpu), cpu_present_mask)
-#define cpu_active(cpu)         cpu_isset((cpu), cpu_active_map)
+#define cpu_active(cpu)         cpumask_test_cpu((cpu), cpu_active_mask)
 #else
 #define num_online_cpus()       1
 #define num_possible_cpus()     1
@@ -526,10 +513,6 @@ extern cpumask_t cpu_active_map;
 #define cpu_is_offline(cpu)     unlikely(!cpu_online(cpu))
-#define for_each_possible_cpu(cpu) for_each_cpu_mask_nr((cpu), cpu_possible_map)
-#define for_each_online_cpu(cpu)   for_each_cpu_mask_nr((cpu), cpu_online_map)
-#define for_each_present_cpu(cpu)  for_each_cpu_mask_nr((cpu), cpu_present_map)
 /* These are the new versions of the cpumask operators: passed by pointer.
 * The older versions will be implemented in terms of these, then deleted. */
 #define cpumask_bits(maskp) ((maskp)->bits)
@@ -540,9 +523,6 @@ extern cpumask_t cpu_active_map;
        [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD \
 }
-/* This produces more efficient code. */
-#define nr_cpumask_bits NR_CPUS
 #else /* NR_CPUS > BITS_PER_LONG */
 #define CPU_BITS_ALL                                            \
@@ -550,9 +530,15 @@ extern cpumask_t cpu_active_map;
        [0 ... BITS_TO_LONGS(NR_CPUS)-2] = ~0UL,                \
        [BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD         \
 }
+#endif /* NR_CPUS > BITS_PER_LONG */
+#ifdef CONFIG_CPUMASK_OFFSTACK
+/* Assuming NR_CPUS is huge, a runtime limit is more efficient.  Also,
+ * not all bits may be allocated. */
 #define nr_cpumask_bits nr_cpu_ids
-#endif /* NR_CPUS > BITS_PER_LONG */
+#else
+#define nr_cpumask_bits NR_CPUS
+#endif
 /* verify cpu argument to cpumask_* operators */
 static inline unsigned int cpumask_check(unsigned int cpu)
@@ -714,7 +700,7 @@ static inline void cpumask_clear_cpu(int cpu, struct cpumask *dstp)
 * No static inline type checking - see Subtlety (1) above.
 */
 #define cpumask_test_cpu(cpu, cpumask) \
-        test_bit(cpumask_check(cpu), (cpumask)->bits)
+        test_bit(cpumask_check(cpu), cpumask_bits((cpumask)))
 /**
 * cpumask_test_and_set_cpu - atomically test and set a cpu in a cpumask
@@ -946,22 +932,61 @@ static inline void cpumask_copy(struct cpumask *dstp,
 #define cpumask_of(cpu) (get_cpu_mask(cpu))
 /**
- * to_cpumask - convert an NR_CPUS bitmap to a struct cpumask *
+ * cpumask_scnprintf - print a cpumask into a string as comma-separated hex
- * @bitmap: the bitmap
+ * @buf: the buffer to sprintf into
+ * @len: the length of the buffer
+ * @srcp: the cpumask to print
 *
- * There are a few places where cpumask_var_t isn't appropriate and
+ * If len is zero, returns zero.  Otherwise returns the length of the
- * static cpumasks must be used (eg. very early boot), yet we don't
+ * (nul-terminated) @buf string.
- * expose the definition of 'struct cpumask'.
+ */
+static inline int cpumask_scnprintf(char *buf, int len,
+                                    const struct cpumask *srcp)
+{
+        return bitmap_scnprintf(buf, len, cpumask_bits(srcp), nr_cpumask_bits);
+}
+/**
+ * cpumask_parse_user - extract a cpumask from a user string
+ * @buf: the buffer to extract from
+ * @len: the length of the buffer
+ * @dstp: the cpumask to set.
 *
- * This does the conversion, and can be used as a constant initializer.
+ * Returns -errno, or 0 for success.
 */
-#define to_cpumask(bitmap)                                              \
+static inline int cpumask_parse_user(const char __user *buf, int len,
-        ((struct cpumask *)(1 ? (bitmap)                                \
+                                     struct cpumask *dstp)
-                            : (void *)sizeof(__check_is_bitmap(bitmap))))
+{
+        return bitmap_parse_user(buf, len, cpumask_bits(dstp), nr_cpumask_bits);
+}
-static inline int __check_is_bitmap(const unsigned long *bitmap)
+/**
+ * cpulist_scnprintf - print a cpumask into a string as comma-separated list
+ * @buf: the buffer to sprintf into
+ * @len: the length of the buffer
+ * @srcp: the cpumask to print
+ *
+ * If len is zero, returns zero.  Otherwise returns the length of the
+ * (nul-terminated) @buf string.
+ */
+static inline int cpulist_scnprintf(char *buf, int len,
+                                    const struct cpumask *srcp)
 {
-        return 1;
+        return bitmap_scnlistprintf(buf, len, cpumask_bits(srcp),
+                                    nr_cpumask_bits);
+}
+/**
+ * cpulist_parse_user - extract a cpumask from a user string of ranges
+ * @buf: the buffer to extract from
+ * @len: the length of the buffer
+ * @dstp: the cpumask to set.
+ *
+ * Returns -errno, or 0 for success.
+ */
+static inline int cpulist_parse(const char *buf, struct cpumask *dstp)
+{
+        return bitmap_parselist(buf, cpumask_bits(dstp), nr_cpumask_bits);
 }
 /**
@@ -995,6 +1020,7 @@ static inline size_t cpumask_size(void)
 #ifdef CONFIG_CPUMASK_OFFSTACK
 typedef struct cpumask *cpumask_var_t;
+bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node);
 bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags);
 void alloc_bootmem_cpumask_var(cpumask_var_t *mask);
 void free_cpumask_var(cpumask_var_t mask);
@@ -1008,6 +1034,12 @@ static inline bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)
        return true;
 }
+static inline bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags,
+                                          int node)
+{
+        return true;
+}
 static inline void alloc_bootmem_cpumask_var(cpumask_var_t *mask)
 {
 }
@@ -1021,12 +1053,6 @@ static inline void free_bootmem_cpumask_var(cpumask_var_t mask)
 }
 #endif /* CONFIG_CPUMASK_OFFSTACK */
-/* The pointer versions of the maps, these will become the primary versions. */
-#define cpu_possible_mask ((const struct cpumask *)&cpu_possible_map)
-#define cpu_online_mask ((const struct cpumask *)&cpu_online_map)
-#define cpu_present_mask ((const struct cpumask *)&cpu_present_map)
-#define cpu_active_mask ((const struct cpumask *)&cpu_active_map)
 /* It's common to want to use cpu_all_mask in struct member initializers,
 * so it has to refer to an address rather than a pointer. */
 extern const DECLARE_BITMAP(cpu_all_bits, NR_CPUS);
@@ -1035,51 +1061,16 @@ extern const DECLARE_BITMAP(cpu_all_bits, NR_CPUS);
 /* First bits of cpu_bit_bitmap are in fact unset. */
 #define cpu_none_mask to_cpumask(cpu_bit_bitmap[0])
-/* Wrappers for arch boot code to manipulate normally-constant masks */
+#define for_each_possible_cpu(cpu) for_each_cpu((cpu), cpu_possible_mask)
-static inline void set_cpu_possible(unsigned int cpu, bool possible)
+#define for_each_online_cpu(cpu)   for_each_cpu((cpu), cpu_online_mask)
-{
+#define for_each_present_cpu(cpu)  for_each_cpu((cpu), cpu_present_mask)
-        if (possible)
-                cpumask_set_cpu(cpu, &cpu_possible_map);
-        else
-                cpumask_clear_cpu(cpu, &cpu_possible_map);
-}
-static inline void set_cpu_present(unsigned int cpu, bool present)
-{
-        if (present)
-                cpumask_set_cpu(cpu, &cpu_present_map);
-        else
-                cpumask_clear_cpu(cpu, &cpu_present_map);
-}
-static inline void set_cpu_online(unsigned int cpu, bool online)
-{
-        if (online)
-                cpumask_set_cpu(cpu, &cpu_online_map);
-        else
-                cpumask_clear_cpu(cpu, &cpu_online_map);
-}
-static inline void set_cpu_active(unsigned int cpu, bool active)
-{
-        if (active)
-                cpumask_set_cpu(cpu, &cpu_active_map);
-        else
-                cpumask_clear_cpu(cpu, &cpu_active_map);
-}
-static inline void init_cpu_present(const struct cpumask *src)
-{
-        cpumask_copy(&cpu_present_map, src);
-}
-static inline void init_cpu_possible(const struct cpumask *src)
-{
-        cpumask_copy(&cpu_possible_map, src);
-}
-static inline void init_cpu_online(const struct cpumask *src)
+/* Wrappers for arch boot code to manipulate normally-constant masks */
-{
+void set_cpu_possible(unsigned int cpu, bool possible);
-        cpumask_copy(&cpu_online_map, src);
+void set_cpu_present(unsigned int cpu, bool present);
-}
+void set_cpu_online(unsigned int cpu, bool online);
+void set_cpu_active(unsigned int cpu, bool active);
+void init_cpu_present(const struct cpumask *src);
+void init_cpu_possible(const struct cpumask *src);
+void init_cpu_online(const struct cpumask *src);
 #endif /* __LINUX_CPUMASK_H */
diff --git a/include/linux/crc32c.h b/include/linux/crc32c.h
index 508f512e5a2f..bd8b44d96bdc 100644
--- a/include/linux/crc32c.h
+++ b/include/linux/crc32c.h
@@ -3,9 +3,9 @@
 #include <linux/types.h>
-extern u32 crc32c_le(u32 crc, unsigned char const *address, size_t length);
+extern u32 crc32c(u32 crc, const void *address, unsigned int length);
-extern u32 crc32c_be(u32 crc, unsigned char const *address, size_t length);
-#define crc32c(seed, data, length)  crc32c_le(seed, (unsigned char const *)data, length)
+/* This macro exists for backwards-compatibility. */
+#define crc32c_le crc32c
 #endif  /* _LINUX_CRC32C_H */
diff --git a/include/linux/cred.h b/include/linux/cred.h
index b69222cc1fd2..3282ee4318e7 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -1,4 +1,4 @@
-/* Credentials management
+/* Credentials management - see Documentation/credentials.txt
 *
 * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
 * Written by David Howells (dhowells@redhat.com)
@@ -12,39 +12,335 @@
 #ifndef _LINUX_CRED_H
 #define _LINUX_CRED_H
-#define get_current_user()      (get_uid(current->user))
+#include <linux/capability.h>
+#include <linux/key.h>
+#include <asm/atomic.h>
-#define task_uid(task)          ((task)->uid)
+struct user_struct;
-#define task_gid(task)          ((task)->gid)
+struct cred;
-#define task_euid(task)         ((task)->euid)
+struct inode;
-#define task_egid(task)         ((task)->egid)
-#define current_uid()           (current->uid)
+/*
-#define current_gid()           (current->gid)
+ * COW Supplementary groups list
-#define current_euid()          (current->euid)
+ */
-#define current_egid()          (current->egid)
+#define NGROUPS_SMALL           32
-#define current_suid()          (current->suid)
+#define NGROUPS_PER_BLOCK       ((unsigned int)(PAGE_SIZE / sizeof(gid_t)))
-#define current_sgid()          (current->sgid)
-#define current_fsuid()         (current->fsuid)
+struct group_info {
-#define current_fsgid()         (current->fsgid)
+        atomic_t        usage;
-#define current_cap()           (current->cap_effective)
+        int             ngroups;
+        int             nblocks;
+        gid_t           small_block[NGROUPS_SMALL];
+        gid_t           *blocks[0];
+};
+/**
+ * get_group_info - Get a reference to a group info structure
+ * @group_info: The group info to reference
+ *
+ * This gets a reference to a set of supplementary groups.
+ *
+ * If the caller is accessing a task's credentials, they must hold the RCU read
+ * lock when reading.
+ */
+static inline struct group_info *get_group_info(struct group_info *gi)
+{
+        atomic_inc(&gi->usage);
+        return gi;
+}
+/**
+ * put_group_info - Release a reference to a group info structure
+ * @group_info: The group info to release
+ */
+#define put_group_info(group_info)                      \
+do {                                                    \
+        if (atomic_dec_and_test(&(group_info)->usage))  \
+                groups_free(group_info);                \
+} while (0)
+extern struct group_info *groups_alloc(int);
+extern struct group_info init_groups;
+extern void groups_free(struct group_info *);
+extern int set_current_groups(struct group_info *);
+extern int set_groups(struct cred *, struct group_info *);
+extern int groups_search(const struct group_info *, gid_t);
+/* access the groups "array" with this macro */
+#define GROUP_AT(gi, i) \
+        ((gi)->blocks[(i) / NGROUPS_PER_BLOCK][(i) % NGROUPS_PER_BLOCK])
+extern int in_group_p(gid_t);
+extern int in_egroup_p(gid_t);
+/*
+ * The common credentials for a thread group
+ * - shared by CLONE_THREAD
+ */
+#ifdef CONFIG_KEYS
+struct thread_group_cred {
+        atomic_t        usage;
+        pid_t           tgid;                   /* thread group process ID */
+        spinlock_t      lock;
+        struct key      *session_keyring;       /* keyring inherited over fork */
+        struct key      *process_keyring;       /* keyring private to this process */
+        struct rcu_head rcu;                    /* RCU deletion hook */
+};
+#endif
+/*
+ * The security context of a task
+ *
+ * The parts of the context break down into two categories:
+ *
+ *  (1) The objective context of a task.  These parts are used when some other
+ *      task is attempting to affect this one.
+ *
+ *  (2) The subjective context.  These details are used when the task is acting
+ *      upon another object, be that a file, a task, a key or whatever.
+ *
+ * Note that some members of this structure belong to both categories - the
+ * LSM security pointer for instance.
+ *
+ * A task has two security pointers.  task->real_cred points to the objective
+ * context that defines that task's actual details.  The objective part of this
+ * context is used whenever that task is acted upon.
+ *
+ * task->cred points to the subjective context that defines the details of how
+ * that task is going to act upon another object.  This may be overridden
+ * temporarily to point to another security context, but normally points to the
+ * same context as task->real_cred.
+ */
+struct cred {
+        atomic_t        usage;
+        uid_t           uid;            /* real UID of the task */
+        gid_t           gid;            /* real GID of the task */
+        uid_t           suid;           /* saved UID of the task */
+        gid_t           sgid;           /* saved GID of the task */
+        uid_t           euid;           /* effective UID of the task */
+        gid_t           egid;           /* effective GID of the task */
+        uid_t           fsuid;          /* UID for VFS ops */
+        gid_t           fsgid;          /* GID for VFS ops */
+        unsigned        securebits;     /* SUID-less security management */
+        kernel_cap_t    cap_inheritable; /* caps our children can inherit */
+        kernel_cap_t    cap_permitted;  /* caps we're permitted */
+        kernel_cap_t    cap_effective;  /* caps we can actually use */
+        kernel_cap_t    cap_bset;       /* capability bounding set */
+#ifdef CONFIG_KEYS
+        unsigned char   jit_keyring;    /* default keyring to attach requested
+                                         * keys to */
+        struct key      *thread_keyring; /* keyring private to this thread */
+        struct key      *request_key_auth; /* assumed request_key authority */
+        struct thread_group_cred *tgcred; /* thread-group shared credentials */
+#endif
+#ifdef CONFIG_SECURITY
+        void            *security;      /* subjective LSM security */
+#endif
+        struct user_struct *user;       /* real user ID subscription */
+        struct group_info *group_info;  /* supplementary groups for euid/fsgid */
+        struct rcu_head rcu;            /* RCU deletion hook */
+};
+extern void __put_cred(struct cred *);
+extern int copy_creds(struct task_struct *, unsigned long);
+extern struct cred *prepare_creds(void);
+extern struct cred *prepare_exec_creds(void);
+extern struct cred *prepare_usermodehelper_creds(void);
+extern int commit_creds(struct cred *);
+extern void abort_creds(struct cred *);
+extern const struct cred *override_creds(const struct cred *);
+extern void revert_creds(const struct cred *);
+extern struct cred *prepare_kernel_cred(struct task_struct *);
+extern int change_create_files_as(struct cred *, struct inode *);
+extern int set_security_override(struct cred *, u32);
+extern int set_security_override_from_ctx(struct cred *, const char *);
+extern int set_create_files_as(struct cred *, struct inode *);
+extern void __init cred_init(void);
+/**
+ * get_new_cred - Get a reference on a new set of credentials
+ * @cred: The new credentials to reference
+ *
+ * Get a reference on the specified set of new credentials.  The caller must
+ * release the reference.
+ */
+static inline struct cred *get_new_cred(struct cred *cred)
+{
+        atomic_inc(&cred->usage);
+        return cred;
+}
+/**
+ * get_cred - Get a reference on a set of credentials
+ * @cred: The credentials to reference
+ *
+ * Get a reference on the specified set of credentials.  The caller must
+ * release the reference.
+ *
+ * This is used to deal with a committed set of credentials.  Although the
+ * pointer is const, this will temporarily discard the const and increment the
+ * usage count.  The purpose of this is to attempt to catch at compile time the
+ * accidental alteration of a set of credentials that should be considered
+ * immutable.
+ */
+static inline const struct cred *get_cred(const struct cred *cred)
+{
+        return get_new_cred((struct cred *) cred);
+}
+/**
+ * put_cred - Release a reference to a set of credentials
+ * @cred: The credentials to release
+ *
+ * Release a reference to a set of credentials, deleting them when the last ref
+ * is released.
+ *
+ * This takes a const pointer to a set of credentials because the credentials
+ * on task_struct are attached by const pointers to prevent accidental
+ * alteration of otherwise immutable credential sets.
+ */
+static inline void put_cred(const struct cred *_cred)
+{
+        struct cred *cred = (struct cred *) _cred;
+        BUG_ON(atomic_read(&(cred)->usage) <= 0);
+        if (atomic_dec_and_test(&(cred)->usage))
+                __put_cred(cred);
+}
+/**
+ * current_cred - Access the current task's subjective credentials
+ *
+ * Access the subjective credentials of the current task.
+ */
+#define current_cred() \
+        (current->cred)
+/**
+ * __task_cred - Access a task's objective credentials
+ * @task: The task to query
+ *
+ * Access the objective credentials of a task.  The caller must hold the RCU
+ * readlock.
+ *
+ * The caller must make sure task doesn't go away, either by holding a ref on
+ * task or by holding tasklist_lock to prevent it from being unlinked.
+ */
+#define __task_cred(task) \
+        ((const struct cred *)(rcu_dereference((task)->real_cred)))
+/**
+ * get_task_cred - Get another task's objective credentials
+ * @task: The task to query
+ *
+ * Get the objective credentials of a task, pinning them so that they can't go
+ * away.  Accessing a task's credentials directly is not permitted.
+ *
+ * The caller must make sure task doesn't go away, either by holding a ref on
+ * task or by holding tasklist_lock to prevent it from being unlinked.
+ */
+#define get_task_cred(task)                             \
+({                                                      \
+        struct cred *__cred;                            \
+        rcu_read_lock();                                \
+        __cred = (struct cred *) __task_cred((task));   \
+        get_cred(__cred);                               \
+        rcu_read_unlock();                              \
+        __cred;                                         \
+})
+/**
+ * get_current_cred - Get the current task's subjective credentials
+ *
+ * Get the subjective credentials of the current task, pinning them so that
+ * they can't go away.  Accessing the current task's credentials directly is
+ * not permitted.
+ */
+#define get_current_cred()                              \
+        (get_cred(current_cred()))
+/**
+ * get_current_user - Get the current task's user_struct
+ *
+ * Get the user record of the current task, pinning it so that it can't go
+ * away.
+ */
+#define get_current_user()                              \
+({                                                      \
+        struct user_struct *__u;                        \
+        struct cred *__cred;                            \
+        __cred = (struct cred *) current_cred();        \
+        __u = get_uid(__cred->user);                    \
+        __u;                                            \
+})
+/**
+ * get_current_groups - Get the current task's supplementary group list
+ *
+ * Get the supplementary group list of the current task, pinning it so that it
+ * can't go away.
+ */
+#define get_current_groups()                            \
+({                                                      \
+        struct group_info *__groups;                    \
+        struct cred *__cred;                            \
+        __cred = (struct cred *) current_cred();        \
+        __groups = get_group_info(__cred->group_info);  \
+        __groups;                                       \
+})
+#define task_cred_xxx(task, xxx)                        \
+({                                                      \
+        __typeof__(((struct cred *)NULL)->xxx) ___val;  \
+        rcu_read_lock();                                \
+        ___val = __task_cred((task))->xxx;              \
+        rcu_read_unlock();                              \
+        ___val;                                         \
+})
+#define task_uid(task)          (task_cred_xxx((task), uid))
+#define task_euid(task)         (task_cred_xxx((task), euid))
+#define current_cred_xxx(xxx)                   \
+({                                              \
+        current->cred->xxx;                     \
+})
+#define current_uid()           (current_cred_xxx(uid))
+#define current_gid()           (current_cred_xxx(gid))
+#define current_euid()          (current_cred_xxx(euid))
+#define current_egid()          (current_cred_xxx(egid))
+#define current_suid()          (current_cred_xxx(suid))
+#define current_sgid()          (current_cred_xxx(sgid))
+#define current_fsuid()         (current_cred_xxx(fsuid))
+#define current_fsgid()         (current_cred_xxx(fsgid))
+#define current_cap()           (current_cred_xxx(cap_effective))
+#define current_user()          (current_cred_xxx(user))
+#define current_user_ns()       (current_cred_xxx(user)->user_ns)
+#define current_security()      (current_cred_xxx(security))
 #define current_uid_gid(_uid, _gid)             \
 do {                                            \
-        *(_uid) = current->uid;                 \
+        const struct cred *__cred;              \
-        *(_gid) = current->gid;                 \
+        __cred = current_cred();                \
+        *(_uid) = __cred->uid;                  \
+        *(_gid) = __cred->gid;                  \
 } while(0)
-#define current_euid_egid(_uid, _gid)           \
+#define current_euid_egid(_euid, _egid)         \
 do {                                            \
-        *(_uid) = current->euid;                \
+        const struct cred *__cred;              \
-        *(_gid) = current->egid;                \
+        __cred = current_cred();                \
+        *(_euid) = __cred->euid;                \
+        *(_egid) = __cred->egid;                \
 } while(0)
-#define current_fsuid_fsgid(_uid, _gid)         \
+#define current_fsuid_fsgid(_fsuid, _fsgid)     \
 do {                                            \
-        *(_uid) = current->fsuid;               \
+        const struct cred *__cred;              \
-        *(_gid) = current->fsgid;               \
+        __cred = current_cred();                \
+        *(_fsuid) = __cred->fsuid;              \
+        *(_fsgid) = __cred->fsgid;              \
 } while(0)
 #endif /* _LINUX_CRED_H */
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 3d2317e4af2e..3bacd71509fb 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -36,7 +36,8 @@
 #define CRYPTO_ALG_TYPE_ABLKCIPHER      0x00000005
 #define CRYPTO_ALG_TYPE_GIVCIPHER       0x00000006
 #define CRYPTO_ALG_TYPE_DIGEST          0x00000008
-#define CRYPTO_ALG_TYPE_HASH            0x00000009
+#define CRYPTO_ALG_TYPE_HASH            0x00000008
+#define CRYPTO_ALG_TYPE_SHASH           0x00000009
 #define CRYPTO_ALG_TYPE_AHASH           0x0000000a
 #define CRYPTO_ALG_TYPE_RNG             0x0000000c
@@ -220,6 +221,7 @@ struct ablkcipher_alg {
 struct ahash_alg {
        int (*init)(struct ahash_request *req);
+        int (*reinit)(struct ahash_request *req);
        int (*update)(struct ahash_request *req);
        int (*final)(struct ahash_request *req);
        int (*digest)(struct ahash_request *req);
@@ -480,6 +482,8 @@ struct crypto_tfm {
                struct compress_tfm compress;
                struct rng_tfm rng;
        } crt_u;
+        void (*exit)(struct crypto_tfm *tfm);
        
        struct crypto_alg *__crt_alg;
@@ -544,7 +548,9 @@ struct crypto_attr_u32 {
 * Transform user interface.
 */
 
-struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, u32 tfm_flags);
+struct crypto_tfm *crypto_alloc_tfm(const char *alg_name,
+                                    const struct crypto_type *frontend,
+                                    u32 type, u32 mask);
 struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask);
 void crypto_free_tfm(struct crypto_tfm *tfm);
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index a37359d0bad1..c66d22487bf8 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -75,14 +75,22 @@ full_name_hash(const unsigned char *name, unsigned int len)
        return end_name_hash(hash);
 }
-struct dcookie_struct;
+/*
+ * Try to keep struct dentry aligned on 64 byte cachelines (this will
-#define DNAME_INLINE_LEN_MIN 36
+ * give reasonable cacheline footprint with larger lines without the
+ * large memory footprint increase).
+ */
+#ifdef CONFIG_64BIT
+#define DNAME_INLINE_LEN_MIN 32 /* 192 bytes */
+#else
+#define DNAME_INLINE_LEN_MIN 40 /* 128 bytes */
+#endif
 struct dentry {
        atomic_t d_count;
        unsigned int d_flags;           /* protected by d_lock */
        spinlock_t d_lock;              /* per dentry lock */
+        int d_mounted;
        struct inode *d_inode;          /* Where the name belongs to - NULL is
                                         * negative */
        /*
@@ -107,10 +115,7 @@ struct dentry {
        struct dentry_operations *d_op;
        struct super_block *d_sb;       /* The root of the dentry tree */
        void *d_fsdata;                 /* fs-specific data */
-#ifdef CONFIG_PROFILING
-        struct dcookie_struct *d_cookie; /* cookie, if any */
-#endif
-        int d_mounted;
        unsigned char d_iname[DNAME_INLINE_LEN_MIN];    /* small names */
 };
@@ -177,6 +182,8 @@ d_iput:		no		no		no       yes
 #define DCACHE_INOTIFY_PARENT_WATCHED   0x0020 /* Parent inode is watched */
+#define DCACHE_COOKIE           0x0040  /* For use by dcookie subsystem */
 extern spinlock_t dcache_lock;
 extern seqlock_t rename_lock;
diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h
new file mode 100644
index 000000000000..b0ef274e0031
--- /dev/null
+++ b/include/linux/dcbnl.h
@@ -0,0 +1,340 @@
+/*
+ * Copyright (c) 2008, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * Author: Lucy Liu <lucy.liu@intel.com>
+ */
+#ifndef __LINUX_DCBNL_H__
+#define __LINUX_DCBNL_H__
+#define DCB_PROTO_VERSION 1
+struct dcbmsg {
+        unsigned char      dcb_family;
+        __u8               cmd;
+        __u16              dcb_pad;
+};
+/**
+ * enum dcbnl_commands - supported DCB commands
+ *
+ * @DCB_CMD_UNDEFINED: unspecified command to catch errors
+ * @DCB_CMD_GSTATE: request the state of DCB in the device
+ * @DCB_CMD_SSTATE: set the state of DCB in the device
+ * @DCB_CMD_PGTX_GCFG: request the priority group configuration for Tx
+ * @DCB_CMD_PGTX_SCFG: set the priority group configuration for Tx
+ * @DCB_CMD_PGRX_GCFG: request the priority group configuration for Rx
+ * @DCB_CMD_PGRX_SCFG: set the priority group configuration for Rx
+ * @DCB_CMD_PFC_GCFG: request the priority flow control configuration
+ * @DCB_CMD_PFC_SCFG: set the priority flow control configuration
+ * @DCB_CMD_SET_ALL: apply all changes to the underlying device
+ * @DCB_CMD_GPERM_HWADDR: get the permanent MAC address of the underlying
+ *                        device.  Only useful when using bonding.
+ * @DCB_CMD_GCAP: request the DCB capabilities of the device
+ * @DCB_CMD_GNUMTCS: get the number of traffic classes currently supported
+ * @DCB_CMD_SNUMTCS: set the number of traffic classes
+ * @DCB_CMD_GBCN: set backward congestion notification configuration
+ * @DCB_CMD_SBCN: get backward congestion notification configration.
+ */
+enum dcbnl_commands {
+        DCB_CMD_UNDEFINED,
+        DCB_CMD_GSTATE,
+        DCB_CMD_SSTATE,
+        DCB_CMD_PGTX_GCFG,
+        DCB_CMD_PGTX_SCFG,
+        DCB_CMD_PGRX_GCFG,
+        DCB_CMD_PGRX_SCFG,
+        DCB_CMD_PFC_GCFG,
+        DCB_CMD_PFC_SCFG,
+        DCB_CMD_SET_ALL,
+        DCB_CMD_GPERM_HWADDR,
+        DCB_CMD_GCAP,
+        DCB_CMD_GNUMTCS,
+        DCB_CMD_SNUMTCS,
+        DCB_CMD_PFC_GSTATE,
+        DCB_CMD_PFC_SSTATE,
+        DCB_CMD_BCN_GCFG,
+        DCB_CMD_BCN_SCFG,
+        __DCB_CMD_ENUM_MAX,
+        DCB_CMD_MAX = __DCB_CMD_ENUM_MAX - 1,
+};
+/**
+ * enum dcbnl_attrs - DCB top-level netlink attributes
+ *
+ * @DCB_ATTR_UNDEFINED: unspecified attribute to catch errors
+ * @DCB_ATTR_IFNAME: interface name of the underlying device (NLA_STRING)
+ * @DCB_ATTR_STATE: enable state of DCB in the device (NLA_U8)
+ * @DCB_ATTR_PFC_STATE: enable state of PFC in the device (NLA_U8)
+ * @DCB_ATTR_PFC_CFG: priority flow control configuration (NLA_NESTED)
+ * @DCB_ATTR_NUM_TC: number of traffic classes supported in the device (NLA_U8)
+ * @DCB_ATTR_PG_CFG: priority group configuration (NLA_NESTED)
+ * @DCB_ATTR_SET_ALL: bool to commit changes to hardware or not (NLA_U8)
+ * @DCB_ATTR_PERM_HWADDR: MAC address of the physical device (NLA_NESTED)
+ * @DCB_ATTR_CAP: DCB capabilities of the device (NLA_NESTED)
+ * @DCB_ATTR_NUMTCS: number of traffic classes supported (NLA_NESTED)
+ * @DCB_ATTR_BCN: backward congestion notification configuration (NLA_NESTED)
+ */
+enum dcbnl_attrs {
+        DCB_ATTR_UNDEFINED,
+        DCB_ATTR_IFNAME,
+        DCB_ATTR_STATE,
+        DCB_ATTR_PFC_STATE,
+        DCB_ATTR_PFC_CFG,
+        DCB_ATTR_NUM_TC,
+        DCB_ATTR_PG_CFG,
+        DCB_ATTR_SET_ALL,
+        DCB_ATTR_PERM_HWADDR,
+        DCB_ATTR_CAP,
+        DCB_ATTR_NUMTCS,
+        DCB_ATTR_BCN,
+        __DCB_ATTR_ENUM_MAX,
+        DCB_ATTR_MAX = __DCB_ATTR_ENUM_MAX - 1,
+};
+/**
+ * enum dcbnl_pfc_attrs - DCB Priority Flow Control user priority nested attrs
+ *
+ * @DCB_PFC_UP_ATTR_UNDEFINED: unspecified attribute to catch errors
+ * @DCB_PFC_UP_ATTR_0: Priority Flow Control value for User Priority 0 (NLA_U8)
+ * @DCB_PFC_UP_ATTR_1: Priority Flow Control value for User Priority 1 (NLA_U8)
+ * @DCB_PFC_UP_ATTR_2: Priority Flow Control value for User Priority 2 (NLA_U8)
+ * @DCB_PFC_UP_ATTR_3: Priority Flow Control value for User Priority 3 (NLA_U8)
+ * @DCB_PFC_UP_ATTR_4: Priority Flow Control value for User Priority 4 (NLA_U8)
+ * @DCB_PFC_UP_ATTR_5: Priority Flow Control value for User Priority 5 (NLA_U8)
+ * @DCB_PFC_UP_ATTR_6: Priority Flow Control value for User Priority 6 (NLA_U8)
+ * @DCB_PFC_UP_ATTR_7: Priority Flow Control value for User Priority 7 (NLA_U8)
+ * @DCB_PFC_UP_ATTR_MAX: highest attribute number currently defined
+ * @DCB_PFC_UP_ATTR_ALL: apply to all priority flow control attrs (NLA_FLAG)
+ *
+ */
+enum dcbnl_pfc_up_attrs {
+        DCB_PFC_UP_ATTR_UNDEFINED,
+        DCB_PFC_UP_ATTR_0,
+        DCB_PFC_UP_ATTR_1,
+        DCB_PFC_UP_ATTR_2,
+        DCB_PFC_UP_ATTR_3,
+        DCB_PFC_UP_ATTR_4,
+        DCB_PFC_UP_ATTR_5,
+        DCB_PFC_UP_ATTR_6,
+        DCB_PFC_UP_ATTR_7,
+        DCB_PFC_UP_ATTR_ALL,
+        __DCB_PFC_UP_ATTR_ENUM_MAX,
+        DCB_PFC_UP_ATTR_MAX = __DCB_PFC_UP_ATTR_ENUM_MAX - 1,
+};
+/**
+ * enum dcbnl_pg_attrs - DCB Priority Group attributes
+ *
+ * @DCB_PG_ATTR_UNDEFINED: unspecified attribute to catch errors
+ * @DCB_PG_ATTR_TC_0: Priority Group Traffic Class 0 configuration (NLA_NESTED)
+ * @DCB_PG_ATTR_TC_1: Priority Group Traffic Class 1 configuration (NLA_NESTED)
+ * @DCB_PG_ATTR_TC_2: Priority Group Traffic Class 2 configuration (NLA_NESTED)
+ * @DCB_PG_ATTR_TC_3: Priority Group Traffic Class 3 configuration (NLA_NESTED)
+ * @DCB_PG_ATTR_TC_4: Priority Group Traffic Class 4 configuration (NLA_NESTED)
+ * @DCB_PG_ATTR_TC_5: Priority Group Traffic Class 5 configuration (NLA_NESTED)
+ * @DCB_PG_ATTR_TC_6: Priority Group Traffic Class 6 configuration (NLA_NESTED)
+ * @DCB_PG_ATTR_TC_7: Priority Group Traffic Class 7 configuration (NLA_NESTED)
+ * @DCB_PG_ATTR_TC_MAX: highest attribute number currently defined
+ * @DCB_PG_ATTR_TC_ALL: apply to all traffic classes (NLA_NESTED)
+ * @DCB_PG_ATTR_BW_ID_0: Percent of link bandwidth for Priority Group 0 (NLA_U8)
+ * @DCB_PG_ATTR_BW_ID_1: Percent of link bandwidth for Priority Group 1 (NLA_U8)
+ * @DCB_PG_ATTR_BW_ID_2: Percent of link bandwidth for Priority Group 2 (NLA_U8)
+ * @DCB_PG_ATTR_BW_ID_3: Percent of link bandwidth for Priority Group 3 (NLA_U8)
+ * @DCB_PG_ATTR_BW_ID_4: Percent of link bandwidth for Priority Group 4 (NLA_U8)
+ * @DCB_PG_ATTR_BW_ID_5: Percent of link bandwidth for Priority Group 5 (NLA_U8)
+ * @DCB_PG_ATTR_BW_ID_6: Percent of link bandwidth for Priority Group 6 (NLA_U8)
+ * @DCB_PG_ATTR_BW_ID_7: Percent of link bandwidth for Priority Group 7 (NLA_U8)
+ * @DCB_PG_ATTR_BW_ID_MAX: highest attribute number currently defined
+ * @DCB_PG_ATTR_BW_ID_ALL: apply to all priority groups (NLA_FLAG)
+ *
+ */
+enum dcbnl_pg_attrs {
+        DCB_PG_ATTR_UNDEFINED,
+        DCB_PG_ATTR_TC_0,
+        DCB_PG_ATTR_TC_1,
+        DCB_PG_ATTR_TC_2,
+        DCB_PG_ATTR_TC_3,
+        DCB_PG_ATTR_TC_4,
+        DCB_PG_ATTR_TC_5,
+        DCB_PG_ATTR_TC_6,
+        DCB_PG_ATTR_TC_7,
+        DCB_PG_ATTR_TC_MAX,
+        DCB_PG_ATTR_TC_ALL,
+        DCB_PG_ATTR_BW_ID_0,
+        DCB_PG_ATTR_BW_ID_1,
+        DCB_PG_ATTR_BW_ID_2,
+        DCB_PG_ATTR_BW_ID_3,
+        DCB_PG_ATTR_BW_ID_4,
+        DCB_PG_ATTR_BW_ID_5,
+        DCB_PG_ATTR_BW_ID_6,
+        DCB_PG_ATTR_BW_ID_7,
+        DCB_PG_ATTR_BW_ID_MAX,
+        DCB_PG_ATTR_BW_ID_ALL,
+        __DCB_PG_ATTR_ENUM_MAX,
+        DCB_PG_ATTR_MAX = __DCB_PG_ATTR_ENUM_MAX - 1,
+};
+/**
+ * enum dcbnl_tc_attrs - DCB Traffic Class attributes
+ *
+ * @DCB_TC_ATTR_PARAM_UNDEFINED: unspecified attribute to catch errors
+ * @DCB_TC_ATTR_PARAM_PGID: (NLA_U8) Priority group the traffic class belongs to
+ *                          Valid values are:  0-7
+ * @DCB_TC_ATTR_PARAM_UP_MAPPING: (NLA_U8) Traffic class to user priority map
+ *                                Some devices may not support changing the
+ *                                user priority map of a TC.
+ * @DCB_TC_ATTR_PARAM_STRICT_PRIO: (NLA_U8) Strict priority setting
+ *                                 0 - none
+ *                                 1 - group strict
+ *                                 2 - link strict
+ * @DCB_TC_ATTR_PARAM_BW_PCT: optional - (NLA_U8) If supported by the device and
+ *                            not configured to use link strict priority,
+ *                            this is the percentage of bandwidth of the
+ *                            priority group this traffic class belongs to
+ * @DCB_TC_ATTR_PARAM_ALL: (NLA_FLAG) all traffic class parameters
+ *
+ */
+enum dcbnl_tc_attrs {
+        DCB_TC_ATTR_PARAM_UNDEFINED,
+        DCB_TC_ATTR_PARAM_PGID,
+        DCB_TC_ATTR_PARAM_UP_MAPPING,
+        DCB_TC_ATTR_PARAM_STRICT_PRIO,
+        DCB_TC_ATTR_PARAM_BW_PCT,
+        DCB_TC_ATTR_PARAM_ALL,
+        __DCB_TC_ATTR_PARAM_ENUM_MAX,
+        DCB_TC_ATTR_PARAM_MAX = __DCB_TC_ATTR_PARAM_ENUM_MAX - 1,
+};
+/**
+ * enum dcbnl_cap_attrs - DCB Capability attributes
+ *
+ * @DCB_CAP_ATTR_UNDEFINED: unspecified attribute to catch errors
+ * @DCB_CAP_ATTR_ALL: (NLA_FLAG) all capability parameters
+ * @DCB_CAP_ATTR_PG: (NLA_U8) device supports Priority Groups
+ * @DCB_CAP_ATTR_PFC: (NLA_U8) device supports Priority Flow Control
+ * @DCB_CAP_ATTR_UP2TC: (NLA_U8) device supports user priority to
+ *                               traffic class mapping
+ * @DCB_CAP_ATTR_PG_TCS: (NLA_U8) bitmap where each bit represents a
+ *                                number of traffic classes the device
+ *                                can be configured to use for Priority Groups
+ * @DCB_CAP_ATTR_PFC_TCS: (NLA_U8) bitmap where each bit represents a
+ *                                 number of traffic classes the device can be
+ *                                 configured to use for Priority Flow Control
+ * @DCB_CAP_ATTR_GSP: (NLA_U8) device supports group strict priority
+ * @DCB_CAP_ATTR_BCN: (NLA_U8) device supports Backwards Congestion
+ *                             Notification
+ */
+enum dcbnl_cap_attrs {
+        DCB_CAP_ATTR_UNDEFINED,
+        DCB_CAP_ATTR_ALL,
+        DCB_CAP_ATTR_PG,
+        DCB_CAP_ATTR_PFC,
+        DCB_CAP_ATTR_UP2TC,
+        DCB_CAP_ATTR_PG_TCS,
+        DCB_CAP_ATTR_PFC_TCS,
+        DCB_CAP_ATTR_GSP,
+        DCB_CAP_ATTR_BCN,
+        __DCB_CAP_ATTR_ENUM_MAX,
+        DCB_CAP_ATTR_MAX = __DCB_CAP_ATTR_ENUM_MAX - 1,
+};
+/**
+ * enum dcbnl_numtcs_attrs - number of traffic classes
+ *
+ * @DCB_NUMTCS_ATTR_UNDEFINED: unspecified attribute to catch errors
+ * @DCB_NUMTCS_ATTR_ALL: (NLA_FLAG) all traffic class attributes
+ * @DCB_NUMTCS_ATTR_PG: (NLA_U8) number of traffic classes used for
+ *                               priority groups
+ * @DCB_NUMTCS_ATTR_PFC: (NLA_U8) number of traffic classes which can
+ *                                support priority flow control
+ */
+enum dcbnl_numtcs_attrs {
+        DCB_NUMTCS_ATTR_UNDEFINED,
+        DCB_NUMTCS_ATTR_ALL,
+        DCB_NUMTCS_ATTR_PG,
+        DCB_NUMTCS_ATTR_PFC,
+        __DCB_NUMTCS_ATTR_ENUM_MAX,
+        DCB_NUMTCS_ATTR_MAX = __DCB_NUMTCS_ATTR_ENUM_MAX - 1,
+};
+enum dcbnl_bcn_attrs{
+        DCB_BCN_ATTR_UNDEFINED = 0,
+        DCB_BCN_ATTR_RP_0,
+        DCB_BCN_ATTR_RP_1,
+        DCB_BCN_ATTR_RP_2,
+        DCB_BCN_ATTR_RP_3,
+        DCB_BCN_ATTR_RP_4,
+        DCB_BCN_ATTR_RP_5,
+        DCB_BCN_ATTR_RP_6,
+        DCB_BCN_ATTR_RP_7,
+        DCB_BCN_ATTR_RP_ALL,
+        DCB_BCN_ATTR_BCNA_0,
+        DCB_BCN_ATTR_BCNA_1,
+        DCB_BCN_ATTR_ALPHA,
+        DCB_BCN_ATTR_BETA,
+        DCB_BCN_ATTR_GD,
+        DCB_BCN_ATTR_GI,
+        DCB_BCN_ATTR_TMAX,
+        DCB_BCN_ATTR_TD,
+        DCB_BCN_ATTR_RMIN,
+        DCB_BCN_ATTR_W,
+        DCB_BCN_ATTR_RD,
+        DCB_BCN_ATTR_RU,
+        DCB_BCN_ATTR_WRTT,
+        DCB_BCN_ATTR_RI,
+        DCB_BCN_ATTR_C,
+        DCB_BCN_ATTR_ALL,
+        __DCB_BCN_ATTR_ENUM_MAX,
+        DCB_BCN_ATTR_MAX = __DCB_BCN_ATTR_ENUM_MAX - 1,
+};
+/**
+ * enum dcb_general_attr_values - general DCB attribute values
+ *
+ * @DCB_ATTR_UNDEFINED: value used to indicate an attribute is not supported
+ *
+ */
+enum dcb_general_attr_values {
+        DCB_ATTR_VALUE_UNDEFINED = 0xff
+};
+#endif /* __LINUX_DCBNL_H__ */
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 6080449fbec9..61734e27abb7 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -168,6 +168,8 @@ enum {
        DCCPO_MIN_CCID_SPECIFIC = 128,
        DCCPO_MAX_CCID_SPECIFIC = 255,
 };
+/* maximum size of a single TLV-encoded DCCP option (sans type/len bytes) */
+#define DCCP_SINGLE_OPT_MAXLEN  253
 /* DCCP CCIDS */
 enum {
@@ -176,29 +178,23 @@ enum {
 };
 /* DCCP features (RFC 4340 section 6.4) */
-enum {
+enum dccp_feature_numbers {
        DCCPF_RESERVED = 0,
        DCCPF_CCID = 1,
-        DCCPF_SHORT_SEQNOS = 2,         /* XXX: not yet implemented */
+        DCCPF_SHORT_SEQNOS = 2,
        DCCPF_SEQUENCE_WINDOW = 3,
-        DCCPF_ECN_INCAPABLE = 4,        /* XXX: not yet implemented */
+        DCCPF_ECN_INCAPABLE = 4,
        DCCPF_ACK_RATIO = 5,
        DCCPF_SEND_ACK_VECTOR = 6,
        DCCPF_SEND_NDP_COUNT = 7,
        DCCPF_MIN_CSUM_COVER = 8,
-        DCCPF_DATA_CHECKSUM = 9,        /* XXX: not yet implemented */
+        DCCPF_DATA_CHECKSUM = 9,
        /* 10-127 reserved */
        DCCPF_MIN_CCID_SPECIFIC = 128,
+        DCCPF_SEND_LEV_RATE = 192,      /* RFC 4342, sec. 8.4 */
        DCCPF_MAX_CCID_SPECIFIC = 255,
 };
-/* this structure is argument to DCCP_SOCKOPT_CHANGE_X */
-struct dccp_so_feat {
-        __u8 dccpsf_feat;
-        __u8 __user *dccpsf_val;
-        __u8 dccpsf_len;
-};
 /* DCCP socket options */
 #define DCCP_SOCKOPT_PACKET_SIZE        1 /* XXX deprecated, without effect */
 #define DCCP_SOCKOPT_SERVICE            2
@@ -208,6 +204,10 @@ struct dccp_so_feat {
 #define DCCP_SOCKOPT_SERVER_TIMEWAIT    6
 #define DCCP_SOCKOPT_SEND_CSCOV         10
 #define DCCP_SOCKOPT_RECV_CSCOV         11
+#define DCCP_SOCKOPT_AVAILABLE_CCIDS    12
+#define DCCP_SOCKOPT_CCID               13
+#define DCCP_SOCKOPT_TX_CCID            14
+#define DCCP_SOCKOPT_RX_CCID            15
 #define DCCP_SOCKOPT_CCID_RX_INFO       128
 #define DCCP_SOCKOPT_CCID_TX_INFO       192
@@ -360,7 +360,6 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb)
 #define DCCPF_INITIAL_SEQUENCE_WINDOW           100
 #define DCCPF_INITIAL_ACK_RATIO                 2
 #define DCCPF_INITIAL_CCID                      DCCPC_CCID2
-#define DCCPF_INITIAL_SEND_ACK_VECTOR           1
 /* FIXME: for now we're default to 1 but it should really be 0 */
 #define DCCPF_INITIAL_SEND_NDP_COUNT            1
@@ -370,20 +369,11 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb)
  * Will be used to pass the state from dccp_request_sock to dccp_sock.
  *
  * @dccpms_sequence_window - Sequence Window Feature (section 7.5.2)
-  * @dccpms_ccid - Congestion Control Id (CCID) (section 10)
-  * @dccpms_send_ack_vector - Send Ack Vector Feature (section 11.5)
-  * @dccpms_send_ndp_count - Send NDP Count Feature (7.7.2)
-  * @dccpms_ack_ratio - Ack Ratio Feature (section 11.3)
  * @dccpms_pending - List of features being negotiated
  * @dccpms_conf -
  */
 struct dccp_minisock {
        __u64                   dccpms_sequence_window;
-        __u8                    dccpms_rx_ccid;
-        __u8                    dccpms_tx_ccid;
-        __u8                    dccpms_send_ack_vector;
-        __u8                    dccpms_send_ndp_count;
-        __u8                    dccpms_ack_ratio;
        struct list_head        dccpms_pending;
        struct list_head        dccpms_conf;
 };
@@ -411,6 +401,7 @@ extern void dccp_minisock_init(struct dccp_minisock *dmsk);
 * @dreq_iss: initial sequence number sent on the Response (RFC 4340, 7.1)
 * @dreq_isr: initial sequence number received on the Request
 * @dreq_service: service code present on the Request (there is just one)
+ * @dreq_featneg: feature negotiation options for this connection
 * The following two fields are analogous to the ones in dccp_sock:
 * @dreq_timestamp_echo: last received timestamp to echo (13.1)
 * @dreq_timestamp_echo: the time of receiving the last @dreq_timestamp_echo
@@ -420,6 +411,7 @@ struct dccp_request_sock {
        __u64                    dreq_iss;
        __u64                    dreq_isr;
        __be32                   dreq_service;
+        struct list_head         dreq_featneg;
        __u32                    dreq_timestamp_echo;
        __u32                    dreq_timestamp_time;
 };
@@ -493,10 +485,12 @@ struct dccp_ackvec;
 * @dccps_r_ack_ratio - feature-remote Ack Ratio
 * @dccps_pcslen - sender   partial checksum coverage (via sockopt)
 * @dccps_pcrlen - receiver partial checksum coverage (via sockopt)
+ * @dccps_send_ndp_count - local Send NDP Count feature (7.7.2)
 * @dccps_ndp_count - number of Non Data Packets since last data packet
 * @dccps_mss_cache - current value of MSS (path MTU minus header sizes)
 * @dccps_rate_last - timestamp for rate-limiting DCCP-Sync (RFC 4340, 7.5.4)
 * @dccps_minisock - associated minisock (accessed via dccp_msk)
+ * @dccps_featneg - tracks feature-negotiation state (mostly during handshake)
 * @dccps_hc_rx_ackvec - rx half connection ack vector
 * @dccps_hc_rx_ccid - CCID used for the receiver (or receiving half-connection)
 * @dccps_hc_tx_ccid - CCID used for the sender (or sending half-connection)
@@ -529,11 +523,13 @@ struct dccp_sock {
        __u32                           dccps_timestamp_time;
        __u16                           dccps_l_ack_ratio;
        __u16                           dccps_r_ack_ratio;
-        __u16                           dccps_pcslen;
+        __u8                            dccps_pcslen:4;
-        __u16                           dccps_pcrlen;
+        __u8                            dccps_pcrlen:4;
+        __u8                            dccps_send_ndp_count:1;
        __u64                           dccps_ndp_count:48;
        unsigned long                   dccps_rate_last;
        struct dccp_minisock            dccps_minisock;
+        struct list_head                dccps_featneg;
        struct dccp_ackvec              *dccps_hc_rx_ackvec;
        struct ccid                     *dccps_hc_rx_ccid;
        struct ccid                     *dccps_hc_tx_ccid;
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 4aaa4afb1cb9..096476f1fb35 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -17,7 +17,7 @@ extern int debug_locks_off(void);
 ({                                                                      \
        int __ret = 0;                                                  \
                                                                        \
-        if (unlikely(c)) {                                              \
+        if (!oops_in_progress && unlikely(c)) {                         \
                if (debug_locks_off() && !debug_locks_silent)           \
                        WARN_ON(1);                                     \
                __ret = 1;                                              \
diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h
index 952df39c989d..136f170cecc2 100644
--- a/include/linux/dma_remapping.h
+++ b/include/linux/dma_remapping.h
@@ -9,148 +9,16 @@
 #define VTD_PAGE_MASK           (((u64)-1) << VTD_PAGE_SHIFT)
 #define VTD_PAGE_ALIGN(addr)    (((addr) + VTD_PAGE_SIZE - 1) & VTD_PAGE_MASK)
-#define IOVA_PFN(addr)          ((addr) >> PAGE_SHIFT)
-#define DMA_32BIT_PFN           IOVA_PFN(DMA_32BIT_MASK)
-#define DMA_64BIT_PFN           IOVA_PFN(DMA_64BIT_MASK)
-/*
- * 0: Present
- * 1-11: Reserved
- * 12-63: Context Ptr (12 - (haw-1))
- * 64-127: Reserved
- */
-struct root_entry {
-        u64     val;
-        u64     rsvd1;
-};
-#define ROOT_ENTRY_NR (VTD_PAGE_SIZE/sizeof(struct root_entry))
-static inline bool root_present(struct root_entry *root)
-{
-        return (root->val & 1);
-}
-static inline void set_root_present(struct root_entry *root)
-{
-        root->val |= 1;
-}
-static inline void set_root_value(struct root_entry *root, unsigned long value)
-{
-        root->val |= value & VTD_PAGE_MASK;
-}
-struct context_entry;
-static inline struct context_entry *
-get_context_addr_from_root(struct root_entry *root)
-{
-        return (struct context_entry *)
-                (root_present(root)?phys_to_virt(
-                root->val & VTD_PAGE_MASK) :
-                NULL);
-}
-/*
- * low 64 bits:
- * 0: present
- * 1: fault processing disable
- * 2-3: translation type
- * 12-63: address space root
- * high 64 bits:
- * 0-2: address width
- * 3-6: aval
- * 8-23: domain id
- */
-struct context_entry {
-        u64 lo;
-        u64 hi;
-};
-#define context_present(c) ((c).lo & 1)
-#define context_fault_disable(c) (((c).lo >> 1) & 1)
-#define context_translation_type(c) (((c).lo >> 2) & 3)
-#define context_address_root(c) ((c).lo & VTD_PAGE_MASK)
-#define context_address_width(c) ((c).hi &  7)
-#define context_domain_id(c) (((c).hi >> 8) & ((1 << 16) - 1))
-#define context_set_present(c) do {(c).lo |= 1;} while (0)
-#define context_set_fault_enable(c) \
-        do {(c).lo &= (((u64)-1) << 2) | 1;} while (0)
-#define context_set_translation_type(c, val) \
-        do { \
-                (c).lo &= (((u64)-1) << 4) | 3; \
-                (c).lo |= ((val) & 3) << 2; \
-        } while (0)
-#define CONTEXT_TT_MULTI_LEVEL 0
-#define context_set_address_root(c, val) \
-        do {(c).lo |= (val) & VTD_PAGE_MASK; } while (0)
-#define context_set_address_width(c, val) do {(c).hi |= (val) & 7;} while (0)
-#define context_set_domain_id(c, val) \
-        do {(c).hi |= ((val) & ((1 << 16) - 1)) << 8;} while (0)
-#define context_clear_entry(c) do {(c).lo = 0; (c).hi = 0;} while (0)
-/*
- * 0: readable
- * 1: writable
- * 2-6: reserved
- * 7: super page
- * 8-11: available
- * 12-63: Host physcial address
- */
-struct dma_pte {
-        u64 val;
-};
-#define dma_clear_pte(p)        do {(p).val = 0;} while (0)
 #define DMA_PTE_READ (1)
 #define DMA_PTE_WRITE (2)
-#define dma_set_pte_readable(p) do {(p).val |= DMA_PTE_READ;} while (0)
-#define dma_set_pte_writable(p) do {(p).val |= DMA_PTE_WRITE;} while (0)
-#define dma_set_pte_prot(p, prot) \
-                do {(p).val = ((p).val & ~3) | ((prot) & 3); } while (0)
-#define dma_pte_addr(p) ((p).val & VTD_PAGE_MASK)
-#define dma_set_pte_addr(p, addr) do {\
-                (p).val |= ((addr) & VTD_PAGE_MASK); } while (0)
-#define dma_pte_present(p) (((p).val & 3) != 0)
 struct intel_iommu;
+struct dmar_domain;
+struct root_entry;
-struct dmar_domain {
-        int     id;                     /* domain id */
-        struct intel_iommu *iommu;      /* back pointer to owning iommu */
-        struct list_head devices;       /* all devices' list */
-        struct iova_domain iovad;       /* iova's that belong to this domain */
-        struct dma_pte  *pgd;           /* virtual address */
-        spinlock_t      mapping_lock;   /* page table lock */
-        int             gaw;            /* max guest address width */
-        /* adjusted guest address width, 0 is level 2 30-bit */
-        int             agaw;
-#define DOMAIN_FLAG_MULTIPLE_DEVICES 1
-        int             flags;
-};
-/* PCI domain-device relationship */
-struct device_domain_info {
-        struct list_head link;  /* link to domain siblings */
-        struct list_head global; /* link to global list */
-        u8 bus;                 /* PCI bus numer */
-        u8 devfn;               /* PCI devfn number */
-        struct pci_dev *dev; /* it's NULL for PCIE-to-PCI bridge */
-        struct dmar_domain *domain; /* pointer to domain */
-};
-extern int init_dmars(void);
 extern void free_dmar_iommu(struct intel_iommu *iommu);
+extern int iommu_calculate_agaw(struct intel_iommu *iommu);
 extern int dmar_disabled;
-#ifndef CONFIG_DMAR_GFX_WA
-static inline void iommu_prepare_gfx_mapping(void)
-{
-        return;
-}
-#endif /* !CONFIG_DMAR_GFX_WA */
 #endif
diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index f1984fc3e06d..f28440784cf0 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -144,7 +144,6 @@ struct dmar_rmrr_unit {
        list_for_each_entry(rmrr, &dmar_rmrr_units, list)
 /* Intel DMAR  initialization functions */
 extern int intel_iommu_init(void);
-extern int dmar_disabled;
 #else
 static inline int intel_iommu_init(void)
 {
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index e5084eb5943a..34161907b2f8 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -44,8 +44,10 @@ extern const struct dmi_device * dmi_find_device(int type, const char *name,
 extern void dmi_scan_machine(void);
 extern int dmi_get_year(int field);
 extern int dmi_name_in_vendors(const char *str);
+extern int dmi_name_in_serial(const char *str);
 extern int dmi_available;
 extern int dmi_walk(void (*decode)(const struct dmi_header *));
+extern bool dmi_match(enum dmi_field f, const char *str);
 #else
@@ -56,9 +58,12 @@ static inline const struct dmi_device * dmi_find_device(int type, const char *na
 static inline void dmi_scan_machine(void) { return; }
 static inline int dmi_get_year(int year) { return 0; }
 static inline int dmi_name_in_vendors(const char *s) { return 0; }
+static inline int dmi_name_in_serial(const char *s) { return 0; }
 #define dmi_available 0
 static inline int dmi_walk(void (*decode)(const struct dmi_header *))
        { return -1; }
+static inline bool dmi_match(enum dmi_field f, const char *str)
+        { return false; }
 #endif
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 79a8ed8e6a7d..55026b1a40bd 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -62,10 +62,11 @@ typedef enum fe_caps {
        FE_CAN_HIERARCHY_AUTO           = 0x100000,
        FE_CAN_8VSB                     = 0x200000,
        FE_CAN_16VSB                    = 0x400000,
-        FE_HAS_EXTENDED_CAPS            = 0x800000,   // We need more bitspace for newer APIs, indicate this.
+        FE_HAS_EXTENDED_CAPS            = 0x800000,   /* We need more bitspace for newer APIs, indicate this. */
-        FE_NEEDS_BENDING                = 0x20000000, // not supported anymore, don't use (frontend requires frequency bending)
+        FE_CAN_2G_MODULATION            = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */
-        FE_CAN_RECOVER                  = 0x40000000, // frontend can recover from a cable unplug automatically
+        FE_NEEDS_BENDING                = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */
-        FE_CAN_MUTE_TS                  = 0x80000000  // frontend can stop spurious TS data output
+        FE_CAN_RECOVER                  = 0x40000000, /* frontend can recover from a cable unplug automatically */
+        FE_CAN_MUTE_TS                  = 0x80000000  /* frontend can stop spurious TS data output */
 } fe_caps_t;
@@ -121,15 +122,15 @@ typedef enum fe_sec_mini_cmd {
 typedef enum fe_status {
-        FE_HAS_SIGNAL   = 0x01,   /*  found something above the noise level */
+        FE_HAS_SIGNAL   = 0x01,   /* found something above the noise level */
-        FE_HAS_CARRIER  = 0x02,   /*  found a DVB signal  */
+        FE_HAS_CARRIER  = 0x02,   /* found a DVB signal  */
-        FE_HAS_VITERBI  = 0x04,   /*  FEC is stable  */
+        FE_HAS_VITERBI  = 0x04,   /* FEC is stable  */
-        FE_HAS_SYNC     = 0x08,   /*  found sync bytes  */
+        FE_HAS_SYNC     = 0x08,   /* found sync bytes  */
-        FE_HAS_LOCK     = 0x10,   /*  everything's working... */
+        FE_HAS_LOCK     = 0x10,   /* everything's working... */
-        FE_TIMEDOUT     = 0x20,   /*  no lock within the last ~2 seconds */
+        FE_TIMEDOUT     = 0x20,   /* no lock within the last ~2 seconds */
-        FE_REINIT       = 0x40    /*  frontend was reinitialized,  */
+        FE_REINIT       = 0x40    /* frontend was reinitialized,  */
-} fe_status_t;                    /*  application is recommended to reset */
+} fe_status_t;                    /* application is recommended to reset */
-                                  /*  DiSEqC, tone and parameters */
+                                  /* DiSEqC, tone and parameters */
 typedef enum fe_spectral_inversion {
        INVERSION_OFF,
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 92f6f634e3e6..7a204256b155 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -28,7 +28,7 @@ typedef void (elevator_activate_req_fn) (struct request_queue *, struct request
 typedef void (elevator_deactivate_req_fn) (struct request_queue *, struct request *);
 typedef void *(elevator_init_fn) (struct request_queue *);
-typedef void (elevator_exit_fn) (elevator_t *);
+typedef void (elevator_exit_fn) (struct elevator_queue *);
 struct elevator_ops
 {
@@ -62,8 +62,8 @@ struct elevator_ops
 struct elv_fs_entry {
        struct attribute attr;
-        ssize_t (*show)(elevator_t *, char *);
+        ssize_t (*show)(struct elevator_queue *, char *);
-        ssize_t (*store)(elevator_t *, const char *, size_t);
+        ssize_t (*store)(struct elevator_queue *, const char *, size_t);
 };
 /*
@@ -130,7 +130,7 @@ extern ssize_t elv_iosched_show(struct request_queue *, char *);
 extern ssize_t elv_iosched_store(struct request_queue *, const char *, size_t);
 extern int elevator_init(struct request_queue *, char *);
-extern void elevator_exit(elevator_t *);
+extern void elevator_exit(struct elevator_queue *);
 extern int elv_rq_merge_ok(struct request *, struct bio *);
 /*
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 25d62e6e3290..1cb0f0b90926 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -27,6 +27,7 @@
 #include <linux/if_ether.h>
 #include <linux/netdevice.h>
 #include <linux/random.h>
+#include <asm/unaligned.h>
 #ifdef __KERNEL__
 extern __be16           eth_type_trans(struct sk_buff *skb, struct net_device *dev);
@@ -41,6 +42,10 @@ extern int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh);
 extern void eth_header_cache_update(struct hh_cache *hh,
                                    const struct net_device *dev,
                                    const unsigned char *haddr);
+extern int eth_mac_addr(struct net_device *dev, void *p);
+extern int eth_change_mtu(struct net_device *dev, int new_mtu);
+extern int eth_validate_addr(struct net_device *dev);
 extern struct net_device *alloc_etherdev_mq(int sizeof_priv, unsigned int queue_count);
@@ -136,6 +141,47 @@ static inline unsigned compare_ether_addr(const u8 *addr1, const u8 *addr2)
        BUILD_BUG_ON(ETH_ALEN != 6);
        return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0;
 }
+static inline unsigned long zap_last_2bytes(unsigned long value)
+{
+#ifdef __BIG_ENDIAN
+        return value >> 16;
+#else
+        return value << 16;
+#endif
+}
+/**
+ * compare_ether_addr_64bits - Compare two Ethernet addresses
+ * @addr1: Pointer to an array of 8 bytes
+ * @addr2: Pointer to an other array of 8 bytes
+ *
+ * Compare two ethernet addresses, returns 0 if equal.
+ * Same result than "memcmp(addr1, addr2, ETH_ALEN)" but without conditional
+ * branches, and possibly long word memory accesses on CPU allowing cheap
+ * unaligned memory reads.
+ * arrays = { byte1, byte2, byte3, byte4, byte6, byte7, pad1, pad2}
+ *
+ * Please note that alignment of addr1 & addr2 is only guaranted to be 16 bits.
+ */
+static inline unsigned compare_ether_addr_64bits(const u8 addr1[6+2],
+                                                 const u8 addr2[6+2])
+{
+#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+        unsigned long fold = ((*(unsigned long *)addr1) ^
+                              (*(unsigned long *)addr2));
+        if (sizeof(fold) == 8)
+                return zap_last_2bytes(fold) != 0;
+        fold |= zap_last_2bytes((*(unsigned long *)(addr1 + 4)) ^
+                                (*(unsigned long *)(addr2 + 4)));
+        return fold != 0;
+#else
+        return compare_ether_addr(addr1, addr2);
+#endif
+}
 #endif  /* __KERNEL__ */
 #endif  /* _LINUX_ETHERDEVICE_H */
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index b4b038b89ee6..27c67a542235 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -467,6 +467,8 @@ struct ethtool_ops {
 #define ETHTOOL_GRXFH           0x00000029 /* Get RX flow hash configuration */
 #define ETHTOOL_SRXFH           0x0000002a /* Set RX flow hash configuration */
+#define ETHTOOL_GGRO            0x0000002b /* Get GRO enable (ethtool_value) */
+#define ETHTOOL_SGRO            0x0000002c /* Set GRO enable (ethtool_value) */
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
diff --git a/include/linux/ext2_fs_sb.h b/include/linux/ext2_fs_sb.h
index f273415ab6f1..dc541f3653d1 100644
--- a/include/linux/ext2_fs_sb.h
+++ b/include/linux/ext2_fs_sb.h
@@ -108,4 +108,10 @@ struct ext2_sb_info {
        struct ext2_reserve_window_node s_rsv_window_head;
 };
+static inline spinlock_t *
+sb_bgl_lock(struct ext2_sb_info *sbi, unsigned int block_group)
+{
+        return bgl_lock_ptr(&sbi->s_blockgroup_lock, block_group);
+}
 #endif  /* _LINUX_EXT2_FS_SB */
diff --git a/include/linux/ext3_fs_sb.h b/include/linux/ext3_fs_sb.h
index b65f0288b842..e024e38248ff 100644
--- a/include/linux/ext3_fs_sb.h
+++ b/include/linux/ext3_fs_sb.h
@@ -83,4 +83,10 @@ struct ext3_sb_info {
 #endif
 };
+static inline spinlock_t *
+sb_bgl_lock(struct ext3_sb_info *sbi, unsigned int block_group)
+{
+        return bgl_lock_ptr(&sbi->s_blockgroup_lock, block_group);
+}
 #endif  /* _LINUX_EXT3_FS_SB */
diff --git a/include/linux/fault-inject.h b/include/linux/fault-inject.h
index 32368c4f0326..06ca9b21dad2 100644
--- a/include/linux/fault-inject.h
+++ b/include/linux/fault-inject.h
@@ -81,4 +81,13 @@ static inline void cleanup_fault_attr_dentries(struct fault_attr *attr)
 #endif /* CONFIG_FAULT_INJECTION */
+#ifdef CONFIG_FAILSLAB
+extern bool should_failslab(size_t size, gfp_t gfpflags);
+#else
+static inline bool should_failslab(size_t size, gfp_t gfpflags)
+{
+        return false;
+}
+#endif /* CONFIG_FAILSLAB */
 #endif /* _LINUX_FAULT_INJECT_H */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 75a81eaf3430..1ee63df5be92 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -888,7 +888,7 @@ struct fb_info {
 #define fb_writeq sbus_writeq
 #define fb_memset sbus_memset_io
-#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || (defined(__sh__) && !defined(__SH5__)) || defined(__powerpc__) || defined(__avr32__)
+#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__)
 #define fb_readb __raw_readb
 #define fb_readw __raw_readw
diff --git a/include/linux/fddidevice.h b/include/linux/fddidevice.h
index e61e42dfd317..155bafd9e886 100644
--- a/include/linux/fddidevice.h
+++ b/include/linux/fddidevice.h
@@ -27,6 +27,7 @@
 #ifdef __KERNEL__
 extern __be16   fddi_type_trans(struct sk_buff *skb,
                                struct net_device *dev);
+extern int fddi_change_mtu(struct net_device *dev, int new_mtu);
 extern struct net_device *alloc_fddidev(int sizeof_priv);
 #endif
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index 4aab6f12cfab..09d6c5bbdddd 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -57,8 +57,6 @@ struct files_struct {
 #define files_fdtable(files) (rcu_dereference((files)->fdt))
-extern struct kmem_cache *filp_cachep;
 struct file_operations;
 struct vfsmount;
 struct dentry;
diff --git a/include/linux/filter.h b/include/linux/filter.h
index b6ea9aa9e853..1354aaf6abbe 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -122,7 +122,8 @@ struct sock_fprog	/* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_PKTTYPE  4
 #define SKF_AD_IFINDEX  8
 #define SKF_AD_NLATTR   12
-#define SKF_AD_MAX      16
+#define SKF_AD_NLATTR_NEST      16
+#define SKF_AD_MAX      20
 #define SKF_NET_OFF   (-0x100000)
 #define SKF_LL_OFF    (-0x200000)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4a853ef6fd35..f2a3010140e3 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -21,7 +21,6 @@
 /* Fixed constants first: */
 #undef NR_OPEN
-extern int sysctl_nr_open;
 #define INR_OPEN 1024           /* Initial setting for nfile rlimits */
 #define BLOCK_SIZE_BITS 10
@@ -38,21 +37,13 @@ struct files_stat_struct {
        int nr_free_files;      /* read only */
        int max_files;          /* tunable */
 };
-extern struct files_stat_struct files_stat;
-extern int get_max_files(void);
 struct inodes_stat_t {
        int nr_inodes;
        int nr_unused;
        int dummy[5];           /* padding for sysctl ABI compatibility */
 };
-extern struct inodes_stat_t inodes_stat;
-extern int leases_enable, lease_break_time;
-#ifdef CONFIG_DNOTIFY
-extern int dir_notify_enable;
-#endif
 #define NR_FILE  8192   /* this can well be larger on a larger system */
@@ -82,6 +73,14 @@ extern int dir_notify_enable;
   (specialy hack for floppy.c) */
 #define FMODE_WRITE_IOCTL       ((__force fmode_t)128)
+/*
+ * Don't update ctime and mtime.
+ *
+ * Currently a special hack for the XFS open_by_handle ioctl, but we'll
+ * hopefully graduate it to a proper O_CMTIME flag supported by open(2) soon.
+ */
+#define FMODE_NOCMTIME          ((__force fmode_t)2048)
 #define RW_MASK         1
 #define RWA_MASK        2
 #define READ 0
@@ -316,11 +315,21 @@ struct poll_table_struct;
 struct kstatfs;
 struct vm_area_struct;
 struct vfsmount;
+struct cred;
 extern void __init inode_init(void);
 extern void __init inode_init_early(void);
 extern void __init files_init(unsigned long);
+extern struct files_stat_struct files_stat;
+extern int get_max_files(void);
+extern int sysctl_nr_open;
+extern struct inodes_stat_t inodes_stat;
+extern int leases_enable, lease_break_time;
+#ifdef CONFIG_DNOTIFY
+extern int dir_notify_enable;
+#endif
 struct buffer_head;
 typedef int (get_block_t)(struct inode *inode, sector_t iblock,
                        struct buffer_head *bh_result, int create);
@@ -414,6 +423,9 @@ enum positive_aop_returns {
 #define AOP_FLAG_UNINTERRUPTIBLE        0x0001 /* will not do a short write */
 #define AOP_FLAG_CONT_EXPAND            0x0002 /* called from cont_expand */
+#define AOP_FLAG_NOFS                   0x0004 /* used by filesystem to direct
+                                                * helper code (eg buffer layer)
+                                                * to clear GFP_FS from alloc */
 /*
 * oh the beauties of C type declarations.
@@ -827,7 +839,7 @@ struct file {
        fmode_t                 f_mode;
        loff_t                  f_pos;
        struct fown_struct      f_owner;
-        unsigned int            f_uid, f_gid;
+        const struct cred       *f_cred;
        struct file_ra_state    f_ra;
        u64                     f_version;
@@ -1194,7 +1206,7 @@ enum {
 #define has_fs_excl() atomic_read(&current->fs_excl)
 #define is_owner_or_cap(inode)  \
-        ((current->fsuid == (inode)->i_uid) || capable(CAP_FOWNER))
+        ((current_fsuid() == (inode)->i_uid) || capable(CAP_FOWNER))
 /* not quite ready to be deprecated, but... */
 extern void lock_super(struct super_block *);
@@ -1203,7 +1215,6 @@ extern void unlock_super(struct super_block *);
 /*
 * VFS helper functions..
 */
-extern int vfs_permission(struct nameidata *, int);
 extern int vfs_create(struct inode *, struct dentry *, int, struct nameidata *);
 extern int vfs_mkdir(struct inode *, struct dentry *, int);
 extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t);
@@ -1301,7 +1312,6 @@ struct file_operations {
        ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
        unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
        int (*check_flags)(int);
-        int (*dir_notify)(struct file *filp, unsigned long arg);
        int (*flock) (struct file *, int, struct file_lock *);
        ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
        ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
@@ -1674,7 +1684,8 @@ extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
 extern long do_sys_open(int dfd, const char __user *filename, int flags,
                        int mode);
 extern struct file *filp_open(const char *, int, int);
-extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
+extern struct file * dentry_open(struct dentry *, struct vfsmount *, int,
+                                 const struct cred *);
 extern int filp_close(struct file *, fl_owner_t id);
 extern char * getname(const char __user *);
@@ -1859,7 +1870,7 @@ extern void free_write_pipe(struct file *);
 extern struct file *do_filp_open(int dfd, const char *pathname,
                int open_flag, int mode);
-extern int may_open(struct nameidata *, int, int);
+extern int may_open(struct path *, int, int);
 extern int kernel_read(struct file *, unsigned long, char *, unsigned long);
 extern struct file * open_exec(const char *);
@@ -1875,7 +1886,9 @@ extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
 extern loff_t vfs_llseek(struct file *file, loff_t offset, int origin);
+extern struct inode * inode_init_always(struct super_block *, struct inode *);
 extern void inode_init_once(struct inode *);
+extern void inode_add_to_lists(struct super_block *, struct inode *);
 extern void iput(struct inode *);
 extern struct inode * igrab(struct inode *);
 extern ino_t iunique(struct super_block *, ino_t);
@@ -1892,6 +1905,8 @@ extern struct inode *ilookup(struct super_block *sb, unsigned long ino);
 extern struct inode * iget5_locked(struct super_block *, unsigned long, int (*test)(struct inode *, void *), int (*set)(struct inode *, void *), void *);
 extern struct inode * iget_locked(struct super_block *, unsigned long);
+extern int insert_inode_locked4(struct inode *, unsigned long, int (*test)(struct inode *, void *), void *);
+extern int insert_inode_locked(struct inode *);
 extern void unlock_new_inode(struct inode *);
 extern void __iget(struct inode * inode);
@@ -2023,7 +2038,7 @@ extern int page_readlink(struct dentry *, char __user *, int);
 extern void *page_follow_link_light(struct dentry *, struct nameidata *);
 extern void page_put_link(struct dentry *, struct nameidata *, void *);
 extern int __page_symlink(struct inode *inode, const char *symname, int len,
-                gfp_t gfp_mask);
+                int nofs);
 extern int page_symlink(struct inode *inode, const char *symname, int len);
 extern const struct inode_operations page_symlink_inode_operations;
 extern int generic_readlink(struct dentry *, char __user *, int);
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
index 9e5a06e78d02..a97c053d3a9a 100644
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
@@ -10,12 +10,6 @@ struct fs_struct {
        struct path root, pwd;
 };
-#define INIT_FS {                               \
-        .count          = ATOMIC_INIT(1),       \
-        .lock           = RW_LOCK_UNLOCKED,     \
-        .umask          = 0022, \
-}
 extern struct kmem_cache *fs_cachep;
 extern void exit_fs(struct task_struct *);
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 708bab58d8d0..d9051d717d27 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -47,12 +47,7 @@
 struct gianfar_platform_data {
        /* device specific information */
        u32     device_flags;
-        /* board specific information */
+        char    bus_id[BUS_ID_SIZE];
-        u32     board_flags;
-        int     mdio_bus;                       /* Bus controlled by us */
-        char    bus_id[MII_BUS_ID_SIZE];        /* Bus PHY is on */
-        u32     phy_id;
-        u8      mac_addr[6];
        phy_interface_t interface;
 };
@@ -61,17 +56,6 @@ struct gianfar_mdio_data {
        int     irq[32];
 };
-/* Flags related to gianfar device features */
-#define FSL_GIANFAR_DEV_HAS_GIGABIT             0x00000001
-#define FSL_GIANFAR_DEV_HAS_COALESCE            0x00000002
-#define FSL_GIANFAR_DEV_HAS_RMON                0x00000004
-#define FSL_GIANFAR_DEV_HAS_MULTI_INTR          0x00000008
-#define FSL_GIANFAR_DEV_HAS_CSUM                0x00000010
-#define FSL_GIANFAR_DEV_HAS_VLAN                0x00000020
-#define FSL_GIANFAR_DEV_HAS_EXTENDED_HASH       0x00000040
-#define FSL_GIANFAR_DEV_HAS_PADDING             0x00000080
-#define FSL_GIANFAR_DEV_HAS_MAGIC_PACKET        0x00000100
 /* Flags in gianfar_platform_data */
 #define FSL_GIANFAR_BRD_HAS_PHY_INTR    0x00000001 /* set or use a timer */
 #define FSL_GIANFAR_BRD_IS_REDUCED      0x00000002 /* Set if RGMII, RMII */
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 703eb53cfa2b..677432b9cb7e 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -6,7 +6,10 @@
 #include <linux/ktime.h>
 #include <linux/init.h>
 #include <linux/types.h>
+#include <linux/module.h>
 #include <linux/kallsyms.h>
+#include <linux/bitops.h>
+#include <linux/sched.h>
 #ifdef CONFIG_FUNCTION_TRACER
@@ -23,6 +26,45 @@ struct ftrace_ops {
        struct ftrace_ops *next;
 };
+extern int function_trace_stop;
+/*
+ * Type of the current tracing.
+ */
+enum ftrace_tracing_type_t {
+        FTRACE_TYPE_ENTER = 0, /* Hook the call of the function */
+        FTRACE_TYPE_RETURN,     /* Hook the return of the function */
+};
+/* Current tracing type, default is FTRACE_TYPE_ENTER */
+extern enum ftrace_tracing_type_t ftrace_tracing_type;
+/**
+ * ftrace_stop - stop function tracer.
+ *
+ * A quick way to stop the function tracer. Note this an on off switch,
+ * it is not something that is recursive like preempt_disable.
+ * This does not disable the calling of mcount, it only stops the
+ * calling of functions from mcount.
+ */
+static inline void ftrace_stop(void)
+{
+        function_trace_stop = 1;
+}
+/**
+ * ftrace_start - start the function tracer.
+ *
+ * This function is the inverse of ftrace_stop. This does not enable
+ * the function tracing if the function tracer is disabled. This only
+ * sets the function tracer flag to continue calling the functions
+ * from mcount.
+ */
+static inline void ftrace_start(void)
+{
+        function_trace_stop = 0;
+}
 /*
 * The ftrace_ops must be a static and should also
 * be read_mostly.  These functions do modify read_mostly variables
@@ -41,9 +83,21 @@ extern void ftrace_stub(unsigned long a0, unsigned long a1);
 # define unregister_ftrace_function(ops) do { } while (0)
 # define clear_ftrace_function(ops) do { } while (0)
 static inline void ftrace_kill(void) { }
+static inline void ftrace_stop(void) { }
+static inline void ftrace_start(void) { }
 #endif /* CONFIG_FUNCTION_TRACER */
+#ifdef CONFIG_STACK_TRACER
+extern int stack_tracer_enabled;
+int
+stack_trace_sysctl(struct ctl_table *table, int write,
+                   struct file *file, void __user *buffer, size_t *lenp,
+                   loff_t *ppos);
+#endif
 #ifdef CONFIG_DYNAMIC_FTRACE
+/* asm/ftrace.h must be defined for archs supporting dynamic ftrace */
+#include <asm/ftrace.h>
 enum {
        FTRACE_FL_FREE          = (1 << 0),
@@ -59,6 +113,7 @@ struct dyn_ftrace {
        struct list_head        list;
        unsigned long           ip; /* address of mcount call-site */
        unsigned long           flags;
+        struct dyn_arch_ftrace  arch;
 };
 int ftrace_force_update(void);
@@ -66,19 +121,48 @@ void ftrace_set_filter(unsigned char *buf, int len, int reset);
 /* defined in arch */
 extern int ftrace_ip_converted(unsigned long ip);
-extern unsigned char *ftrace_nop_replace(void);
-extern unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr);
 extern int ftrace_dyn_arch_init(void *data);
 extern int ftrace_update_ftrace_func(ftrace_func_t func);
 extern void ftrace_caller(void);
 extern void ftrace_call(void);
 extern void mcount_call(void);
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+extern void ftrace_graph_caller(void);
+extern int ftrace_enable_ftrace_graph_caller(void);
+extern int ftrace_disable_ftrace_graph_caller(void);
+#else
+static inline int ftrace_enable_ftrace_graph_caller(void) { return 0; }
+static inline int ftrace_disable_ftrace_graph_caller(void) { return 0; }
+#endif
+/**
+ * ftrace_make_nop - convert code into top
+ * @mod: module structure if called by module load initialization
+ * @rec: the mcount call site record
+ * @addr: the address that the call site should be calling
+ *
+ * This is a very sensitive operation and great care needs
+ * to be taken by the arch.  The operation should carefully
+ * read the location, check to see if what is read is indeed
+ * what we expect it to be, and then on success of the compare,
+ * it should write to the location.
+ *
+ * The code segment at @rec->ip should be a caller to @addr
+ *
+ * Return must be:
+ *  0 on success
+ *  -EFAULT on error reading the location
+ *  -EINVAL on a failed compare of the contents
+ *  -EPERM  on error writing to the location
+ * Any other value will be considered a failure.
+ */
+extern int ftrace_make_nop(struct module *mod,
+                           struct dyn_ftrace *rec, unsigned long addr);
 /**
- * ftrace_modify_code - modify code segment
+ * ftrace_make_call - convert a nop call site into a call to addr
- * @ip: the address of the code segment
+ * @rec: the mcount call site record
- * @old_code: the contents of what is expected to be there
+ * @addr: the address that the call site should call
- * @new_code: the code to patch in
 *
 * This is a very sensitive operation and great care needs
 * to be taken by the arch.  The operation should carefully
@@ -86,6 +170,8 @@ extern void mcount_call(void);
 * what we expect it to be, and then on success of the compare,
 * it should write to the location.
 *
+ * The code segment at @rec->ip should be a nop
+ *
 * Return must be:
 *  0 on success
 *  -EFAULT on error reading the location
@@ -93,8 +179,11 @@ extern void mcount_call(void);
 *  -EPERM  on error writing to the location
 * Any other value will be considered a failure.
 */
-extern int ftrace_modify_code(unsigned long ip, unsigned char *old_code,
+extern int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr);
-                              unsigned char *new_code);
+/* May be defined in arch */
+extern int ftrace_arch_read_dyn_info(char *buf, int size);
 extern int skip_trace(unsigned long ip);
@@ -102,7 +191,6 @@ extern void ftrace_release(void *start, unsigned long size);
 extern void ftrace_disable_daemon(void);
 extern void ftrace_enable_daemon(void);
 #else
 # define skip_trace(ip)                         ({ 0; })
 # define ftrace_force_update()                  ({ 0; })
@@ -181,6 +269,12 @@ static inline void __ftrace_enabled_restore(int enabled)
 #endif
 #ifdef CONFIG_TRACING
+extern int ftrace_dump_on_oops;
+extern void tracing_start(void);
+extern void tracing_stop(void);
+extern void ftrace_off_permanent(void);
 extern void
 ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3);
@@ -209,8 +303,11 @@ extern void ftrace_dump(void);
 static inline void
 ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3) { }
 static inline int
-ftrace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 0)));
+ftrace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
+static inline void tracing_start(void) { }
+static inline void tracing_stop(void) { }
+static inline void ftrace_off_permanent(void) { }
 static inline int
 ftrace_printk(const char *fmt, ...)
 {
@@ -221,33 +318,178 @@ static inline void ftrace_dump(void) { }
 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
 extern void ftrace_init(void);
-extern void ftrace_init_module(unsigned long *start, unsigned long *end);
+extern void ftrace_init_module(struct module *mod,
+                               unsigned long *start, unsigned long *end);
 #else
 static inline void ftrace_init(void) { }
 static inline void
-ftrace_init_module(unsigned long *start, unsigned long *end) { }
+ftrace_init_module(struct module *mod,
+                   unsigned long *start, unsigned long *end) { }
+#endif
+enum {
+        POWER_NONE = 0,
+        POWER_CSTATE = 1,
+        POWER_PSTATE = 2,
+};
+struct power_trace {
+#ifdef CONFIG_POWER_TRACER
+        ktime_t                 stamp;
+        ktime_t                 end;
+        int                     type;
+        int                     state;
 #endif
+};
+#ifdef CONFIG_POWER_TRACER
+extern void trace_power_start(struct power_trace *it, unsigned int type,
+                                        unsigned int state);
+extern void trace_power_mark(struct power_trace *it, unsigned int type,
+                                        unsigned int state);
+extern void trace_power_end(struct power_trace *it);
+#else
+static inline void trace_power_start(struct power_trace *it, unsigned int type,
+                                        unsigned int state) { }
+static inline void trace_power_mark(struct power_trace *it, unsigned int type,
+                                        unsigned int state) { }
+static inline void trace_power_end(struct power_trace *it) { }
+#endif
+/*
+ * Structure that defines an entry function trace.
+ */
+struct ftrace_graph_ent {
+        unsigned long func; /* Current function */
+        int depth;
+};
-struct boot_trace {
+/*
-        pid_t                   caller;
+ * Structure that defines a return function trace.
-        char                    func[KSYM_NAME_LEN];
+ */
-        int                     result;
+struct ftrace_graph_ret {
-        unsigned long long      duration;               /* usecs */
+        unsigned long func; /* Current function */
-        ktime_t                 calltime;
+        unsigned long long calltime;
-        ktime_t                 rettime;
+        unsigned long long rettime;
+        /* Number of functions that overran the depth limit for current task */
+        unsigned long overrun;
+        int depth;
 };
-#ifdef CONFIG_BOOT_TRACER
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
-extern void trace_boot(struct boot_trace *it, initcall_t fn);
-extern void start_boot_trace(void);
+/*
-extern void stop_boot_trace(void);
+ * Sometimes we don't want to trace a function with the function
+ * graph tracer but we want them to keep traced by the usual function
+ * tracer if the function graph tracer is not configured.
+ */
+#define __notrace_funcgraph             notrace
+/*
+ * We want to which function is an entrypoint of a hardirq.
+ * That will help us to put a signal on output.
+ */
+#define __irq_entry              __attribute__((__section__(".irqentry.text")))
+/* Limits of hardirq entrypoints */
+extern char __irqentry_text_start[];
+extern char __irqentry_text_end[];
+#define FTRACE_RETFUNC_DEPTH 50
+#define FTRACE_RETSTACK_ALLOC_SIZE 32
+/* Type of the callback handlers for tracing function graph*/
+typedef void (*trace_func_graph_ret_t)(struct ftrace_graph_ret *); /* return */
+typedef int (*trace_func_graph_ent_t)(struct ftrace_graph_ent *); /* entry */
+extern int register_ftrace_graph(trace_func_graph_ret_t retfunc,
+                                trace_func_graph_ent_t entryfunc);
+extern void ftrace_graph_stop(void);
+/* The current handlers in use */
+extern trace_func_graph_ret_t ftrace_graph_return;
+extern trace_func_graph_ent_t ftrace_graph_entry;
+extern void unregister_ftrace_graph(void);
+extern void ftrace_graph_init_task(struct task_struct *t);
+extern void ftrace_graph_exit_task(struct task_struct *t);
+static inline int task_curr_ret_stack(struct task_struct *t)
+{
+        return t->curr_ret_stack;
+}
+static inline void pause_graph_tracing(void)
+{
+        atomic_inc(&current->tracing_graph_pause);
+}
+static inline void unpause_graph_tracing(void)
+{
+        atomic_dec(&current->tracing_graph_pause);
+}
 #else
-static inline void trace_boot(struct boot_trace *it, initcall_t fn) { }
-static inline void start_boot_trace(void) { }
+#define __notrace_funcgraph
-static inline void stop_boot_trace(void) { }
+#define __irq_entry
+static inline void ftrace_graph_init_task(struct task_struct *t) { }
+static inline void ftrace_graph_exit_task(struct task_struct *t) { }
+static inline int task_curr_ret_stack(struct task_struct *tsk)
+{
+        return -1;
+}
+static inline void pause_graph_tracing(void) { }
+static inline void unpause_graph_tracing(void) { }
 #endif
+#ifdef CONFIG_TRACING
+#include <linux/sched.h>
+/* flags for current->trace */
+enum {
+        TSK_TRACE_FL_TRACE_BIT  = 0,
+        TSK_TRACE_FL_GRAPH_BIT  = 1,
+};
+enum {
+        TSK_TRACE_FL_TRACE      = 1 << TSK_TRACE_FL_TRACE_BIT,
+        TSK_TRACE_FL_GRAPH      = 1 << TSK_TRACE_FL_GRAPH_BIT,
+};
+static inline void set_tsk_trace_trace(struct task_struct *tsk)
+{
+        set_bit(TSK_TRACE_FL_TRACE_BIT, &tsk->trace);
+}
+static inline void clear_tsk_trace_trace(struct task_struct *tsk)
+{
+        clear_bit(TSK_TRACE_FL_TRACE_BIT, &tsk->trace);
+}
+static inline int test_tsk_trace_trace(struct task_struct *tsk)
+{
+        return tsk->trace & TSK_TRACE_FL_TRACE;
+}
+static inline void set_tsk_trace_graph(struct task_struct *tsk)
+{
+        set_bit(TSK_TRACE_FL_GRAPH_BIT, &tsk->trace);
+}
+static inline void clear_tsk_trace_graph(struct task_struct *tsk)
+{
+        clear_bit(TSK_TRACE_FL_GRAPH_BIT, &tsk->trace);
+}
+static inline int test_tsk_trace_graph(struct task_struct *tsk)
+{
+        return tsk->trace & TSK_TRACE_FL_GRAPH;
+}
+#endif /* CONFIG_TRACING */
 #endif /* _LINUX_FTRACE_H */
diff --git a/include/linux/ftrace_irq.h b/include/linux/ftrace_irq.h
new file mode 100644
index 000000000000..366a054d0b05
--- /dev/null
+++ b/include/linux/ftrace_irq.h
@@ -0,0 +1,13 @@
+#ifndef _LINUX_FTRACE_IRQ_H
+#define _LINUX_FTRACE_IRQ_H
+#if defined(CONFIG_DYNAMIC_FTRACE) || defined(CONFIG_FUNCTION_GRAPH_TRACER)
+extern void ftrace_nmi_enter(void);
+extern void ftrace_nmi_exit(void);
+#else
+static inline void ftrace_nmi_enter(void) { }
+static inline void ftrace_nmi_exit(void) { }
+#endif
+#endif /* _LINUX_FTRACE_IRQ_H */
diff --git a/include/linux/futex.h b/include/linux/futex.h
index 586ab56a3ec3..3bf5bb5a34f9 100644
--- a/include/linux/futex.h
+++ b/include/linux/futex.h
@@ -25,7 +25,8 @@ union ktime;
 #define FUTEX_WAKE_BITSET       10
 #define FUTEX_PRIVATE_FLAG      128
-#define FUTEX_CMD_MASK          ~FUTEX_PRIVATE_FLAG
+#define FUTEX_CLOCK_REALTIME    256
+#define FUTEX_CMD_MASK          ~(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME)
 #define FUTEX_WAIT_PRIVATE      (FUTEX_WAIT | FUTEX_PRIVATE_FLAG)
 #define FUTEX_WAKE_PRIVATE      (FUTEX_WAKE | FUTEX_PRIVATE_FLAG)
@@ -164,6 +165,8 @@ union futex_key {
        } both;
 };
+#define FUTEX_KEY_INIT (union futex_key) { .both = { .ptr = NULL } }
 #ifdef CONFIG_FUTEX
 extern void exit_robust_list(struct task_struct *curr);
 extern void exit_pi_state_list(struct task_struct *curr);
diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h
index 4cc913939817..fadff28505bb 100644
--- a/include/linux/generic_serial.h
+++ b/include/linux/generic_serial.h
@@ -21,7 +21,6 @@ struct real_driver {
  void                    (*enable_tx_interrupts) (void *);
  void                    (*disable_rx_interrupts) (void *);
  void                    (*enable_rx_interrupts) (void *);
-  int                     (*get_CD) (void *);
  void                    (*shutdown_port) (void*);
  int                     (*set_real_termios) (void*);
  int                     (*chars_in_buffer) (void*);
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 3df7742ce246..16948eaecae3 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -126,6 +126,7 @@ struct blk_scsi_cmd_filter {
 struct disk_part_tbl {
        struct rcu_head rcu_head;
        int len;
+        struct hd_struct *last_lookup;
        struct hd_struct *part[];
 };
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 181006cc94a0..f83288347dda 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -4,6 +4,7 @@
 #include <linux/preempt.h>
 #include <linux/smp_lock.h>
 #include <linux/lockdep.h>
+#include <linux/ftrace_irq.h>
 #include <asm/hardirq.h>
 #include <asm/system.h>
@@ -118,13 +119,17 @@ static inline void account_system_vtime(struct task_struct *tsk)
 }
 #endif
-#if defined(CONFIG_PREEMPT_RCU) && defined(CONFIG_NO_HZ)
+#if defined(CONFIG_NO_HZ) && !defined(CONFIG_CLASSIC_RCU)
 extern void rcu_irq_enter(void);
 extern void rcu_irq_exit(void);
+extern void rcu_nmi_enter(void);
+extern void rcu_nmi_exit(void);
 #else
 # define rcu_irq_enter() do { } while (0)
 # define rcu_irq_exit() do { } while (0)
-#endif /* CONFIG_PREEMPT_RCU */
+# define rcu_nmi_enter() do { } while (0)
+# define rcu_nmi_exit() do { } while (0)
+#endif /* #if defined(CONFIG_NO_HZ) && !defined(CONFIG_CLASSIC_RCU) */
 /*
 * It is safe to do non-atomic ops on ->hardirq_context,
@@ -134,7 +139,6 @@ extern void rcu_irq_exit(void);
 */
 #define __irq_enter()                                   \
        do {                                            \
-                rcu_irq_enter();                        \
                account_system_vtime(current);          \
                add_preempt_count(HARDIRQ_OFFSET);      \
                trace_hardirq_enter();                  \
@@ -153,7 +157,6 @@ extern void irq_enter(void);
                trace_hardirq_exit();                   \
                account_system_vtime(current);          \
                sub_preempt_count(HARDIRQ_OFFSET);      \
-                rcu_irq_exit();                         \
        } while (0)
 /*
@@ -161,7 +164,20 @@ extern void irq_enter(void);
 */
 extern void irq_exit(void);
-#define nmi_enter()             do { lockdep_off(); __irq_enter(); } while (0)
+#define nmi_enter()                             \
-#define nmi_exit()              do { __irq_exit(); lockdep_on(); } while (0)
+        do {                                    \
+                ftrace_nmi_enter();             \
+                lockdep_off();                  \
+                rcu_nmi_enter();                \
+                __irq_enter();                  \
+        } while (0)
+#define nmi_exit()                              \
+        do {                                    \
+                __irq_exit();                   \
+                rcu_nmi_exit();                 \
+                lockdep_on();                   \
+                ftrace_nmi_exit();              \
+        } while (0)
 #endif /* LINUX_HARDIRQ_H */
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h
index c59769693bee..fd47a151665e 100644
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
@@ -43,7 +43,7 @@ struct hdlc_proto {
 };
-/* Pointed to by dev->priv */
+/* Pointed to by netdev_priv(dev) */
 typedef struct hdlc_device {
        /* used by HDLC layer to take control over HDLC device from hw driver*/
        int (*attach)(struct net_device *dev,
@@ -80,7 +80,7 @@ struct net_device *alloc_hdlcdev(void *priv);
 static inline struct hdlc_device* dev_to_hdlc(struct net_device *dev)
 {
-        return dev->priv;
+        return netdev_priv(dev);
 }
 static __inline__ void debug_frame(const struct sk_buff *skb)
diff --git a/include/linux/hippidevice.h b/include/linux/hippidevice.h
index bab303dafd6e..f148e4908410 100644
--- a/include/linux/hippidevice.h
+++ b/include/linux/hippidevice.h
@@ -32,7 +32,9 @@ struct hippi_cb {
 };
 extern __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev);
+extern int hippi_change_mtu(struct net_device *dev, int new_mtu);
+extern int hippi_mac_addr(struct net_device *dev, void *p);
+extern int hippi_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p);
 extern struct net_device *alloc_hippi_dev(int sizeof_priv);
 #endif
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 3eba43878dcb..bd37078c2d7d 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -43,26 +43,6 @@ enum hrtimer_restart {
 };
 /*
- * hrtimer callback modes:
- *
- *      HRTIMER_CB_SOFTIRQ:             Callback must run in softirq context
- *      HRTIMER_CB_IRQSAFE_PERCPU:      Callback must run in hardirq context
- *                                      Special mode for tick emulation and
- *                                      scheduler timer. Such timers are per
- *                                      cpu and not allowed to be migrated on
- *                                      cpu unplug.
- *      HRTIMER_CB_IRQSAFE_UNLOCKED:    Callback should run in hardirq context
- *                                      with timer->base lock unlocked
- *                                      used for timers which call wakeup to
- *                                      avoid lock order problems with rq->lock
- */
-enum hrtimer_cb_mode {
-        HRTIMER_CB_SOFTIRQ,
-        HRTIMER_CB_IRQSAFE_PERCPU,
-        HRTIMER_CB_IRQSAFE_UNLOCKED,
-};
-/*
 * Values to track state of the timer
 *
 * Possible states:
@@ -70,7 +50,6 @@ enum hrtimer_cb_mode {
 * 0x00         inactive
 * 0x01         enqueued into rbtree
 * 0x02         callback function running
- * 0x04         callback pending (high resolution mode)
 *
 * Special cases:
 * 0x03         callback function running and enqueued
@@ -92,8 +71,7 @@ enum hrtimer_cb_mode {
 #define HRTIMER_STATE_INACTIVE  0x00
 #define HRTIMER_STATE_ENQUEUED  0x01
 #define HRTIMER_STATE_CALLBACK  0x02
-#define HRTIMER_STATE_PENDING   0x04
+#define HRTIMER_STATE_MIGRATE   0x04
-#define HRTIMER_STATE_MIGRATE   0x08
 /**
 * struct hrtimer - the basic hrtimer structure
@@ -109,8 +87,6 @@ enum hrtimer_cb_mode {
 * @function:   timer expiry callback function
 * @base:       pointer to the timer base (per cpu and per clock)
 * @state:      state information (See bit values above)
- * @cb_mode:    high resolution timer feature to select the callback execution
- *               mode
 * @cb_entry:   list head to enqueue an expired timer into the callback list
 * @start_site: timer statistics field to store the site where the timer
 *              was started
@@ -129,7 +105,6 @@ struct hrtimer {
        struct hrtimer_clock_base       *base;
        unsigned long                   state;
        struct list_head                cb_entry;
-        enum hrtimer_cb_mode            cb_mode;
 #ifdef CONFIG_TIMER_STATS
        int                             start_pid;
        void                            *start_site;
@@ -188,15 +163,11 @@ struct hrtimer_clock_base {
 * @check_clocks:       Indictator, when set evaluate time source and clock
 *                      event devices whether high resolution mode can be
 *                      activated.
- * @cb_pending:         Expired timers are moved from the rbtree to this
- *                      list in the timer interrupt. The list is processed
- *                      in the softirq.
 * @nr_events:          Total number of timer interrupt events
 */
 struct hrtimer_cpu_base {
        spinlock_t                      lock;
        struct hrtimer_clock_base       clock_base[HRTIMER_MAX_CLOCK_BASES];
-        struct list_head                cb_pending;
 #ifdef CONFIG_HIGH_RES_TIMERS
        ktime_t                         expires_next;
        int                             hres_active;
@@ -404,8 +375,7 @@ static inline int hrtimer_active(const struct hrtimer *timer)
 */
 static inline int hrtimer_is_queued(struct hrtimer *timer)
 {
-        return timer->state &
+        return timer->state & HRTIMER_STATE_ENQUEUED;
-                (HRTIMER_STATE_ENQUEUED | HRTIMER_STATE_PENDING);
 }
 /*
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 010fb26a1579..db5ef8ae1ab9 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -32,13 +32,6 @@
 # define SUPPORT_VLB_SYNC 1
 #endif
-/*
- * Used to indicate "no IRQ", should be a value that cannot be an IRQ
- * number.
- */
- 
-#define IDE_NO_IRQ              (-1)
 typedef unsigned char   byte;   /* used everywhere */
 /*
@@ -122,8 +115,6 @@ struct ide_io_ports {
 #define MAX_DRIVES      2       /* per interface; 2 assumed by lots of code */
 #define SECTOR_SIZE     512
-#define IDE_LARGE_SEEK(b1,b2,t) (((b1) > (b2) + (t)) || ((b2) > (b1) + (t)))
 /*
 * Timeouts for various operations:
 */
@@ -172,9 +163,7 @@ typedef int (ide_ack_intr_t)(struct hwif_s *);
 enum {          ide_unknown,    ide_generic,    ide_pci,
                ide_cmd640,     ide_dtc2278,    ide_ali14xx,
                ide_qd65xx,     ide_umc8672,    ide_ht6560b,
-                ide_rz1000,     ide_trm290,
+                ide_4drives,    ide_pmac,       ide_acorn,
-                ide_cmd646,     ide_cy82c693,   ide_4drives,
-                ide_pmac,       ide_acorn,
                ide_au1xxx,     ide_palm3710
 };
@@ -407,6 +396,7 @@ enum {
 * This is used for several packet commands (not for READ/WRITE commands).
 */
 #define IDE_PC_BUFFER_SIZE      256
+#define ATAPI_WAIT_PC           (60 * HZ)
 struct ide_atapi_pc {
        /* actual packet bytes */
@@ -484,55 +474,53 @@ enum {
        /* ide-cd */
        /* Drive cannot eject the disc. */
-        IDE_AFLAG_NO_EJECT              = (1 << 3),
+        IDE_AFLAG_NO_EJECT              = (1 << 1),
        /* Drive is a pre ATAPI 1.2 drive. */
-        IDE_AFLAG_PRE_ATAPI12           = (1 << 4),
+        IDE_AFLAG_PRE_ATAPI12           = (1 << 2),
        /* TOC addresses are in BCD. */
-        IDE_AFLAG_TOCADDR_AS_BCD        = (1 << 5),
+        IDE_AFLAG_TOCADDR_AS_BCD        = (1 << 3),
        /* TOC track numbers are in BCD. */
-        IDE_AFLAG_TOCTRACKS_AS_BCD      = (1 << 6),
+        IDE_AFLAG_TOCTRACKS_AS_BCD      = (1 << 4),
        /*
         * Drive does not provide data in multiples of SECTOR_SIZE
         * when more than one interrupt is needed.
         */
-        IDE_AFLAG_LIMIT_NFRAMES         = (1 << 7),
+        IDE_AFLAG_LIMIT_NFRAMES         = (1 << 5),
-        /* Seeking in progress. */
-        IDE_AFLAG_SEEKING               = (1 << 8),
        /* Saved TOC information is current. */
-        IDE_AFLAG_TOC_VALID             = (1 << 9),
+        IDE_AFLAG_TOC_VALID             = (1 << 6),
        /* We think that the drive door is locked. */
-        IDE_AFLAG_DOOR_LOCKED           = (1 << 10),
+        IDE_AFLAG_DOOR_LOCKED           = (1 << 7),
        /* SET_CD_SPEED command is unsupported. */
-        IDE_AFLAG_NO_SPEED_SELECT       = (1 << 11),
+        IDE_AFLAG_NO_SPEED_SELECT       = (1 << 8),
-        IDE_AFLAG_VERTOS_300_SSD        = (1 << 12),
+        IDE_AFLAG_VERTOS_300_SSD        = (1 << 9),
-        IDE_AFLAG_VERTOS_600_ESD        = (1 << 13),
+        IDE_AFLAG_VERTOS_600_ESD        = (1 << 10),
-        IDE_AFLAG_SANYO_3CD             = (1 << 14),
+        IDE_AFLAG_SANYO_3CD             = (1 << 11),
-        IDE_AFLAG_FULL_CAPS_PAGE        = (1 << 15),
+        IDE_AFLAG_FULL_CAPS_PAGE        = (1 << 12),
-        IDE_AFLAG_PLAY_AUDIO_OK         = (1 << 16),
+        IDE_AFLAG_PLAY_AUDIO_OK         = (1 << 13),
-        IDE_AFLAG_LE_SPEED_FIELDS       = (1 << 17),
+        IDE_AFLAG_LE_SPEED_FIELDS       = (1 << 14),
        /* ide-floppy */
        /* Avoid commands not supported in Clik drive */
-        IDE_AFLAG_CLIK_DRIVE            = (1 << 19),
+        IDE_AFLAG_CLIK_DRIVE            = (1 << 15),
        /* Requires BH algorithm for packets */
-        IDE_AFLAG_ZIP_DRIVE             = (1 << 20),
+        IDE_AFLAG_ZIP_DRIVE             = (1 << 16),
        /* Supports format progress report */
-        IDE_AFLAG_SRFP                  = (1 << 22),
+        IDE_AFLAG_SRFP                  = (1 << 17),
        /* ide-tape */
-        IDE_AFLAG_IGNORE_DSC            = (1 << 23),
+        IDE_AFLAG_IGNORE_DSC            = (1 << 18),
        /* 0 When the tape position is unknown */
-        IDE_AFLAG_ADDRESS_VALID         = (1 << 24),
+        IDE_AFLAG_ADDRESS_VALID         = (1 << 19),
        /* Device already opened */
-        IDE_AFLAG_BUSY                  = (1 << 25),
+        IDE_AFLAG_BUSY                  = (1 << 20),
        /* Attempt to auto-detect the current user block size */
-        IDE_AFLAG_DETECT_BS             = (1 << 26),
+        IDE_AFLAG_DETECT_BS             = (1 << 21),
        /* Currently on a filemark */
-        IDE_AFLAG_FILEMARK              = (1 << 27),
+        IDE_AFLAG_FILEMARK              = (1 << 22),
        /* 0 = no tape is loaded, so we don't rewind after ejecting */
-        IDE_AFLAG_MEDIUM_PRESENT        = (1 << 28),
+        IDE_AFLAG_MEDIUM_PRESENT        = (1 << 23),
-        IDE_AFLAG_NO_AUTOCLOSE          = (1 << 29),
+        IDE_AFLAG_NO_AUTOCLOSE          = (1 << 24),
 };
 /* device flags */
@@ -571,28 +559,26 @@ enum {
        IDE_DFLAG_NODMA                 = (1 << 16),
        /* powermanagment told us not to do anything, so sleep nicely */
        IDE_DFLAG_BLOCKED               = (1 << 17),
-        /* ide-scsi emulation */
-        IDE_DFLAG_SCSI                  = (1 << 18),
        /* sleeping & sleep field valid */
-        IDE_DFLAG_SLEEPING              = (1 << 19),
+        IDE_DFLAG_SLEEPING              = (1 << 18),
-        IDE_DFLAG_POST_RESET            = (1 << 20),
+        IDE_DFLAG_POST_RESET            = (1 << 19),
-        IDE_DFLAG_UDMA33_WARNED         = (1 << 21),
+        IDE_DFLAG_UDMA33_WARNED         = (1 << 20),
-        IDE_DFLAG_LBA48                 = (1 << 22),
+        IDE_DFLAG_LBA48                 = (1 << 21),
        /* status of write cache */
-        IDE_DFLAG_WCACHE                = (1 << 23),
+        IDE_DFLAG_WCACHE                = (1 << 22),
        /* used for ignoring ATA_DF */
-        IDE_DFLAG_NOWERR                = (1 << 24),
+        IDE_DFLAG_NOWERR                = (1 << 23),
        /* retrying in PIO */
-        IDE_DFLAG_DMA_PIO_RETRY         = (1 << 25),
+        IDE_DFLAG_DMA_PIO_RETRY         = (1 << 24),
-        IDE_DFLAG_LBA                   = (1 << 26),
+        IDE_DFLAG_LBA                   = (1 << 25),
        /* don't unload heads */
-        IDE_DFLAG_NO_UNLOAD             = (1 << 27),
+        IDE_DFLAG_NO_UNLOAD             = (1 << 26),
        /* heads unloaded, please don't reset port */
-        IDE_DFLAG_PARKED                = (1 << 28),
+        IDE_DFLAG_PARKED                = (1 << 27),
-        IDE_DFLAG_MEDIA_CHANGED         = (1 << 29),
+        IDE_DFLAG_MEDIA_CHANGED         = (1 << 28),
        /* write protect */
-        IDE_DFLAG_WP                    = (1 << 30),
+        IDE_DFLAG_WP                    = (1 << 29),
-        IDE_DFLAG_FORMAT_IN_PROGRESS    = (1 << 31),
+        IDE_DFLAG_FORMAT_IN_PROGRESS    = (1 << 30),
 };
 struct ide_drive_s {
@@ -616,8 +602,6 @@ struct ide_drive_s {
        unsigned long dev_flags;
        unsigned long sleep;            /* sleep until this time */
-        unsigned long service_start;    /* time we started last request */
-        unsigned long service_time;     /* service time of last request */
        unsigned long timeout;          /* max time to wait for irq */
        special_t       special;        /* special action flags */
@@ -845,8 +829,6 @@ typedef struct hwif_s {
        unsigned        extra_ports;    /* number of extra dma ports */
        unsigned        present    : 1; /* this interface exists */
-        unsigned        serialized : 1; /* serialized all channel operation */
-        unsigned        sharing_irq: 1; /* 1 = sharing irq with another hwif */
        unsigned        sg_mapped  : 1; /* sg_table and sg_nents are ready */
        struct device           gendev;
@@ -887,8 +869,6 @@ typedef struct hwgroup_s {
                /* BOOL: protects all fields below */
        volatile int busy;
-                /* BOOL: wake us up on timer expiry */
-        unsigned int sleeping   : 1;
                /* BOOL: polling active & poll_timeout field valid */
        unsigned int polling    : 1;
@@ -909,6 +889,8 @@ typedef struct hwgroup_s {
        int req_gen;
        int req_gen_timer;
+        spinlock_t lock;
 } ide_hwgroup_t;
 typedef struct ide_driver_s ide_driver_t;
@@ -1122,6 +1104,14 @@ enum {
        IDE_PM_COMPLETED,
 };
+int generic_ide_suspend(struct device *, pm_message_t);
+int generic_ide_resume(struct device *);
+void ide_complete_power_step(ide_drive_t *, struct request *);
+ide_startstop_t ide_start_power_step(ide_drive_t *, struct request *);
+void ide_complete_pm_request(ide_drive_t *, struct request *);
+void ide_check_pm_state(ide_drive_t *, struct request *);
 /*
 * Subdrivers support.
 *
@@ -1256,14 +1246,11 @@ int ide_set_media_lock(ide_drive_t *, struct gendisk *, int);
 void ide_create_request_sense_cmd(ide_drive_t *, struct ide_atapi_pc *);
 void ide_retry_pc(ide_drive_t *, struct gendisk *);
-static inline unsigned long ide_scsi_get_timeout(struct ide_atapi_pc *pc)
+int ide_cd_expiry(ide_drive_t *);
-{
-        return max_t(unsigned long, WAIT_CMD, pc->timeout - jiffies);
-}
-int ide_scsi_expiry(ide_drive_t *);
+int ide_cd_get_xferlen(struct request *);
-ide_startstop_t ide_issue_pc(ide_drive_t *, unsigned int, ide_expiry_t *);
+ide_startstop_t ide_issue_pc(ide_drive_t *);
 ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *);
@@ -1285,6 +1272,26 @@ extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout);
 extern void ide_timer_expiry(unsigned long);
 extern irqreturn_t ide_intr(int irq, void *dev_id);
+static inline int ide_lock_hwgroup(ide_hwgroup_t *hwgroup)
+{
+        if (hwgroup->busy)
+                return 1;
+        hwgroup->busy = 1;
+        /* for atari only */
+        ide_get_lock(ide_intr, hwgroup);
+        return 0;
+}
+static inline void ide_unlock_hwgroup(ide_hwgroup_t *hwgroup)
+{
+        /* for atari only */
+        ide_release_lock();
+        hwgroup->busy = 0;
+}
 extern void do_ide_request(struct request_queue *);
 void ide_init_disk(struct gendisk *, ide_drive_t *);
@@ -1376,8 +1383,8 @@ enum {
        IDE_HFLAG_LEGACY_IRQS           = (1 << 21),
        /* force use of legacy IRQs */
        IDE_HFLAG_FORCE_LEGACY_IRQS     = (1 << 22),
-        /* limit LBA48 requests to 256 sectors */
+        /* host is TRM290 */
-        IDE_HFLAG_RQSIZE_256            = (1 << 23),
+        IDE_HFLAG_TRM290                = (1 << 23),
        /* use 32-bit I/O ops */
        IDE_HFLAG_IO_32BIT              = (1 << 24),
        /* unmask IRQs */
@@ -1415,6 +1422,9 @@ struct ide_port_info {
        ide_pci_enablebit_t     enablebits[2];
        hwif_chipset_t          chipset;
+        u16                     max_sectors;    /* if < than the default one */
        u32                     host_flags;
        u8                      pio_mask;
        u8                      swdma_mask;
@@ -1528,6 +1538,7 @@ void ide_unregister_region(struct gendisk *);
 void ide_undecoded_slave(ide_drive_t *);
 void ide_port_apply_params(ide_hwif_t *);
+int ide_sysfs_register_port(ide_hwif_t *);
 struct ide_host *ide_host_alloc(const struct ide_port_info *, hw_regs_t **);
 void ide_host_free(struct ide_host *);
@@ -1610,18 +1621,21 @@ extern struct mutex ide_cfg_mtx;
 /*
 * Structure locking:
 *
- * ide_cfg_mtx and ide_lock together protect changes to
+ * ide_cfg_mtx and hwgroup->lock together protect changes to
- * ide_hwif_t->{next,hwgroup}
+ * ide_hwif_t->next
 * ide_drive_t->next
 *
- * ide_hwgroup_t->busy: ide_lock
+ * ide_hwgroup_t->busy: hwgroup->lock
- * ide_hwgroup_t->hwif: ide_lock
+ * ide_hwgroup_t->hwif: hwgroup->lock
- * ide_hwif_t->mate: constant, no locking
+ * ide_hwif_t->{hwgroup,mate}: constant, no locking
 * ide_drive_t->hwif: constant, no locking
 */
 #define local_irq_set(flags)    do { local_save_flags((flags)); local_irq_enable_in_hardirq(); } while (0)
+char *ide_media_string(ide_drive_t *);
+extern struct device_attribute ide_dev_attrs[];
 extern struct bus_type ide_bus_type;
 extern struct class *ide_port_class;
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 14126bc36641..c4e6ca1a6306 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -12,8 +12,8 @@
 * published by the Free Software Foundation.
 */
-#ifndef IEEE80211_H
+#ifndef LINUX_IEEE80211_H
-#define IEEE80211_H
+#define LINUX_IEEE80211_H
 #include <linux/types.h>
 #include <asm/byteorder.h>
@@ -97,7 +97,10 @@
 #define IEEE80211_MAX_FRAME_LEN         2352
 #define IEEE80211_MAX_SSID_LEN          32
 #define IEEE80211_MAX_MESH_ID_LEN       32
+#define IEEE80211_MESH_CONFIG_LEN       19
 #define IEEE80211_QOS_CTL_LEN           2
 #define IEEE80211_QOS_CTL_TID_MASK      0x000F
 #define IEEE80211_QOS_CTL_TAG1D_MASK    0x0007
@@ -666,6 +669,13 @@ struct ieee80211_cts {
        u8 ra[6];
 } __attribute__ ((packed));
+struct ieee80211_pspoll {
+        __le16 frame_control;
+        __le16 aid;
+        u8 bssid[6];
+        u8 ta[6];
+} __attribute__ ((packed));
 /**
 * struct ieee80211_bar - HT Block Ack Request
 *
@@ -685,28 +695,88 @@ struct ieee80211_bar {
 #define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL     0x0000
 #define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA  0x0004
+#define IEEE80211_HT_MCS_MASK_LEN               10
+/**
+ * struct ieee80211_mcs_info - MCS information
+ * @rx_mask: RX mask
+ * @rx_highest: highest supported RX rate
+ * @tx_params: TX parameters
+ */
+struct ieee80211_mcs_info {
+        u8 rx_mask[IEEE80211_HT_MCS_MASK_LEN];
+        __le16 rx_highest;
+        u8 tx_params;
+        u8 reserved[3];
+} __attribute__((packed));
+/* 802.11n HT capability MSC set */
+#define IEEE80211_HT_MCS_RX_HIGHEST_MASK        0x3ff
+#define IEEE80211_HT_MCS_TX_DEFINED             0x01
+#define IEEE80211_HT_MCS_TX_RX_DIFF             0x02
+/* value 0 == 1 stream etc */
+#define IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK    0x0C
+#define IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT   2
+#define         IEEE80211_HT_MCS_TX_MAX_STREAMS 4
+#define IEEE80211_HT_MCS_TX_UNEQUAL_MODULATION  0x10
+/*
+ * 802.11n D5.0 20.3.5 / 20.6 says:
+ * - indices 0 to 7 and 32 are single spatial stream
+ * - 8 to 31 are multiple spatial streams using equal modulation
+ *   [8..15 for two streams, 16..23 for three and 24..31 for four]
+ * - remainder are multiple spatial streams using unequal modulation
+ */
+#define IEEE80211_HT_MCS_UNEQUAL_MODULATION_START 33
+#define IEEE80211_HT_MCS_UNEQUAL_MODULATION_START_BYTE \
+        (IEEE80211_HT_MCS_UNEQUAL_MODULATION_START / 8)
 /**
 * struct ieee80211_ht_cap - HT capabilities
 *
- * This structure refers to "HT capabilities element" as
+ * This structure is the "HT capabilities element" as
- * described in 802.11n draft section 7.3.2.52
+ * described in 802.11n D5.0 7.3.2.57
 */
 struct ieee80211_ht_cap {
        __le16 cap_info;
        u8 ampdu_params_info;
-        u8 supp_mcs_set[16];
+        /* 16 bytes MCS information */
+        struct ieee80211_mcs_info mcs;
        __le16 extended_ht_cap_info;
        __le32 tx_BF_cap_info;
        u8 antenna_selection_info;
 } __attribute__ ((packed));
+/* 802.11n HT capabilities masks (for cap_info) */
+#define IEEE80211_HT_CAP_LDPC_CODING            0x0001
+#define IEEE80211_HT_CAP_SUP_WIDTH_20_40        0x0002
+#define IEEE80211_HT_CAP_SM_PS                  0x000C
+#define IEEE80211_HT_CAP_GRN_FLD                0x0010
+#define IEEE80211_HT_CAP_SGI_20                 0x0020
+#define IEEE80211_HT_CAP_SGI_40                 0x0040
+#define IEEE80211_HT_CAP_TX_STBC                0x0080
+#define IEEE80211_HT_CAP_RX_STBC                0x0300
+#define IEEE80211_HT_CAP_DELAY_BA               0x0400
+#define IEEE80211_HT_CAP_MAX_AMSDU              0x0800
+#define IEEE80211_HT_CAP_DSSSCCK40              0x1000
+#define IEEE80211_HT_CAP_PSMP_SUPPORT           0x2000
+#define IEEE80211_HT_CAP_40MHZ_INTOLERANT       0x4000
+#define IEEE80211_HT_CAP_LSIG_TXOP_PROT         0x8000
+/* 802.11n HT capability AMPDU settings (for ampdu_params_info) */
+#define IEEE80211_HT_AMPDU_PARM_FACTOR          0x03
+#define IEEE80211_HT_AMPDU_PARM_DENSITY         0x1C
 /**
- * struct ieee80211_ht_cap - HT additional information
+ * struct ieee80211_ht_info - HT information
 *
- * This structure refers to "HT information element" as
+ * This structure is the "HT information element" as
- * described in 802.11n draft section 7.3.2.53
+ * described in 802.11n D5.0 7.3.2.58
 */
-struct ieee80211_ht_addt_info {
+struct ieee80211_ht_info {
        u8 control_chan;
        u8 ht_param;
        __le16 operation_mode;
@@ -714,36 +784,33 @@ struct ieee80211_ht_addt_info {
        u8 basic_set[16];
 } __attribute__ ((packed));
-/* 802.11n HT capabilities masks */
+/* for ht_param */
-#define IEEE80211_HT_CAP_SUP_WIDTH              0x0002
+#define IEEE80211_HT_PARAM_CHA_SEC_OFFSET               0x03
-#define IEEE80211_HT_CAP_SM_PS                  0x000C
+#define         IEEE80211_HT_PARAM_CHA_SEC_NONE         0x00
-#define IEEE80211_HT_CAP_GRN_FLD                0x0010
+#define         IEEE80211_HT_PARAM_CHA_SEC_ABOVE        0x01
-#define IEEE80211_HT_CAP_SGI_20                 0x0020
+#define         IEEE80211_HT_PARAM_CHA_SEC_BELOW        0x03
-#define IEEE80211_HT_CAP_SGI_40                 0x0040
+#define IEEE80211_HT_PARAM_CHAN_WIDTH_ANY               0x04
-#define IEEE80211_HT_CAP_DELAY_BA               0x0400
+#define IEEE80211_HT_PARAM_RIFS_MODE                    0x08
-#define IEEE80211_HT_CAP_MAX_AMSDU              0x0800
+#define IEEE80211_HT_PARAM_SPSMP_SUPPORT                0x10
-#define IEEE80211_HT_CAP_DSSSCCK40              0x1000
+#define IEEE80211_HT_PARAM_SERV_INTERVAL_GRAN           0xE0
-/* 802.11n HT capability AMPDU settings */
-#define IEEE80211_HT_CAP_AMPDU_FACTOR           0x03
+/* for operation_mode */
-#define IEEE80211_HT_CAP_AMPDU_DENSITY          0x1C
+#define IEEE80211_HT_OP_MODE_PROTECTION                 0x0003
-/* 802.11n HT capability MSC set */
+#define         IEEE80211_HT_OP_MODE_PROTECTION_NONE            0
-#define IEEE80211_SUPP_MCS_SET_UEQM             4
+#define         IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER       1
-#define IEEE80211_HT_CAP_MAX_STREAMS            4
+#define         IEEE80211_HT_OP_MODE_PROTECTION_20MHZ           2
-#define IEEE80211_SUPP_MCS_SET_LEN              10
+#define         IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED     3
-/* maximum streams the spec allows */
+#define IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT           0x0004
-#define IEEE80211_HT_CAP_MCS_TX_DEFINED         0x01
+#define IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT           0x0010
-#define IEEE80211_HT_CAP_MCS_TX_RX_DIFF         0x02
-#define IEEE80211_HT_CAP_MCS_TX_STREAMS         0x0C
+/* for stbc_param */
-#define IEEE80211_HT_CAP_MCS_TX_UEQM            0x10
+#define IEEE80211_HT_STBC_PARAM_DUAL_BEACON             0x0040
-/* 802.11n HT IE masks */
+#define IEEE80211_HT_STBC_PARAM_DUAL_CTS_PROT           0x0080
-#define IEEE80211_HT_IE_CHA_SEC_OFFSET          0x03
+#define IEEE80211_HT_STBC_PARAM_STBC_BEACON             0x0100
-#define IEEE80211_HT_IE_CHA_SEC_NONE            0x00
+#define IEEE80211_HT_STBC_PARAM_LSIG_TXOP_FULLPROT      0x0200
-#define IEEE80211_HT_IE_CHA_SEC_ABOVE           0x01
+#define IEEE80211_HT_STBC_PARAM_PCO_ACTIVE              0x0400
-#define IEEE80211_HT_IE_CHA_SEC_BELOW           0x03
+#define IEEE80211_HT_STBC_PARAM_PCO_PHASE               0x0800
-#define IEEE80211_HT_IE_CHA_WIDTH               0x04
-#define IEEE80211_HT_IE_HT_PROTECTION           0x0003
-#define IEEE80211_HT_IE_NON_GF_STA_PRSNT        0x0004
-#define IEEE80211_HT_IE_NON_HT_STA_PRSNT        0x0010
 /* block-ack parameters */
 #define IEEE80211_ADDBA_PARAM_POLICY_MASK 0x0002
@@ -769,7 +836,6 @@ struct ieee80211_ht_addt_info {
 /* Authentication algorithms */
 #define WLAN_AUTH_OPEN 0
 #define WLAN_AUTH_SHARED_KEY 1
-#define WLAN_AUTH_FAST_BSS_TRANSITION 2
 #define WLAN_AUTH_LEAP 128
 #define WLAN_AUTH_CHALLENGE_LEN 128
@@ -949,7 +1015,7 @@ enum ieee80211_eid {
        WLAN_EID_EXT_SUPP_RATES = 50,
        /* 802.11n */
        WLAN_EID_HT_CAPABILITY = 45,
-        WLAN_EID_HT_EXTRA_INFO = 61,
+        WLAN_EID_HT_INFORMATION = 61,
        /* 802.11i */
        WLAN_EID_RSN = 48,
        WLAN_EID_WPA = 221,
@@ -976,6 +1042,68 @@ enum ieee80211_spectrum_mgmt_actioncode {
        WLAN_ACTION_SPCT_CHL_SWITCH = 4,
 };
+/*
+ * IEEE 802.11-2007 7.3.2.9 Country information element
+ *
+ * Minimum length is 8 octets, ie len must be evenly
+ * divisible by 2
+ */
+/* Although the spec says 8 I'm seeing 6 in practice */
+#define IEEE80211_COUNTRY_IE_MIN_LEN    6
+/*
+ * For regulatory extension stuff see IEEE 802.11-2007
+ * Annex I (page 1141) and Annex J (page 1147). Also
+ * review 7.3.2.9.
+ *
+ * When dot11RegulatoryClassesRequired is true and the
+ * first_channel/reg_extension_id is >= 201 then the IE
+ * compromises of the 'ext' struct represented below:
+ *
+ *  - Regulatory extension ID - when generating IE this just needs
+ *    to be monotonically increasing for each triplet passed in
+ *    the IE
+ *  - Regulatory class - index into set of rules
+ *  - Coverage class - index into air propagation time (Table 7-27),
+ *    in microseconds, you can compute the air propagation time from
+ *    the index by multiplying by 3, so index 10 yields a propagation
+ *    of 10 us. Valid values are 0-31, values 32-255 are not defined
+ *    yet. A value of 0 inicates air propagation of <= 1 us.
+ *
+ *  See also Table I.2 for Emission limit sets and table
+ *  I.3 for Behavior limit sets. Table J.1 indicates how to map
+ *  a reg_class to an emission limit set and behavior limit set.
+ */
+#define IEEE80211_COUNTRY_EXTENSION_ID 201
+/*
+ *  Channels numbers in the IE must be monotonically increasing
+ *  if dot11RegulatoryClassesRequired is not true.
+ *
+ *  If dot11RegulatoryClassesRequired is true consecutive
+ *  subband triplets following a regulatory triplet shall
+ *  have monotonically increasing first_channel number fields.
+ *
+ *  Channel numbers shall not overlap.
+ *
+ *  Note that max_power is signed.
+ */
+struct ieee80211_country_ie_triplet {
+        union {
+                struct {
+                        u8 first_channel;
+                        u8 num_channels;
+                        s8 max_power;
+                } __attribute__ ((packed)) chans;
+                struct {
+                        u8 reg_extension_id;
+                        u8 reg_class;
+                        u8 coverage_class;
+                } __attribute__ ((packed)) ext;
+        };
+} __attribute__ ((packed));
 /* BACK action code */
 enum ieee80211_back_actioncode {
        WLAN_ACTION_ADDBA_REQ = 0,
@@ -1057,4 +1185,4 @@ static inline u8 *ieee80211_get_DA(struct ieee80211_hdr *hdr)
                return hdr->addr1;
 }
-#endif /* IEEE80211_H */
+#endif /* LINUX_IEEE80211_H */
diff --git a/include/linux/if.h b/include/linux/if.h
index 65246846c844..2a6e29620a96 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -65,6 +65,7 @@
 #define IFF_BONDING     0x20            /* bonding master or slave      */
 #define IFF_SLAVE_NEEDARP 0x40          /* need ARPs for validation     */
 #define IFF_ISATAP      0x80            /* ISATAP interface (RFC4214)   */
+#define IFF_MASTER_ARPMON 0x100         /* bonding master, ARP mon in use */
 #define IF_GET_IFACE    0x0001          /* for querying only */
 #define IF_GET_PROTO    0x0002
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 4d3401812e6c..5ff89809a581 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -87,6 +87,9 @@
 #define ARPHRD_IEEE80211_PRISM 802      /* IEEE 802.11 + Prism2 header  */
 #define ARPHRD_IEEE80211_RADIOTAP 803   /* IEEE 802.11 + radiotap header */
+#define ARPHRD_PHONET   820             /* PhoNet media type            */
+#define ARPHRD_PHONET_PIPE 821          /* PhoNet pipe header           */
 #define ARPHRD_VOID       0xFFFF        /* Void type, nothing is known */
 #define ARPHRD_NONE       0xFFFE        /* zero header length */
diff --git a/include/linux/in.h b/include/linux/in.h
index db458beef19d..d60122a3a088 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -80,6 +80,10 @@ struct in_addr {
 /* BSD compatibility */
 #define IP_RECVRETOPTS  IP_RETOPTS
+/* TProxy original addresses */
+#define IP_ORIGDSTADDR       20
+#define IP_RECVORIGDSTADDR   IP_ORIGDSTADDR
 /* IP_MTU_DISCOVER values */
 #define IP_PMTUDISC_DONT                0       /* Never send DF frames */
 #define IP_PMTUDISC_WANT                1       /* Use per route hints  */
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 23fd8909b9e5..2f3c2d4ef73b 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -12,6 +12,7 @@
 #include <net/net_namespace.h>
 extern struct files_struct init_files;
+extern struct fs_struct init_fs;
 #define INIT_KIOCTX(name, which_mm) \
 {                                                       \
@@ -57,7 +58,6 @@ extern struct nsproxy init_nsproxy;
        .mnt_ns         = NULL,                                         \
        INIT_NET_NS(net_ns)                                             \
        INIT_IPC_NS(ipc_ns)                                             \
-        .user_ns        = &init_user_ns,                                \
 }
 #define INIT_SIGHAND(sighand) {                                         \
@@ -113,6 +113,8 @@ extern struct group_info init_groups;
 # define CAP_INIT_BSET  CAP_INIT_EFF_SET
 #endif
+extern struct cred init_cred;
 /*
 *  INIT_TASK is used to set up the first task table, touch at
 * your own risk!. Base=0, limit=0x1fffff (=2MB)
@@ -147,13 +149,10 @@ extern struct group_info init_groups;
        .children       = LIST_HEAD_INIT(tsk.children),                 \
        .sibling        = LIST_HEAD_INIT(tsk.sibling),                  \
        .group_leader   = &tsk,                                         \
-        .group_info     = &init_groups,                                 \
+        .real_cred      = &init_cred,                                   \
-        .cap_effective  = CAP_INIT_EFF_SET,                             \
+        .cred           = &init_cred,                                   \
-        .cap_inheritable = CAP_INIT_INH_SET,                            \
+        .cred_exec_mutex =                                              \
-        .cap_permitted  = CAP_FULL_SET,                                 \
+                 __MUTEX_INITIALIZER(tsk.cred_exec_mutex),              \
-        .cap_bset       = CAP_INIT_BSET,                                \
-        .securebits     = SECUREBITS_DEFAULT,                           \
-        .user           = INIT_USER,                                    \
        .comm           = "swapper",                                    \
        .thread         = INIT_THREAD,                                  \
        .fs             = &init_fs,                                     \
diff --git a/include/linux/input.h b/include/linux/input.h
index 5341e8251f8c..9a6355f74db2 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -659,6 +659,8 @@ struct input_absinfo {
 #define SW_RADIO                SW_RFKILL_ALL   /* deprecated */
 #define SW_MICROPHONE_INSERT    0x04  /* set = inserted */
 #define SW_DOCK                 0x05  /* set = plugged into dock */
+#define SW_LINEOUT_INSERT       0x06  /* set = inserted */
+#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
 #define SW_MAX                  0x0f
 #define SW_CNT                  (SW_MAX+1)
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 3d017cfd245b..c4f6c101dbcd 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -23,8 +23,6 @@
 #define _INTEL_IOMMU_H_
 #include <linux/types.h>
-#include <linux/msi.h>
-#include <linux/sysdev.h>
 #include <linux/iova.h>
 #include <linux/io.h>
 #include <linux/dma_remapping.h>
@@ -289,10 +287,10 @@ struct intel_iommu {
        void __iomem    *reg; /* Pointer to hardware regs, virtual addr */
        u64             cap;
        u64             ecap;
-        int             seg;
        u32             gcmd; /* Holds TE, EAFL. Don't need SRTP, SFL, WBF */
        spinlock_t      register_lock; /* protect register handling */
        int             seq_id; /* sequence id of the iommu */
+        int             agaw; /* agaw of this iommu */
 #ifdef CONFIG_DMAR
        unsigned long   *domain_ids; /* bitmap of domains */
@@ -302,8 +300,6 @@ struct intel_iommu {
        unsigned int irq;
        unsigned char name[7];    /* Device Name */
-        struct msi_msg saved_msg;
-        struct sys_device sysdev;
        struct iommu_flush flush;
 #endif
        struct q_inval  *qi;            /* Queued invalidation info */
@@ -334,25 +330,6 @@ extern int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,
 extern void qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
-void intel_iommu_domain_exit(struct dmar_domain *domain);
-struct dmar_domain *intel_iommu_domain_alloc(struct pci_dev *pdev);
-int intel_iommu_context_mapping(struct dmar_domain *domain,
-                                struct pci_dev *pdev);
-int intel_iommu_page_mapping(struct dmar_domain *domain, dma_addr_t iova,
-                             u64 hpa, size_t size, int prot);
-void intel_iommu_detach_dev(struct dmar_domain *domain, u8 bus, u8 devfn);
-struct dmar_domain *intel_iommu_find_domain(struct pci_dev *pdev);
-u64 intel_iommu_iova_to_pfn(struct dmar_domain *domain, u64 iova);
-#ifdef CONFIG_DMAR
-int intel_iommu_found(void);
-#else /* CONFIG_DMAR */
-static inline int intel_iommu_found(void)
-{
-        return 0;
-}
-#endif /* CONFIG_DMAR */
 extern void *intel_alloc_coherent(struct device *, size_t, dma_addr_t *, gfp_t);
 extern void intel_free_coherent(struct device *, size_t, void *, dma_addr_t);
 extern dma_addr_t intel_map_single(struct device *, phys_addr_t, size_t, int);
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index f58a0cf8929a..0702c4d7bdf0 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -14,6 +14,8 @@
 #include <linux/irqflags.h>
 #include <linux/smp.h>
 #include <linux/percpu.h>
+#include <linux/irqnr.h>
 #include <asm/atomic.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
@@ -107,15 +109,15 @@ extern void enable_irq(unsigned int irq);
 #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
-extern cpumask_t irq_default_affinity;
+extern cpumask_var_t irq_default_affinity;
-extern int irq_set_affinity(unsigned int irq, cpumask_t cpumask);
+extern int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask);
 extern int irq_can_set_affinity(unsigned int irq);
 extern int irq_select_affinity(unsigned int irq);
 #else /* CONFIG_SMP */
-static inline int irq_set_affinity(unsigned int irq, cpumask_t cpumask)
+static inline int irq_set_affinity(unsigned int irq, const struct cpumask *m)
 {
        return -EINVAL;
 }
@@ -251,9 +253,6 @@ enum
        BLOCK_SOFTIRQ,
        TASKLET_SOFTIRQ,
        SCHED_SOFTIRQ,
-#ifdef CONFIG_HIGH_RES_TIMERS
-        HRTIMER_SOFTIRQ,
-#endif
        RCU_SOFTIRQ,    /* Preferable RCU should always be the last softirq */
        NR_SOFTIRQS
@@ -465,4 +464,10 @@ static inline void init_irq_proc(void)
 int show_interrupts(struct seq_file *p, void *v);
+struct irq_desc;
+extern int early_irq_init(void);
+extern int arch_early_irq_init(void);
+extern int arch_init_chip_data(struct irq_desc *desc, int cpu);
 #endif
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
new file mode 100644
index 000000000000..8a7bfb1b6ca0
--- /dev/null
+++ b/include/linux/iommu.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2007-2008 Advanced Micro Devices, Inc.
+ * Author: Joerg Roedel <joerg.roedel@amd.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+#ifndef __LINUX_IOMMU_H
+#define __LINUX_IOMMU_H
+#define IOMMU_READ      (1)
+#define IOMMU_WRITE     (2)
+struct device;
+struct iommu_domain {
+        void *priv;
+};
+struct iommu_ops {
+        int (*domain_init)(struct iommu_domain *domain);
+        void (*domain_destroy)(struct iommu_domain *domain);
+        int (*attach_dev)(struct iommu_domain *domain, struct device *dev);
+        void (*detach_dev)(struct iommu_domain *domain, struct device *dev);
+        int (*map)(struct iommu_domain *domain, unsigned long iova,
+                   phys_addr_t paddr, size_t size, int prot);
+        void (*unmap)(struct iommu_domain *domain, unsigned long iova,
+                      size_t size);
+        phys_addr_t (*iova_to_phys)(struct iommu_domain *domain,
+                                    unsigned long iova);
+};
+#ifdef CONFIG_IOMMU_API
+extern void register_iommu(struct iommu_ops *ops);
+extern bool iommu_found(void);
+extern struct iommu_domain *iommu_domain_alloc(void);
+extern void iommu_domain_free(struct iommu_domain *domain);
+extern int iommu_attach_device(struct iommu_domain *domain,
+                               struct device *dev);
+extern void iommu_detach_device(struct iommu_domain *domain,
+                                struct device *dev);
+extern int iommu_map_range(struct iommu_domain *domain, unsigned long iova,
+                           phys_addr_t paddr, size_t size, int prot);
+extern void iommu_unmap_range(struct iommu_domain *domain, unsigned long iova,
+                              size_t size);
+extern phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain,
+                                      unsigned long iova);
+#else /* CONFIG_IOMMU_API */
+static inline void register_iommu(struct iommu_ops *ops)
+{
+}
+static inline bool iommu_found(void)
+{
+        return false;
+}
+static inline struct iommu_domain *iommu_domain_alloc(void)
+{
+        return NULL;
+}
+static inline void iommu_domain_free(struct iommu_domain *domain)
+{
+}
+static inline int iommu_attach_device(struct iommu_domain *domain,
+                                      struct device *dev)
+{
+        return -ENODEV;
+}
+static inline void iommu_detach_device(struct iommu_domain *domain,
+                                       struct device *dev)
+{
+}
+static inline int iommu_map_range(struct iommu_domain *domain,
+                                  unsigned long iova, phys_addr_t paddr,
+                                  size_t size, int prot)
+{
+        return -ENODEV;
+}
+static inline void iommu_unmap_range(struct iommu_domain *domain,
+                                     unsigned long iova, size_t size)
+{
+}
+static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain,
+                                             unsigned long iova)
+{
+        return 0;
+}
+#endif /* CONFIG_IOMMU_API */
+#endif /* __LINUX_IOMMU_H */
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 641e026eee8f..0b816cae533e 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -278,6 +278,7 @@ struct ipv6_pinfo {
        struct in6_addr         saddr;
        struct in6_addr         rcv_saddr;
        struct in6_addr         daddr;
+        struct in6_pktinfo      sticky_pktinfo;
        struct in6_addr         *daddr_cache;
 #ifdef CONFIG_IPV6_SUBTREES
        struct in6_addr         *saddr_cache;
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 3dddfa703ebd..f899b502f186 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -113,7 +113,8 @@ struct irq_chip {
        void            (*eoi)(unsigned int irq);
        void            (*end)(unsigned int irq);
-        void            (*set_affinity)(unsigned int irq, cpumask_t dest);
+        void            (*set_affinity)(unsigned int irq,
+                                        const struct cpumask *dest);
        int             (*retrigger)(unsigned int irq);
        int             (*set_type)(unsigned int irq, unsigned int flow_type);
        int             (*set_wake)(unsigned int irq, unsigned int on);
@@ -129,9 +130,14 @@ struct irq_chip {
        const char      *typename;
 };
+struct timer_rand_state;
+struct irq_2_iommu;
 /**
 * struct irq_desc - interrupt descriptor
 * @irq:                interrupt number for this descriptor
+ * @timer_rand_state:   pointer to timer rand state struct
+ * @kstat_irqs:         irq stats per cpu
+ * @irq_2_iommu:        iommu with this irq
 * @handle_irq:         highlevel irq-events handler [if NULL, __do_IRQ()]
 * @chip:               low level interrupt hardware access
 * @msi_desc:           MSI descriptor
@@ -143,8 +149,8 @@ struct irq_chip {
 * @depth:              disable-depth, for nested irq_disable() calls
 * @wake_depth:         enable depth, for multiple set_irq_wake() callers
 * @irq_count:          stats field to detect stalled irqs
- * @irqs_unhandled:     stats field for spurious unhandled interrupts
 * @last_unhandled:     aging timer for unhandled count
+ * @irqs_unhandled:     stats field for spurious unhandled interrupts
 * @lock:               locking for SMP
 * @affinity:           IRQ affinity on SMP
 * @cpu:                cpu index useful for balancing
@@ -154,6 +160,13 @@ struct irq_chip {
 */
 struct irq_desc {
        unsigned int            irq;
+#ifdef CONFIG_SPARSE_IRQ
+        struct timer_rand_state *timer_rand_state;
+        unsigned int            *kstat_irqs;
+# ifdef CONFIG_INTR_REMAP
+        struct irq_2_iommu      *irq_2_iommu;
+# endif
+#endif
        irq_flow_handler_t      handle_irq;
        struct irq_chip         *chip;
        struct msi_desc         *msi_desc;
@@ -165,8 +178,8 @@ struct irq_desc {
        unsigned int            depth;          /* nested irq disables */
        unsigned int            wake_depth;     /* nested wake enables */
        unsigned int            irq_count;      /* For detecting broken IRQs */
-        unsigned int            irqs_unhandled;
        unsigned long           last_unhandled; /* Aging timer for unhandled count */
+        unsigned int            irqs_unhandled;
        spinlock_t              lock;
 #ifdef CONFIG_SMP
        cpumask_t               affinity;
@@ -181,12 +194,32 @@ struct irq_desc {
        const char              *name;
 } ____cacheline_internodealigned_in_smp;
+extern void arch_init_copy_chip_data(struct irq_desc *old_desc,
+                                        struct irq_desc *desc, int cpu);
+extern void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc);
+#ifndef CONFIG_SPARSE_IRQ
 extern struct irq_desc irq_desc[NR_IRQS];
+#else /* CONFIG_SPARSE_IRQ */
+extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int cpu);
+#define kstat_irqs_this_cpu(DESC) \
+        ((DESC)->kstat_irqs[smp_processor_id()])
+#define kstat_incr_irqs_this_cpu(irqno, DESC) \
+        ((DESC)->kstat_irqs[smp_processor_id()]++)
-static inline struct irq_desc *irq_to_desc(unsigned int irq)
+#endif /* CONFIG_SPARSE_IRQ */
+extern struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu);
+static inline struct irq_desc *
+irq_remap_to_desc(unsigned int irq, struct irq_desc *desc)
 {
-        return (irq < nr_irqs) ? irq_desc + irq : NULL;
+#ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC
+        return irq_to_desc(irq);
+#else
+        return desc;
+#endif
 }
 /*
@@ -380,6 +413,11 @@ extern int set_irq_msi(unsigned int irq, struct msi_desc *entry);
 #define get_irq_data(irq)       (irq_to_desc(irq)->handler_data)
 #define get_irq_msi(irq)        (irq_to_desc(irq)->msi_desc)
+#define get_irq_desc_chip(desc)         ((desc)->chip)
+#define get_irq_desc_chip_data(desc)    ((desc)->chip_data)
+#define get_irq_desc_data(desc)         ((desc)->handler_data)
+#define get_irq_desc_msi(desc)          ((desc)->msi_desc)
 #endif /* CONFIG_GENERIC_HARDIRQS */
 #endif /* !CONFIG_S390 */
diff --git a/include/linux/irqnr.h b/include/linux/irqnr.h
index 452c280c8115..5504a5c97836 100644
--- a/include/linux/irqnr.h
+++ b/include/linux/irqnr.h
@@ -1,24 +1,41 @@
 #ifndef _LINUX_IRQNR_H
 #define _LINUX_IRQNR_H
+/*
+ * Generic irq_desc iterators:
+ */
+#ifdef __KERNEL__
 #ifndef CONFIG_GENERIC_HARDIRQS
 #include <asm/irq.h>
 # define nr_irqs                NR_IRQS
 # define for_each_irq_desc(irq, desc)           \
        for (irq = 0; irq < nr_irqs; irq++)
-#else
+# define for_each_irq_desc_reverse(irq, desc)                          \
+        for (irq = nr_irqs - 1; irq >= 0; irq--)
+#else /* CONFIG_GENERIC_HARDIRQS */
 extern int nr_irqs;
+extern struct irq_desc *irq_to_desc(unsigned int irq);
+# define for_each_irq_desc(irq, desc)                                   \
+        for (irq = 0, desc = irq_to_desc(irq); irq < nr_irqs;           \
+             irq++, desc = irq_to_desc(irq))                            \
+                if (desc)
-# define for_each_irq_desc(irq, desc)           \
-        for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc++)
 # define for_each_irq_desc_reverse(irq, desc)                           \
-        for (irq = nr_irqs - 1, desc = irq_desc + (nr_irqs - 1);        \
+        for (irq = nr_irqs - 1, desc = irq_to_desc(irq); irq >= 0;      \
-             irq >= 0; irq--, desc--)
+             irq--, desc = irq_to_desc(irq))                            \
-#endif
+                if (desc)
-#define for_each_irq_nr(irq)                    \
+#endif /* CONFIG_GENERIC_HARDIRQS */
-        for (irq = 0; irq < nr_irqs; irq++)
+#define for_each_irq_nr(irq)                   \
+       for (irq = 0; irq < nr_irqs; irq++)
+#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index 0d1840723249..7faca98c7d14 100644
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -59,9 +59,7 @@ struct stliport {
        unsigned int            devnr;
        int                     baud_base;
        int                     custom_divisor;
-        int                     close_delay;
        int                     closing_wait;
-        int                     openwaitcnt;
        int                     rc;
        int                     argsize;
        void                    *argp;
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index abb6ac639e8e..1a9cf78bfce5 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -115,10 +115,20 @@ static inline u64 get_jiffies_64(void)
         ((long)(a) - (long)(b) >= 0))
 #define time_before_eq(a,b)     time_after_eq(b,a)
+/*
+ * Calculate whether a is in the range of [b, c].
+ */
 #define time_in_range(a,b,c) \
        (time_after_eq(a,b) && \
         time_before_eq(a,c))
+/*
+ * Calculate whether a is in the range of [b, c).
+ */
+#define time_in_range_open(a,b,c) \
+        (time_after_eq(a,b) && \
+         time_before(a,c))
 /* Same as above, but does so with platform independent 64bit types.
 * These must be used when utilizing jiffies_64 (i.e. return value of
 * get_jiffies_64() */
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index dc7e0d0a6474..ca9ff6411dfa 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -141,6 +141,15 @@ extern int _cond_resched(void);
                (__x < 0) ? -__x : __x;         \
        })
+#ifdef CONFIG_PROVE_LOCKING
+void might_fault(void);
+#else
+static inline void might_fault(void)
+{
+        might_sleep();
+}
+#endif
 extern struct atomic_notifier_head panic_notifier_list;
 extern long (*panic_blink)(long time);
 NORET_TYPE void panic(const char * fmt, ...)
@@ -188,6 +197,8 @@ extern unsigned long long memparse(const char *ptr, char **retptr);
 extern int core_kernel_text(unsigned long addr);
 extern int __kernel_text_address(unsigned long addr);
 extern int kernel_text_address(unsigned long addr);
+extern int func_ptr_is_kernel_text(void *ptr);
 struct pid;
 extern struct pid *session_of_pgrp(struct pid *pgrp);
@@ -361,18 +372,6 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
        ((unsigned char *)&addr)[3]
 #define NIPQUAD_FMT "%u.%u.%u.%u"
-#define NIP6(addr) \
-        ntohs((addr).s6_addr16[0]), \
-        ntohs((addr).s6_addr16[1]), \
-        ntohs((addr).s6_addr16[2]), \
-        ntohs((addr).s6_addr16[3]), \
-        ntohs((addr).s6_addr16[4]), \
-        ntohs((addr).s6_addr16[5]), \
-        ntohs((addr).s6_addr16[6]), \
-        ntohs((addr).s6_addr16[7])
-#define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x"
-#define NIP6_SEQFMT "%04x%04x%04x%04x%04x%04x%04x%04x"
 #if defined(__LITTLE_ENDIAN)
 #define HIPQUAD(addr) \
        ((unsigned char *)&addr)[3], \
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index 4a145caeee07..570d20413119 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -28,7 +28,9 @@ struct cpu_usage_stat {
 struct kernel_stat {
        struct cpu_usage_stat   cpustat;
-        unsigned int irqs[NR_IRQS];
+#ifndef CONFIG_SPARSE_IRQ
+       unsigned int irqs[NR_IRQS];
+#endif
 };
 DECLARE_PER_CPU(struct kernel_stat, kstat);
@@ -39,6 +41,10 @@ DECLARE_PER_CPU(struct kernel_stat, kstat);
 extern unsigned long long nr_context_switches(void);
+#ifndef CONFIG_SPARSE_IRQ
+#define kstat_irqs_this_cpu(irq) \
+        (kstat_this_cpu.irqs[irq])
 struct irq_desc;
 static inline void kstat_incr_irqs_this_cpu(unsigned int irq,
@@ -46,11 +52,17 @@ static inline void kstat_incr_irqs_this_cpu(unsigned int irq,
 {
        kstat_this_cpu.irqs[irq]++;
 }
+#endif
+#ifndef CONFIG_SPARSE_IRQ
 static inline unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
 {
       return kstat_cpu(cpu).irqs[irq];
 }
+#else
+extern unsigned int kstat_irqs_cpu(unsigned int irq, int cpu);
+#endif
 /*
 * Number of interrupts per specific IRQ source, since bootup
@@ -67,10 +79,13 @@ static inline unsigned int kstat_irqs(unsigned int irq)
 }
 extern unsigned long long task_delta_exec(struct task_struct *);
-extern void account_user_time(struct task_struct *, cputime_t);
+extern void account_user_time(struct task_struct *, cputime_t, cputime_t);
-extern void account_user_time_scaled(struct task_struct *, cputime_t);
+extern void account_system_time(struct task_struct *, int, cputime_t, cputime_t);
-extern void account_system_time(struct task_struct *, int, cputime_t);
+extern void account_steal_time(cputime_t);
-extern void account_system_time_scaled(struct task_struct *, cputime_t);
+extern void account_idle_time(cputime_t);
-extern void account_steal_time(struct task_struct *, cputime_t);
+extern void account_process_tick(struct task_struct *, int user);
+extern void account_steal_ticks(unsigned long ticks);
+extern void account_idle_ticks(unsigned long ticks);
 #endif /* _LINUX_KERNEL_STAT_H */
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 17f76fc05173..adc34f2c6eff 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -100,6 +100,10 @@ struct kimage {
 #define KEXEC_TYPE_DEFAULT 0
 #define KEXEC_TYPE_CRASH   1
        unsigned int preserve_context : 1;
+#ifdef ARCH_HAS_KIMAGE_ARCH
+        struct kimage_arch arch;
+#endif
 };
diff --git a/include/linux/key-ui.h b/include/linux/key-ui.h
deleted file mode 100644
index e8b8a7a5c496..000000000000
--- a/include/linux/key-ui.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* key-ui.h: key userspace interface stuff
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#ifndef _LINUX_KEY_UI_H
-#define _LINUX_KEY_UI_H
-#include <linux/key.h>
-/* the key tree */
-extern struct rb_root key_serial_tree;
-extern spinlock_t key_serial_lock;
-/* required permissions */
-#define KEY_VIEW        0x01    /* require permission to view attributes */
-#define KEY_READ        0x02    /* require permission to read content */
-#define KEY_WRITE       0x04    /* require permission to update / modify */
-#define KEY_SEARCH      0x08    /* require permission to search (keyring) or find (key) */
-#define KEY_LINK        0x10    /* require permission to link */
-#define KEY_SETATTR     0x20    /* require permission to change attributes */
-#define KEY_ALL         0x3f    /* all the above permissions */
-/*
- * the keyring payload contains a list of the keys to which the keyring is
- * subscribed
- */
-struct keyring_list {
-        struct rcu_head rcu;            /* RCU deletion hook */
-        unsigned short  maxkeys;        /* max keys this list can hold */
-        unsigned short  nkeys;          /* number of keys currently held */
-        unsigned short  delkey;         /* key to be unlinked by RCU */
-        struct key      *keys[0];
-};
-/*
- * check to see whether permission is granted to use a key in the desired way
- */
-extern int key_task_permission(const key_ref_t key_ref,
-                               struct task_struct *context,
-                               key_perm_t perm);
-static inline int key_permission(const key_ref_t key_ref, key_perm_t perm)
-{
-        return key_task_permission(key_ref, current, perm);
-}
-extern key_ref_t lookup_user_key(struct task_struct *context,
-                                 key_serial_t id, int create, int partial,
-                                 key_perm_t perm);
-extern long join_session_keyring(const char *name);
-extern struct key_type *key_type_lookup(const char *type);
-extern void key_type_put(struct key_type *ktype);
-#define key_negative_timeout    60      /* default timeout on a negative key's existence */
-#endif /* _LINUX_KEY_UI_H */
diff --git a/include/linux/key.h b/include/linux/key.h
index 1b70e35a71e3..21d32a142c00 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -73,6 +73,7 @@ struct key;
 struct seq_file;
 struct user_struct;
 struct signal_struct;
+struct cred;
 struct key_type;
 struct key_owner;
@@ -181,7 +182,7 @@ struct key {
 extern struct key *key_alloc(struct key_type *type,
                             const char *desc,
                             uid_t uid, gid_t gid,
-                             struct task_struct *ctx,
+                             const struct cred *cred,
                             key_perm_t perm,
                             unsigned long flags);
@@ -249,7 +250,7 @@ extern int key_unlink(struct key *keyring,
                      struct key *key);
 extern struct key *keyring_alloc(const char *description, uid_t uid, gid_t gid,
-                                 struct task_struct *ctx,
+                                 const struct cred *cred,
                                 unsigned long flags,
                                 struct key *dest);
@@ -276,24 +277,11 @@ extern ctl_table key_sysctls[];
 /*
 * the userspace interface
 */
-extern void switch_uid_keyring(struct user_struct *new_user);
+extern int install_thread_keyring_to_cred(struct cred *cred);
-extern int copy_keys(unsigned long clone_flags, struct task_struct *tsk);
-extern int copy_thread_group_keys(struct task_struct *tsk);
-extern void exit_keys(struct task_struct *tsk);
-extern void exit_thread_group_keys(struct signal_struct *tg);
-extern int suid_keys(struct task_struct *tsk);
-extern int exec_keys(struct task_struct *tsk);
 extern void key_fsuid_changed(struct task_struct *tsk);
 extern void key_fsgid_changed(struct task_struct *tsk);
 extern void key_init(void);
-#define __install_session_keyring(tsk, keyring)                 \
-({                                                              \
-        struct key *old_session = tsk->signal->session_keyring; \
-        tsk->signal->session_keyring = keyring;                 \
-        old_session;                                            \
-})
 #else /* CONFIG_KEYS */
 #define key_validate(k)                 0
@@ -302,17 +290,9 @@ extern void key_init(void);
 #define key_revoke(k)                   do { } while(0)
 #define key_put(k)                      do { } while(0)
 #define key_ref_put(k)                  do { } while(0)
-#define make_key_ref(k, p)                      ({ NULL; })
+#define make_key_ref(k, p)              NULL
-#define key_ref_to_ptr(k)               ({ NULL; })
+#define key_ref_to_ptr(k)               NULL
 #define is_key_possessed(k)             0
-#define switch_uid_keyring(u)           do { } while(0)
-#define __install_session_keyring(t, k) ({ NULL; })
-#define copy_keys(f,t)                  0
-#define copy_thread_group_keys(t)       0
-#define exit_keys(t)                    do { } while(0)
-#define exit_thread_group_keys(tg)      do { } while(0)
-#define suid_keys(t)                    do { } while(0)
-#define exec_keys(t)                    do { } while(0)
 #define key_fsuid_changed(t)            do { } while(0)
 #define key_fsgid_changed(t)            do { } while(0)
 #define key_init()                      do { } while(0)
diff --git a/include/linux/keyctl.h b/include/linux/keyctl.h
index 656ee6b77a4a..c0688eb72093 100644
--- a/include/linux/keyctl.h
+++ b/include/linux/keyctl.h
@@ -1,6 +1,6 @@
 /* keyctl.h: keyctl command IDs
 *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2004, 2008 Red Hat, Inc. All Rights Reserved.
 * Written by David Howells (dhowells@redhat.com)
 *
 * This program is free software; you can redistribute it and/or
@@ -20,6 +20,7 @@
 #define KEY_SPEC_USER_SESSION_KEYRING   -5      /* - key ID for UID-session keyring */
 #define KEY_SPEC_GROUP_KEYRING          -6      /* - key ID for GID-specific keyring */
 #define KEY_SPEC_REQKEY_AUTH_KEY        -7      /* - key ID for assumed request_key auth key */
+#define KEY_SPEC_REQUESTOR_KEYRING      -8      /* - key ID for request_key() dest keyring */
 /* request-key default keyrings */
 #define KEY_REQKEY_DEFL_NO_CHANGE               -1
@@ -30,6 +31,7 @@
 #define KEY_REQKEY_DEFL_USER_KEYRING            4
 #define KEY_REQKEY_DEFL_USER_SESSION_KEYRING    5
 #define KEY_REQKEY_DEFL_GROUP_KEYRING           6
+#define KEY_REQKEY_DEFL_REQUESTOR_KEYRING       7
 /* keyctl commands */
 #define KEYCTL_GET_KEYRING_ID           0       /* ask for a keyring's ID */
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index f18b86fa8655..35525ac63337 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -83,6 +83,7 @@ struct kvm_irqchip {
 #define KVM_EXIT_S390_SIEIC       13
 #define KVM_EXIT_S390_RESET       14
 #define KVM_EXIT_DCR              15
+#define KVM_EXIT_NMI              16
 /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */
 struct kvm_run {
@@ -387,6 +388,14 @@ struct kvm_trace_rec {
 #define KVM_CAP_DEVICE_ASSIGNMENT 17
 #endif
 #define KVM_CAP_IOMMU 18
+#if defined(CONFIG_X86)
+#define KVM_CAP_DEVICE_MSI 20
+#endif
+/* Bug in KVM_SET_USER_MEMORY_REGION fixed: */
+#define KVM_CAP_DESTROY_MEMORY_REGION_WORKS 21
+#if defined(CONFIG_X86)
+#define KVM_CAP_USER_NMI 22
+#endif
 /*
 * ioctls for VM fds
@@ -458,6 +467,8 @@ struct kvm_trace_rec {
 #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_TRC_INJ_VIRQ         (KVM_TRC_HANDLER + 0x02)
 #define KVM_TRC_REDELIVER_EVT    (KVM_TRC_HANDLER + 0x03)
@@ -500,10 +511,17 @@ struct kvm_assigned_irq {
        __u32 guest_irq;
        __u32 flags;
        union {
+                struct {
+                        __u32 addr_lo;
+                        __u32 addr_hi;
+                        __u32 data;
+                } guest_msi;
                __u32 reserved[12];
        };
 };
 #define KVM_DEV_ASSIGN_ENABLE_IOMMU     (1 << 0)
+#define KVM_DEV_IRQ_ASSIGN_ENABLE_MSI   (1 << 0)
 #endif
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index bb92be2153bc..ec49d0be7f52 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -16,6 +16,7 @@
 #include <linux/mm.h>
 #include <linux/preempt.h>
 #include <linux/marker.h>
+#include <linux/msi.h>
 #include <asm/signal.h>
 #include <linux/kvm.h>
@@ -306,9 +307,16 @@ struct kvm_assigned_dev_kernel {
        int host_busnr;
        int host_devfn;
        int host_irq;
+        bool host_irq_disabled;
        int guest_irq;
-        int irq_requested;
+        struct msi_msg guest_msi;
+#define KVM_ASSIGNED_DEV_GUEST_INTX     (1 << 0)
+#define KVM_ASSIGNED_DEV_GUEST_MSI      (1 << 1)
+#define KVM_ASSIGNED_DEV_HOST_INTX      (1 << 8)
+#define KVM_ASSIGNED_DEV_HOST_MSI       (1 << 9)
+        unsigned long irq_requested_type;
        int irq_source_id;
+        int flags;
        struct pci_dev *dev;
        struct kvm *kvm;
 };
@@ -316,18 +324,20 @@ void kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
 void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi);
 void kvm_register_irq_ack_notifier(struct kvm *kvm,
                                   struct kvm_irq_ack_notifier *kian);
-void kvm_unregister_irq_ack_notifier(struct kvm *kvm,
+void kvm_unregister_irq_ack_notifier(struct kvm_irq_ack_notifier *kian);
-                                     struct kvm_irq_ack_notifier *kian);
 int kvm_request_irq_source_id(struct kvm *kvm);
 void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id);
-#ifdef CONFIG_DMAR
+#ifdef CONFIG_IOMMU_API
 int kvm_iommu_map_pages(struct kvm *kvm, gfn_t base_gfn,
                        unsigned long npages);
-int kvm_iommu_map_guest(struct kvm *kvm,
+int kvm_iommu_map_guest(struct kvm *kvm);
-                        struct kvm_assigned_dev_kernel *assigned_dev);
 int kvm_iommu_unmap_guest(struct kvm *kvm);
-#else /* CONFIG_DMAR */
+int kvm_assign_device(struct kvm *kvm,
+                      struct kvm_assigned_dev_kernel *assigned_dev);
+int kvm_deassign_device(struct kvm *kvm,
+                        struct kvm_assigned_dev_kernel *assigned_dev);
+#else /* CONFIG_IOMMU_API */
 static inline int kvm_iommu_map_pages(struct kvm *kvm,
                                      gfn_t base_gfn,
                                      unsigned long npages)
@@ -335,9 +345,7 @@ static inline int kvm_iommu_map_pages(struct kvm *kvm,
        return 0;
 }
-static inline int kvm_iommu_map_guest(struct kvm *kvm,
+static inline int kvm_iommu_map_guest(struct kvm *kvm)
-                                      struct kvm_assigned_dev_kernel
-                                      *assigned_dev)
 {
        return -ENODEV;
 }
@@ -346,7 +354,19 @@ static inline int kvm_iommu_unmap_guest(struct kvm *kvm)
 {
        return 0;
 }
-#endif /* CONFIG_DMAR */
+static inline int kvm_assign_device(struct kvm *kvm,
+                struct kvm_assigned_dev_kernel *assigned_dev)
+{
+        return 0;
+}
+static inline int kvm_deassign_device(struct kvm *kvm,
+                struct kvm_assigned_dev_kernel *assigned_dev)
+{
+        return 0;
+}
+#endif /* CONFIG_IOMMU_API */
 static inline void kvm_guest_enter(void)
 {
diff --git a/include/linux/lguest_launcher.h b/include/linux/lguest_launcher.h
index e7217dc58f39..a53407a4165c 100644
--- a/include/linux/lguest_launcher.h
+++ b/include/linux/lguest_launcher.h
@@ -54,9 +54,13 @@ struct lguest_vqconfig {
 /* Write command first word is a request. */
 enum lguest_req
 {
-        LHREQ_INITIALIZE, /* + base, pfnlimit, pgdir, start */
+        LHREQ_INITIALIZE, /* + base, pfnlimit, start */
        LHREQ_GETDMA, /* No longer used */
        LHREQ_IRQ, /* + irq */
        LHREQ_BREAK, /* + on/off flag (on blocks until someone does off) */
 };
+/* The alignment to use between consumer and producer parts of vring.
+ * x86 pagesize for historical reasons. */
+#define LGUEST_VRING_ALIGN      4096
 #endif /* _LINUX_LGUEST_LAUNCHER */
diff --git a/include/linux/libata.h b/include/linux/libata.h
index ed3f26eb5df1..3449de597eff 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -213,10 +213,11 @@ enum {
        ATA_PFLAG_FROZEN        = (1 << 2), /* port is frozen */
        ATA_PFLAG_RECOVERED     = (1 << 3), /* recovery action performed */
        ATA_PFLAG_LOADING       = (1 << 4), /* boot/loading probe */
-        ATA_PFLAG_UNLOADING     = (1 << 5), /* module is unloading */
        ATA_PFLAG_SCSI_HOTPLUG  = (1 << 6), /* SCSI hotplug scheduled */
        ATA_PFLAG_INITIALIZING  = (1 << 7), /* being initialized, don't touch */
        ATA_PFLAG_RESETTING     = (1 << 8), /* reset in progress */
+        ATA_PFLAG_UNLOADING     = (1 << 9), /* driver is being unloaded */
+        ATA_PFLAG_UNLOADED      = (1 << 10), /* driver is unloaded */
        ATA_PFLAG_SUSPENDED     = (1 << 17), /* port is suspended (power) */
        ATA_PFLAG_PM_PENDING    = (1 << 18), /* PM operation pending */
@@ -1285,26 +1286,62 @@ static inline int ata_link_active(struct ata_link *link)
        return ata_tag_valid(link->active_tag) || link->sactive;
 }
-extern struct ata_link *__ata_port_next_link(struct ata_port *ap,
+/*
-                                             struct ata_link *link,
+ * Iterators
-                                             bool dev_only);
+ *
+ * ATA_LITER_* constants are used to select link iteration mode and
+ * ATA_DITER_* device iteration mode.
+ *
+ * For a custom iteration directly using ata_{link|dev}_next(), if
+ * @link or @dev, respectively, is NULL, the first element is
+ * returned.  @dev and @link can be any valid device or link and the
+ * next element according to the iteration mode will be returned.
+ * After the last element, NULL is returned.
+ */
+enum ata_link_iter_mode {
+        ATA_LITER_EDGE,         /* if present, PMP links only; otherwise,
+                                 * host link.  no slave link */
+        ATA_LITER_HOST_FIRST,   /* host link followed by PMP or slave links */
+        ATA_LITER_PMP_FIRST,    /* PMP links followed by host link,
+                                 * slave link still comes after host link */
+};
-#define __ata_port_for_each_link(link, ap) \
+enum ata_dev_iter_mode {
-        for ((link) = __ata_port_next_link((ap), NULL, false); (link); \
+        ATA_DITER_ENABLED,
-             (link) = __ata_port_next_link((ap), (link), false))
+        ATA_DITER_ENABLED_REVERSE,
+        ATA_DITER_ALL,
+        ATA_DITER_ALL_REVERSE,
+};
-#define ata_port_for_each_link(link, ap) \
+extern struct ata_link *ata_link_next(struct ata_link *link,
-        for ((link) = __ata_port_next_link((ap), NULL, true); (link); \
+                                      struct ata_port *ap,
-             (link) = __ata_port_next_link((ap), (link), true))
+                                      enum ata_link_iter_mode mode);
-#define ata_link_for_each_dev(dev, link) \
+extern struct ata_device *ata_dev_next(struct ata_device *dev,
-        for ((dev) = (link)->device; \
+                                       struct ata_link *link,
-             (dev) < (link)->device + ata_link_max_devices(link) || ((dev) = NULL); \
+                                       enum ata_dev_iter_mode mode);
-             (dev)++)
+/*
+ * Shortcut notation for iterations
+ *
+ * ata_for_each_link() iterates over each link of @ap according to
+ * @mode.  @link points to the current link in the loop.  @link is
+ * NULL after loop termination.  ata_for_each_dev() works the same way
+ * except that it iterates over each device of @link.
+ *
+ * Note that the mode prefixes ATA_{L|D}ITER_ shouldn't need to be
+ * specified when using the following shorthand notations.  Only the
+ * mode itself (EDGE, HOST_FIRST, ENABLED, etc...) should be
+ * specified.  This not only increases brevity but also makes it
+ * impossible to use ATA_LITER_* for device iteration or vice-versa.
+ */
+#define ata_for_each_link(link, ap, mode) \
+        for ((link) = ata_link_next(NULL, (ap), ATA_LITER_##mode); (link); \
+             (link) = ata_link_next((link), (ap), ATA_LITER_##mode))
-#define ata_link_for_each_dev_reverse(dev, link) \
+#define ata_for_each_dev(dev, link, mode) \
-        for ((dev) = (link)->device + ata_link_max_devices(link) - 1; \
+        for ((dev) = ata_dev_next(NULL, (link), ATA_DITER_##mode); (dev); \
-             (dev) >= (link)->device || ((dev) = NULL); (dev)--)
+             (dev) = ata_dev_next((dev), (link), ATA_DITER_##mode))
 /**
 *      ata_ncq_enabled - Test whether NCQ is enabled
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 9fd1f859021b..fee9e59649c1 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -64,14 +64,6 @@
        name:
 #endif
-#define KPROBE_ENTRY(name) \
-  .pushsection .kprobes.text, "ax"; \
-  ENTRY(name)
-#define KPROBE_END(name) \
-  END(name);             \
-  .popsection
 #ifndef END
 #define END(name) \
  .size name, .-name
diff --git a/include/linux/list_nulls.h b/include/linux/list_nulls.h
new file mode 100644
index 000000000000..93150ecf3ea4
--- /dev/null
+++ b/include/linux/list_nulls.h
@@ -0,0 +1,94 @@
+#ifndef _LINUX_LIST_NULLS_H
+#define _LINUX_LIST_NULLS_H
+/*
+ * Special version of lists, where end of list is not a NULL pointer,
+ * but a 'nulls' marker, which can have many different values.
+ * (up to 2^31 different values guaranteed on all platforms)
+ *
+ * In the standard hlist, termination of a list is the NULL pointer.
+ * In this special 'nulls' variant, we use the fact that objects stored in
+ * a list are aligned on a word (4 or 8 bytes alignment).
+ * We therefore use the last significant bit of 'ptr' :
+ * Set to 1 : This is a 'nulls' end-of-list marker (ptr >> 1)
+ * Set to 0 : This is a pointer to some object (ptr)
+ */
+struct hlist_nulls_head {
+        struct hlist_nulls_node *first;
+};
+struct hlist_nulls_node {
+        struct hlist_nulls_node *next, **pprev;
+};
+#define INIT_HLIST_NULLS_HEAD(ptr, nulls) \
+        ((ptr)->first = (struct hlist_nulls_node *) (1UL | (((long)nulls) << 1)))
+#define hlist_nulls_entry(ptr, type, member) container_of(ptr,type,member)
+/**
+ * ptr_is_a_nulls - Test if a ptr is a nulls
+ * @ptr: ptr to be tested
+ *
+ */
+static inline int is_a_nulls(const struct hlist_nulls_node *ptr)
+{
+        return ((unsigned long)ptr & 1);
+}
+/**
+ * get_nulls_value - Get the 'nulls' value of the end of chain
+ * @ptr: end of chain
+ *
+ * Should be called only if is_a_nulls(ptr);
+ */
+static inline unsigned long get_nulls_value(const struct hlist_nulls_node *ptr)
+{
+        return ((unsigned long)ptr) >> 1;
+}
+static inline int hlist_nulls_unhashed(const struct hlist_nulls_node *h)
+{
+        return !h->pprev;
+}
+static inline int hlist_nulls_empty(const struct hlist_nulls_head *h)
+{
+        return is_a_nulls(h->first);
+}
+static inline void __hlist_nulls_del(struct hlist_nulls_node *n)
+{
+        struct hlist_nulls_node *next = n->next;
+        struct hlist_nulls_node **pprev = n->pprev;
+        *pprev = next;
+        if (!is_a_nulls(next))
+                next->pprev = pprev;
+}
+/**
+ * hlist_nulls_for_each_entry   - iterate over list of given type
+ * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the &struct hlist_node to use as a loop cursor.
+ * @head:       the head for your list.
+ * @member:     the name of the hlist_node within the struct.
+ *
+ */
+#define hlist_nulls_for_each_entry(tpos, pos, head, member)                    \
+        for (pos = (head)->first;                                              \
+             (!is_a_nulls(pos)) &&                                             \
+                ({ tpos = hlist_nulls_entry(pos, typeof(*tpos), member); 1;}); \
+             pos = pos->next)
+/**
+ * hlist_nulls_for_each_entry_from - iterate over a hlist continuing from current point
+ * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the &struct hlist_node to use as a loop cursor.
+ * @member:     the name of the hlist_node within the struct.
+ *
+ */
+#define hlist_nulls_for_each_entry_from(tpos, pos, member)      \
+        for (; (!is_a_nulls(pos)) &&                            \
+                ({ tpos = hlist_nulls_entry(pos, typeof(*tpos), member); 1;}); \
+             pos = pos->next)
+#endif
diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
index e5872dc994c0..fbc48f898521 100644
--- a/include/linux/lockd/bind.h
+++ b/include/linux/lockd/bind.h
@@ -41,6 +41,7 @@ struct nlmclnt_initdata {
        size_t                  addrlen;
        unsigned short          protocol;
        u32                     nfs_version;
+        int                     noresvport;
 };
 /*
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index b56d5aa9b194..23da3fa69efa 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -49,6 +49,7 @@ struct nlm_host {
        unsigned short          h_proto;        /* transport proto */
        unsigned short          h_reclaiming : 1,
                                h_server     : 1, /* server side, not client side */
+                                h_noresvport : 1,
                                h_inuse      : 1;
        wait_queue_head_t       h_gracewait;    /* wait while reclaiming */
        struct rw_semaphore     h_rwsem;        /* Reboot recovery lock */
@@ -220,7 +221,8 @@ struct nlm_host  *nlmclnt_lookup_host(const struct sockaddr *sap,
                                        const size_t salen,
                                        const unsigned short protocol,
                                        const u32 version,
-                                        const char *hostname);
+                                        const char *hostname,
+                                        int noresvport);
 struct nlm_host  *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
                                        const char *hostname,
                                        const size_t hostname_len);
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 29aec6e10020..23bf02fb124f 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -73,6 +73,8 @@ struct lock_class_key {
        struct lockdep_subclass_key     subkeys[MAX_LOCKDEP_SUBCLASSES];
 };
+#define LOCKSTAT_POINTS         4
 /*
 * The lock-class itself:
 */
@@ -119,7 +121,8 @@ struct lock_class {
        int                             name_version;
 #ifdef CONFIG_LOCK_STAT
-        unsigned long                   contention_point[4];
+        unsigned long                   contention_point[LOCKSTAT_POINTS];
+        unsigned long                   contending_point[LOCKSTAT_POINTS];
 #endif
 };
@@ -144,6 +147,7 @@ enum bounce_type {
 struct lock_class_stats {
        unsigned long                   contention_point[4];
+        unsigned long                   contending_point[4];
        struct lock_time                read_waittime;
        struct lock_time                write_waittime;
        struct lock_time                read_holdtime;
@@ -165,6 +169,7 @@ struct lockdep_map {
        const char                      *name;
 #ifdef CONFIG_LOCK_STAT
        int                             cpu;
+        unsigned long                   ip;
 #endif
 };
@@ -309,8 +314,15 @@ extern void lock_acquire(struct lockdep_map *lock, unsigned int subclass,
 extern void lock_release(struct lockdep_map *lock, int nested,
                         unsigned long ip);
-extern void lock_set_subclass(struct lockdep_map *lock, unsigned int subclass,
+extern void lock_set_class(struct lockdep_map *lock, const char *name,
-                              unsigned long ip);
+                           struct lock_class_key *key, unsigned int subclass,
+                           unsigned long ip);
+static inline void lock_set_subclass(struct lockdep_map *lock,
+                unsigned int subclass, unsigned long ip)
+{
+        lock_set_class(lock, lock->name, lock->key, subclass, ip);
+}
 # define INIT_LOCKDEP                           .lockdep_recursion = 0,
@@ -328,6 +340,7 @@ static inline void lockdep_on(void)
 # define lock_acquire(l, s, t, r, c, n, i)      do { } while (0)
 # define lock_release(l, n, i)                  do { } while (0)
+# define lock_set_class(l, n, k, s, i)          do { } while (0)
 # define lock_set_subclass(l, s, i)             do { } while (0)
 # define lockdep_init()                         do { } while (0)
 # define lockdep_info()                         do { } while (0)
@@ -356,7 +369,7 @@ struct lock_class_key { };
 #ifdef CONFIG_LOCK_STAT
 extern void lock_contended(struct lockdep_map *lock, unsigned long ip);
-extern void lock_acquired(struct lockdep_map *lock);
+extern void lock_acquired(struct lockdep_map *lock, unsigned long ip);
 #define LOCK_CONTENDED(_lock, try, lock)                        \
 do {                                                            \
@@ -364,20 +377,20 @@ do {								\
                lock_contended(&(_lock)->dep_map, _RET_IP_);    \
                lock(_lock);                                    \
        }                                                       \
-        lock_acquired(&(_lock)->dep_map);                       \
+        lock_acquired(&(_lock)->dep_map, _RET_IP_);                     \
 } while (0)
 #else /* CONFIG_LOCK_STAT */
 #define lock_contended(lockdep_map, ip) do {} while (0)
-#define lock_acquired(lockdep_map) do {} while (0)
+#define lock_acquired(lockdep_map, ip) do {} while (0)
 #define LOCK_CONTENDED(_lock, try, lock) \
        lock(_lock)
 #endif /* CONFIG_LOCK_STAT */
-#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_GENERIC_HARDIRQS)
+#ifdef CONFIG_GENERIC_HARDIRQS
 extern void early_init_irq_lock_class(void);
 #else
 static inline void early_init_irq_lock_class(void)
@@ -481,4 +494,22 @@ static inline void print_irqtrace_events(struct task_struct *curr)
 # define lock_map_release(l)                    do { } while (0)
 #endif
+#ifdef CONFIG_PROVE_LOCKING
+# define might_lock(lock)                                               \
+do {                                                                    \
+        typecheck(struct lockdep_map *, &(lock)->dep_map);              \
+        lock_acquire(&(lock)->dep_map, 0, 0, 0, 2, NULL, _THIS_IP_);    \
+        lock_release(&(lock)->dep_map, 0, _THIS_IP_);                   \
+} while (0)
+# define might_lock_read(lock)                                          \
+do {                                                                    \
+        typecheck(struct lockdep_map *, &(lock)->dep_map);              \
+        lock_acquire(&(lock)->dep_map, 0, 0, 1, 2, NULL, _THIS_IP_);    \
+        lock_release(&(lock)->dep_map, 0, _THIS_IP_);                   \
+} while (0)
+#else
+# define might_lock(lock) do { } while (0)
+# define might_lock_read(lock) do { } while (0)
+#endif
 #endif /* __LINUX_LOCKDEP_H */
diff --git a/include/linux/marker.h b/include/linux/marker.h
index 889196c7fbb1..b85e74ca782f 100644
--- a/include/linux/marker.h
+++ b/include/linux/marker.h
@@ -12,6 +12,7 @@
 * See the file COPYING for more details.
 */
+#include <stdarg.h>
 #include <linux/types.h>
 struct module;
@@ -48,10 +49,28 @@ struct marker {
        void (*call)(const struct marker *mdata, void *call_private, ...);
        struct marker_probe_closure single;
        struct marker_probe_closure *multi;
+        const char *tp_name;    /* Optional tracepoint name */
+        void *tp_cb;            /* Optional tracepoint callback */
 } __attribute__((aligned(8)));
 #ifdef CONFIG_MARKERS
+#define _DEFINE_MARKER(name, tp_name_str, tp_cb, format)                \
+                static const char __mstrtab_##name[]                    \
+                __attribute__((section("__markers_strings")))           \
+                = #name "\0" format;                                    \
+                static struct marker __mark_##name                      \
+                __attribute__((section("__markers"), aligned(8))) =     \
+                { __mstrtab_##name, &__mstrtab_##name[sizeof(#name)],   \
+                  0, 0, marker_probe_cb, { __mark_empty_function, NULL},\
+                  NULL, tp_name_str, tp_cb }
+#define DEFINE_MARKER(name, format)                                     \
+                _DEFINE_MARKER(name, NULL, NULL, format)
+#define DEFINE_MARKER_TP(name, tp_name, tp_cb, format)                  \
+                _DEFINE_MARKER(name, #tp_name, tp_cb, format)
 /*
 * Note : the empty asm volatile with read constraint is used here instead of a
 * "used" attribute to fix a gcc 4.1.x bug.
@@ -65,14 +84,7 @@ struct marker {
 */
 #define __trace_mark(generic, name, call_private, format, args...)      \
        do {                                                            \
-                static const char __mstrtab_##name[]                    \
+                DEFINE_MARKER(name, format);                            \
-                __attribute__((section("__markers_strings")))           \
-                = #name "\0" format;                                    \
-                static struct marker __mark_##name                      \
-                __attribute__((section("__markers"), aligned(8))) =     \
-                { __mstrtab_##name, &__mstrtab_##name[sizeof(#name)],   \
-                0, 0, marker_probe_cb,                                  \
-                { __mark_empty_function, NULL}, NULL };                 \
                __mark_check_format(format, ## args);                   \
                if (unlikely(__mark_##name.state)) {                    \
                        (*__mark_##name.call)                           \
@@ -80,14 +92,39 @@ struct marker {
                }                                                       \
        } while (0)
+#define __trace_mark_tp(name, call_private, tp_name, tp_cb, format, args...) \
+        do {                                                            \
+                void __check_tp_type(void)                              \
+                {                                                       \
+                        register_trace_##tp_name(tp_cb);                \
+                }                                                       \
+                DEFINE_MARKER_TP(name, tp_name, tp_cb, format);         \
+                __mark_check_format(format, ## args);                   \
+                (*__mark_##name.call)(&__mark_##name, call_private,     \
+                                        ## args);                       \
+        } while (0)
 extern void marker_update_probe_range(struct marker *begin,
        struct marker *end);
+#define GET_MARKER(name)        (__mark_##name)
 #else /* !CONFIG_MARKERS */
+#define DEFINE_MARKER(name, tp_name, tp_cb, format)
 #define __trace_mark(generic, name, call_private, format, args...) \
                __mark_check_format(format, ## args)
+#define __trace_mark_tp(name, call_private, tp_name, tp_cb, format, args...) \
+        do {                                                            \
+                void __check_tp_type(void)                              \
+                {                                                       \
+                        register_trace_##tp_name(tp_cb);                \
+                }                                                       \
+                __mark_check_format(format, ## args);                   \
+        } while (0)
 static inline void marker_update_probe_range(struct marker *begin,
        struct marker *end)
 { }
+#define GET_MARKER(name)
 #endif /* CONFIG_MARKERS */
 /**
@@ -117,6 +154,20 @@ static inline void marker_update_probe_range(struct marker *begin,
        __trace_mark(1, name, NULL, format, ## args)
 /**
+ * trace_mark_tp - Marker in a tracepoint callback
+ * @name: marker name, not quoted.
+ * @tp_name: tracepoint name, not quoted.
+ * @tp_cb: tracepoint callback. Should have an associated global symbol so it
+ *         is not optimized away by the compiler (should not be static).
+ * @format: format string
+ * @args...: variable argument list
+ *
+ * Places a marker in a tracepoint callback.
+ */
+#define trace_mark_tp(name, tp_name, tp_cb, format, args...)    \
+        __trace_mark_tp(name, NULL, tp_name, tp_cb, format, ## args)
+/**
 * MARK_NOARGS - Format string for a marker with no argument.
 */
 #define MARK_NOARGS " "
@@ -136,8 +187,6 @@ extern marker_probe_func __mark_empty_function;
 extern void marker_probe_cb(const struct marker *mdata,
        void *call_private, ...);
-extern void marker_probe_cb_noarg(const struct marker *mdata,
-        void *call_private, ...);
 /*
 * Connect a probe to a marker.
@@ -162,8 +211,10 @@ extern void *marker_get_private_data(const char *name, marker_probe_func *probe,
 /*
 * marker_synchronize_unregister must be called between the last marker probe
- * unregistration and the end of module exit to make sure there is no caller
+ * unregistration and the first one of
- * executing a probe when it is freed.
+ * - the end of module exit function
+ * - the free of any resource used by the probes
+ * to ensure the code and data are valid for any possibly running probes.
 */
 #define marker_synchronize_unregister() synchronize_sched()
diff --git a/include/linux/mdio-gpio.h b/include/linux/mdio-gpio.h
new file mode 100644
index 000000000000..e9d3fdfe41d7
--- /dev/null
+++ b/include/linux/mdio-gpio.h
@@ -0,0 +1,25 @@
+/*
+ * MDIO-GPIO bus platform data structures
+ *
+ * Copyright (C) 2008, Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+#ifndef __LINUX_MDIO_GPIO_H
+#define __LINUX_MDIO_GPIO_H
+#include <linux/mdio-bitbang.h>
+struct mdio_gpio_platform_data {
+        /* GPIO numbers for bus pins */
+        unsigned int mdc;
+        unsigned int mdio;
+        unsigned int phy_mask;
+        int irqs[PHY_MAX_ADDR];
+};
+#endif /* __LINUX_MDIO_GPIO_H */
diff --git a/include/linux/mfd/wm8350/audio.h b/include/linux/mfd/wm8350/audio.h
index 217bb22ebb8e..af95a1d2f3a1 100644
--- a/include/linux/mfd/wm8350/audio.h
+++ b/include/linux/mfd/wm8350/audio.h
@@ -1,7 +1,7 @@
 /*
 * audio.h  --  Audio Driver for Wolfson WM8350 PMIC
 *
- * Copyright 2007 Wolfson Microelectronics PLC
+ * Copyright 2007, 2008 Wolfson Microelectronics PLC
 *
 *  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
@@ -70,9 +70,9 @@
 #define WM8350_CODEC_ISEL_0_5                   3       /* x0.5 */
 #define WM8350_VMID_OFF                         0
-#define WM8350_VMID_500K                        1
+#define WM8350_VMID_300K                        1
-#define WM8350_VMID_100K                        2
+#define WM8350_VMID_50K                         2
-#define WM8350_VMID_10K                         3
+#define WM8350_VMID_5K                          3
 /*
 * R40 (0x28) - Clock Control 1
@@ -591,8 +591,38 @@
 #define WM8350_IRQ_CODEC_MICSCD                 41
 #define WM8350_IRQ_CODEC_MICD                   42
+/*
+ * WM8350 Platform data.
+ *
+ * This must be initialised per platform for best audio performance.
+ * Please see WM8350 datasheet for information.
+ */
+struct wm8350_audio_platform_data {
+        int vmid_discharge_msecs;       /* VMID --> OFF discharge time */
+        int drain_msecs;        /* OFF drain time */
+        int cap_discharge_msecs;        /* Cap ON (from OFF) discharge time */
+        int vmid_charge_msecs;  /* vmid power up time */
+        u32 vmid_s_curve:2;     /* vmid enable s curve speed */
+        u32 dis_out4:2;         /* out4 discharge speed */
+        u32 dis_out3:2;         /* out3 discharge speed */
+        u32 dis_out2:2;         /* out2 discharge speed */
+        u32 dis_out1:2;         /* out1 discharge speed */
+        u32 vroi_out4:1;        /* out4 tie off */
+        u32 vroi_out3:1;        /* out3 tie off */
+        u32 vroi_out2:1;        /* out2 tie off */
+        u32 vroi_out1:1;        /* out1 tie off */
+        u32 vroi_enable:1;      /* enable tie off */
+        u32 codec_current_on:2; /* current level ON */
+        u32 codec_current_standby:2;    /* current level STANDBY */
+        u32 codec_current_charge:2;     /* codec current @ vmid charge */
+};
+struct snd_soc_codec;
 struct wm8350_codec {
        struct platform_device *pdev;
+        struct snd_soc_codec *codec;
+        struct wm8350_audio_platform_data *platform_data;
 };
 #endif
diff --git a/include/linux/mii.h b/include/linux/mii.h
index 151b7e0182c7..ad748588faf1 100644
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
@@ -135,6 +135,10 @@
 #define LPA_1000FULL            0x0800  /* Link partner 1000BASE-T full duplex */
 #define LPA_1000HALF            0x0400  /* Link partner 1000BASE-T half duplex */
+/* Flow control flags */
+#define FLOW_CTRL_TX            0x01
+#define FLOW_CTRL_RX            0x02
 /* This structure is used in all SIOCxMIIxxx ioctl calls */
 struct mii_ioctl_data {
        __u16           phy_id;
@@ -235,5 +239,34 @@ static inline unsigned int mii_duplex (unsigned int duplex_lock,
        return 0;
 }
+/**
+ * mii_resolve_flowctrl_fdx
+ * @lcladv: value of MII ADVERTISE register
+ * @rmtadv: value of MII LPA register
+ *
+ * Resolve full duplex flow control as per IEEE 802.3-2005 table 28B-3
+ */
+static inline u8 mii_resolve_flowctrl_fdx(u16 lcladv, u16 rmtadv)
+{
+        u8 cap = 0;
+        if (lcladv & ADVERTISE_PAUSE_CAP) {
+                if (lcladv & ADVERTISE_PAUSE_ASYM) {
+                        if (rmtadv & LPA_PAUSE_CAP)
+                                cap = FLOW_CTRL_TX | FLOW_CTRL_RX;
+                        else if (rmtadv & LPA_PAUSE_ASYM)
+                                cap = FLOW_CTRL_RX;
+                } else {
+                        if (rmtadv & LPA_PAUSE_CAP)
+                                cap = FLOW_CTRL_TX | FLOW_CTRL_RX;
+                }
+        } else if (lcladv & ADVERTISE_PAUSE_ASYM) {
+                if ((rmtadv & LPA_PAUSE_CAP) && (rmtadv & LPA_PAUSE_ASYM))
+                        cap = FLOW_CTRL_TX;
+        }
+        return cap;
+}
 #endif /* __KERNEL__ */
 #endif /* __LINUX_MII_H__ */
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 371086fd946f..8f659cc29960 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -206,6 +206,7 @@ struct mlx4_caps {
        int                     reserved_cqs;
        int                     num_eqs;
        int                     reserved_eqs;
+        int                     num_comp_vectors;
        int                     num_mpts;
        int                     num_mtt_segs;
        int                     fmr_reserved_mtts;
@@ -328,6 +329,7 @@ struct mlx4_cq {
        int                     arm_sn;
        int                     cqn;
+        unsigned                vector;
        atomic_t                refcount;
        struct completion       free;
@@ -437,7 +439,7 @@ void mlx4_free_hwq_res(struct mlx4_dev *mdev, struct mlx4_hwq_resources *wqres,
 int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,
                  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq,
-                  int collapsed);
+                  unsigned vector, int collapsed);
 void mlx4_cq_free(struct mlx4_dev *dev, struct mlx4_cq *cq);
 int mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align, int *base);
diff --git a/include/linux/mm.h b/include/linux/mm.h
index ffee2f743418..aaa8b843be28 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -145,6 +145,23 @@ extern pgprot_t protection_map[16];
 #define FAULT_FLAG_WRITE        0x01    /* Fault was a write access */
 #define FAULT_FLAG_NONLINEAR    0x02    /* Fault was via a nonlinear mapping */
+/*
+ * This interface is used by x86 PAT code to identify a pfn mapping that is
+ * linear over entire vma. This is to optimize PAT code that deals with
+ * marking the physical region with a particular prot. This is not for generic
+ * mm use. Note also that this check will not work if the pfn mapping is
+ * linear for a vma starting at physical address 0. In which case PAT code
+ * falls back to slow path of reserving physical range page by page.
+ */
+static inline int is_linear_pfn_mapping(struct vm_area_struct *vma)
+{
+        return ((vma->vm_flags & VM_PFNMAP) && vma->vm_pgoff);
+}
+static inline int is_pfn_mapping(struct vm_area_struct *vma)
+{
+        return (vma->vm_flags & VM_PFNMAP);
+}
 /*
 * vm_fault is filled by the the pagefault handler and passed to the vma's
@@ -781,6 +798,8 @@ int copy_page_range(struct mm_struct *dst, struct mm_struct *src,
                        struct vm_area_struct *vma);
 void unmap_mapping_range(struct address_space *mapping,
                loff_t const holebegin, loff_t const holelen, int even_cows);
+int follow_phys(struct vm_area_struct *vma, unsigned long address,
+                unsigned int flags, unsigned long *prot, resource_size_t *phys);
 int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
                        void *buf, int len, int write);
@@ -1286,5 +1305,7 @@ int vmemmap_populate_basepages(struct page *start_page,
 int vmemmap_populate(struct page *start_page, unsigned long pages, int node);
 void vmemmap_populate_print_last(void);
+extern void *alloc_locked_buffer(size_t size);
+extern void free_locked_buffer(void *buffer, size_t size);
 #endif /* __KERNEL__ */
 #endif /* _LINUX_MM_H */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index fe825471d5aa..9cfc9b627fdd 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -232,8 +232,9 @@ struct mm_struct {
        struct core_state *core_state; /* coredumping support */
        /* aio bits */
-        rwlock_t                ioctx_list_lock;        /* aio lock */
+        spinlock_t              ioctx_lock;
-        struct kioctx           *ioctx_list;
+        struct hlist_head       ioctx_list;
 #ifdef CONFIG_MM_OWNER
        /*
         * "owner" points to a task that is regarded as the canonical
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 143cebf0586f..7ac8b500d55c 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -151,4 +151,6 @@ static inline void mmc_claim_host(struct mmc_host *host)
        __mmc_claim_host(host, NULL);
 }
+extern u32 mmc_vddrange_to_ocrmask(int vdd_min, int vdd_max);
 #endif
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index f842f234e44f..4e457256bd33 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -41,6 +41,7 @@ struct mmc_ios {
 #define MMC_BUS_WIDTH_1         0
 #define MMC_BUS_WIDTH_4         2
+#define MMC_BUS_WIDTH_8         3
        unsigned char   timing;                 /* timing specification used */
@@ -116,6 +117,7 @@ struct mmc_host {
 #define MMC_CAP_SDIO_IRQ        (1 << 3)        /* Can signal pending SDIO IRQs */
 #define MMC_CAP_SPI             (1 << 4)        /* Talks only SPI protocols */
 #define MMC_CAP_NEEDS_POLL      (1 << 5)        /* Needs polling for card-detection */
+#define MMC_CAP_8_BIT_DATA      (1 << 6)        /* Can the host do 8 bit transfers */
        /* host specific block data */
        unsigned int            max_seg_size;   /* see blk_queue_max_segment_size */
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index 6f4c180179e2..5375faca1f72 100644
--- a/include/linux/mroute6.h
+++ b/include/linux/mroute6.h
@@ -117,6 +117,7 @@ struct sioc_mif_req6
 #include <linux/pim.h>
 #include <linux/skbuff.h>       /* for struct sk_buff_head */
+#include <net/net_namespace.h>
 #ifdef CONFIG_IPV6_MROUTE
 static inline int ip6_mroute_opt(int opt)
@@ -187,6 +188,9 @@ struct mif_device
 struct mfc6_cache
 {
        struct mfc6_cache *next;                /* Next entry on cache line     */
+#ifdef CONFIG_NET_NS
+        struct net *mfc6_net;
+#endif
        struct in6_addr mf6c_mcastgrp;                  /* Group the entry belongs to   */
        struct in6_addr mf6c_origin;                    /* Source of packet             */
        mifi_t mf6c_parent;                     /* Source interface             */
@@ -209,6 +213,18 @@ struct mfc6_cache
        } mfc_un;
 };
+static inline
+struct net *mfc6_net(const struct mfc6_cache *mfc)
+{
+        return read_pnet(&mfc->mfc6_net);
+}
+static inline
+void mfc6_net_set(struct mfc6_cache *mfc, struct net *net)
+{
+        write_pnet(&mfc->mfc6_net, hold_net(net));
+}
 #define MFC_STATIC              1
 #define MFC_NOTIFY              2
@@ -229,13 +245,17 @@ struct mfc6_cache
 #ifdef __KERNEL__
 struct rtmsg;
-extern int ip6mr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait);
+extern int ip6mr_get_route(struct net *net, struct sk_buff *skb,
+                           struct rtmsg *rtm, int nowait);
 #ifdef CONFIG_IPV6_MROUTE
-extern struct sock *mroute6_socket;
+static inline struct sock *mroute6_socket(struct net *net)
+{
+        return net->ipv6.mroute6_sk;
+}
 extern int ip6mr_sk_done(struct sock *sk);
 #else
-#define mroute6_socket NULL
+static inline struct sock *mroute6_socket(struct net *net) { return NULL; }
 static inline int ip6mr_sk_done(struct sock *sk) { return 0; }
 #endif
 #endif
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 8f2939227207..d2b8a1e8ca11 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -10,8 +10,11 @@ struct msi_msg {
 };
 /* Helper functions */
+struct irq_desc;
 extern void mask_msi_irq(unsigned int irq);
 extern void unmask_msi_irq(unsigned int irq);
+extern void read_msi_msg_desc(struct irq_desc *desc, struct msi_msg *msg);
+extern void write_msi_msg_desc(struct irq_desc *desc, struct msi_msg *msg);
 extern void read_msi_msg(unsigned int irq, struct msi_msg *msg);
 extern void write_msi_msg(unsigned int irq, struct msi_msg *msg);
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index bc6da10ceee0..7a0e5c4f8072 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -144,6 +144,8 @@ extern int __must_check mutex_lock_killable(struct mutex *lock);
 /*
 * NOTE: mutex_trylock() follows the spin_trylock() convention,
 *       not the down_trylock() convention!
+ *
+ * Returns 1 if the mutex has been acquired successfully, and 0 on contention.
 */
 extern int mutex_trylock(struct mutex *lock);
 extern void mutex_unlock(struct mutex *lock);
diff --git a/include/linux/namei.h b/include/linux/namei.h
index 99eb80306dc5..fc2e03579877 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -94,4 +94,9 @@ static inline char *nd_get_link(struct nameidata *nd)
        return nd->saved_names[nd->depth];
 }
+static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
+{
+        ((char *) name)[min(len, maxlen)] = '\0';
+}
 #endif /* _LINUX_NAMEI_H */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 9d77b1d7dca8..41e1224651cf 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -43,6 +43,9 @@
 #include <net/net_namespace.h>
 #include <net/dsa.h>
+#ifdef CONFIG_DCB
+#include <net/dcbnl.h>
+#endif
 struct vlan_group;
 struct ethtool_ops;
@@ -311,14 +314,16 @@ struct napi_struct {
        spinlock_t              poll_lock;
        int                     poll_owner;
        struct net_device       *dev;
-        struct list_head        dev_list;
 #endif
+        struct list_head        dev_list;
+        struct sk_buff          *gro_list;
 };
 enum
 {
        NAPI_STATE_SCHED,       /* Poll is scheduled */
        NAPI_STATE_DISABLE,     /* Disable pending */
+        NAPI_STATE_NPSVC,       /* Netpoll - don't dequeue from poll_list */
 };
 extern void __napi_schedule(struct napi_struct *n);
@@ -372,22 +377,8 @@ static inline int napi_reschedule(struct napi_struct *napi)
 *
 * Mark NAPI processing as complete.
 */
-static inline void __napi_complete(struct napi_struct *n)
+extern void __napi_complete(struct napi_struct *n);
-{
+extern void napi_complete(struct napi_struct *n);
-        BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state));
-        list_del(&n->poll_list);
-        smp_mb__before_clear_bit();
-        clear_bit(NAPI_STATE_SCHED, &n->state);
-}
-static inline void napi_complete(struct napi_struct *n)
-{
-        unsigned long flags;
-        local_irq_save(flags);
-        __napi_complete(n);
-        local_irq_restore(flags);
-}
 /**
 *      napi_disable - prevent NAPI from scheduling
@@ -451,6 +442,147 @@ struct netdev_queue {
        struct Qdisc            *qdisc_sleeping;
 } ____cacheline_aligned_in_smp;
+/*
+ * This structure defines the management hooks for network devices.
+ * The following hooks can be defined; unless noted otherwise, they are
+ * optional and can be filled with a null pointer.
+ *
+ * int (*ndo_init)(struct net_device *dev);
+ *     This function is called once when network device is registered.
+ *     The network device can use this to any late stage initializaton
+ *     or semantic validattion. It can fail with an error code which will
+ *     be propogated back to register_netdev
+ *
+ * void (*ndo_uninit)(struct net_device *dev);
+ *     This function is called when device is unregistered or when registration
+ *     fails. It is not called if init fails.
+ *
+ * int (*ndo_open)(struct net_device *dev);
+ *     This function is called when network device transistions to the up
+ *     state.
+ *
+ * int (*ndo_stop)(struct net_device *dev);
+ *     This function is called when network device transistions to the down
+ *     state.
+ *
+ * int (*ndo_hard_start_xmit)(struct sk_buff *skb, struct net_device *dev);
+ *      Called when a packet needs to be transmitted.
+ *      Must return NETDEV_TX_OK , NETDEV_TX_BUSY, or NETDEV_TX_LOCKED,
+ *      Required can not be NULL.
+ *
+ * u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb);
+ *      Called to decide which queue to when device supports multiple
+ *      transmit queues.
+ *
+ * void (*ndo_change_rx_flags)(struct net_device *dev, int flags);
+ *      This function is called to allow device receiver to make
+ *      changes to configuration when multicast or promiscious is enabled.
+ *
+ * void (*ndo_set_rx_mode)(struct net_device *dev);
+ *      This function is called device changes address list filtering.
+ *
+ * void (*ndo_set_multicast_list)(struct net_device *dev);
+ *      This function is called when the multicast address list changes.
+ *
+ * int (*ndo_set_mac_address)(struct net_device *dev, void *addr);
+ *      This function  is called when the Media Access Control address
+ *      needs to be changed. If not this interface is not defined, the
+ *      mac address can not be changed.
+ *
+ * int (*ndo_validate_addr)(struct net_device *dev);
+ *      Test if Media Access Control address is valid for the device.
+ *
+ * int (*ndo_do_ioctl)(struct net_device *dev, struct ifreq *ifr, int cmd);
+ *      Called when a user request an ioctl which can't be handled by
+ *      the generic interface code. If not defined ioctl's return
+ *      not supported error code.
+ *
+ * int (*ndo_set_config)(struct net_device *dev, struct ifmap *map);
+ *      Used to set network devices bus interface parameters. This interface
+ *      is retained for legacy reason, new devices should use the bus
+ *      interface (PCI) for low level management.
+ *
+ * int (*ndo_change_mtu)(struct net_device *dev, int new_mtu);
+ *      Called when a user wants to change the Maximum Transfer Unit
+ *      of a device. If not defined, any request to change MTU will
+ *      will return an error.
+ *
+ * void (*ndo_tx_timeout)(struct net_device *dev);
+ *      Callback uses when the transmitter has not made any progress
+ *      for dev->watchdog ticks.
+ *
+ * struct net_device_stats* (*get_stats)(struct net_device *dev);
+ *      Called when a user wants to get the network device usage
+ *      statistics. If not defined, the counters in dev->stats will
+ *      be used.
+ *
+ * void (*ndo_vlan_rx_register)(struct net_device *dev, struct vlan_group *grp);
+ *      If device support VLAN receive accleration
+ *      (ie. dev->features & NETIF_F_HW_VLAN_RX), then this function is called
+ *      when vlan groups for the device changes.  Note: grp is NULL
+ *      if no vlan's groups are being used.
+ *
+ * void (*ndo_vlan_rx_add_vid)(struct net_device *dev, unsigned short vid);
+ *      If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)
+ *      this function is called when a VLAN id is registered.
+ *
+ * void (*ndo_vlan_rx_kill_vid)(struct net_device *dev, unsigned short vid);
+ *      If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)
+ *      this function is called when a VLAN id is unregistered.
+ *
+ * void (*ndo_poll_controller)(struct net_device *dev);
+ */
+#define HAVE_NET_DEVICE_OPS
+struct net_device_ops {
+        int                     (*ndo_init)(struct net_device *dev);
+        void                    (*ndo_uninit)(struct net_device *dev);
+        int                     (*ndo_open)(struct net_device *dev);
+        int                     (*ndo_stop)(struct net_device *dev);
+        int                     (*ndo_start_xmit) (struct sk_buff *skb,
+                                                   struct net_device *dev);
+        u16                     (*ndo_select_queue)(struct net_device *dev,
+                                                    struct sk_buff *skb);
+#define HAVE_CHANGE_RX_FLAGS
+        void                    (*ndo_change_rx_flags)(struct net_device *dev,
+                                                       int flags);
+#define HAVE_SET_RX_MODE
+        void                    (*ndo_set_rx_mode)(struct net_device *dev);
+#define HAVE_MULTICAST
+        void                    (*ndo_set_multicast_list)(struct net_device *dev);
+#define HAVE_SET_MAC_ADDR
+        int                     (*ndo_set_mac_address)(struct net_device *dev,
+                                                       void *addr);
+#define HAVE_VALIDATE_ADDR
+        int                     (*ndo_validate_addr)(struct net_device *dev);
+#define HAVE_PRIVATE_IOCTL
+        int                     (*ndo_do_ioctl)(struct net_device *dev,
+                                                struct ifreq *ifr, int cmd);
+#define HAVE_SET_CONFIG
+        int                     (*ndo_set_config)(struct net_device *dev,
+                                                  struct ifmap *map);
+#define HAVE_CHANGE_MTU
+        int                     (*ndo_change_mtu)(struct net_device *dev,
+                                                  int new_mtu);
+        int                     (*ndo_neigh_setup)(struct net_device *dev,
+                                                   struct neigh_parms *);
+#define HAVE_TX_TIMEOUT
+        void                    (*ndo_tx_timeout) (struct net_device *dev);
+        struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
+        void                    (*ndo_vlan_rx_register)(struct net_device *dev,
+                                                        struct vlan_group *grp);
+        void                    (*ndo_vlan_rx_add_vid)(struct net_device *dev,
+                                                       unsigned short vid);
+        void                    (*ndo_vlan_rx_kill_vid)(struct net_device *dev,
+                                                        unsigned short vid);
+#ifdef CONFIG_NET_POLL_CONTROLLER
+#define HAVE_NETDEV_POLL
+        void                    (*ndo_poll_controller)(struct net_device *dev);
+#endif
+};
 /*
 *      The DEVICE structure.
 *      Actually, this whole structure is a big mistake.  It mixes I/O
@@ -495,14 +627,7 @@ struct net_device
        unsigned long           state;
        struct list_head        dev_list;
-#ifdef CONFIG_NETPOLL
        struct list_head        napi_list;
-#endif
-        
-        /* The device initialization function. Called only once. */
-        int                     (*init)(struct net_device *dev);
-        /* ------- Fields preinitialized in Space.c finish here ------- */
        /* Net device features */
        unsigned long           features;
@@ -521,6 +646,7 @@ struct net_device
 #define NETIF_F_LLTX            4096    /* LockLess TX - deprecated. Please */
                                        /* do not use LLTX in new drivers */
 #define NETIF_F_NETNS_LOCAL     8192    /* Does not change network namespaces */
+#define NETIF_F_GRO             16384   /* Generic receive offload */
 #define NETIF_F_LRO             32768   /* large receive offload */
        /* Segmentation offload features */
@@ -546,15 +672,13 @@ struct net_device
         * for all in netdev_increment_features.
         */
 #define NETIF_F_ONE_FOR_ALL     (NETIF_F_GSO_SOFTWARE | NETIF_F_GSO_ROBUST | \
-                                 NETIF_F_SG | NETIF_F_HIGHDMA | \
+                                 NETIF_F_SG | NETIF_F_HIGHDMA |         \
                                 NETIF_F_FRAGLIST)
        /* Interface index. Unique device identifier    */
        int                     ifindex;
        int                     iflink;
-        struct net_device_stats* (*get_stats)(struct net_device *dev);
        struct net_device_stats stats;
 #ifdef CONFIG_WIRELESS_EXT
@@ -564,18 +688,13 @@ struct net_device
        /* Instance data managed by the core of Wireless Extensions. */
        struct iw_public_data * wireless_data;
 #endif
+        /* Management operations */
+        const struct net_device_ops *netdev_ops;
        const struct ethtool_ops *ethtool_ops;
        /* Hardware header description */
        const struct header_ops *header_ops;
-        /*
-         * This marks the end of the "visible" part of the structure. All
-         * fields hereafter are internal to the system, and may change at
-         * will (read: may be cleaned up at will).
-         */
        unsigned int            flags;  /* interface flags (a la BSD)   */
        unsigned short          gflags;
        unsigned short          priv_flags; /* Like 'flags' but invisible to userspace. */
@@ -634,7 +753,7 @@ struct net_device
        unsigned long           last_rx;        /* Time of last Rx      */
        /* Interface address info used in eth_type_trans() */
        unsigned char           dev_addr[MAX_ADDR_LEN]; /* hw address, (before bcast 
-                                                        because most packets are unicast) */
+                                                           because most packets are unicast) */
        unsigned char           broadcast[MAX_ADDR_LEN];        /* hw bcast add */
@@ -653,18 +772,12 @@ struct net_device
 /*
 * One part is mostly used on xmit path (device)
 */
-        void                    *priv;  /* pointer to private data      */
-        int                     (*hard_start_xmit) (struct sk_buff *skb,
-                                                    struct net_device *dev);
        /* These may be needed for future network-power-down code. */
        unsigned long           trans_start;    /* Time (in jiffies) of last Tx */
        int                     watchdog_timeo; /* used by dev_watchdog() */
        struct timer_list       watchdog_timer;
-/*
- * refcnt is a very hot point, so align it on SMP
- */
        /* Number of references to this device */
        atomic_t                refcnt ____cacheline_aligned_in_smp;
@@ -683,56 +796,12 @@ struct net_device
               NETREG_RELEASED,         /* called free_netdev */
        } reg_state;
-        /* Called after device is detached from network. */
+        /* Called from unregister, can be used to call free_netdev */
-        void                    (*uninit)(struct net_device *dev);
+        void (*destructor)(struct net_device *dev);
-        /* Called after last user reference disappears. */
-        void                    (*destructor)(struct net_device *dev);
-        /* Pointers to interface service routines.      */
-        int                     (*open)(struct net_device *dev);
-        int                     (*stop)(struct net_device *dev);
-#define HAVE_NETDEV_POLL
-#define HAVE_CHANGE_RX_FLAGS
-        void                    (*change_rx_flags)(struct net_device *dev,
-                                                   int flags);
-#define HAVE_SET_RX_MODE
-        void                    (*set_rx_mode)(struct net_device *dev);
-#define HAVE_MULTICAST                   
-        void                    (*set_multicast_list)(struct net_device *dev);
-#define HAVE_SET_MAC_ADDR                
-        int                     (*set_mac_address)(struct net_device *dev,
-                                                   void *addr);
-#define HAVE_VALIDATE_ADDR
-        int                     (*validate_addr)(struct net_device *dev);
-#define HAVE_PRIVATE_IOCTL
-        int                     (*do_ioctl)(struct net_device *dev,
-                                            struct ifreq *ifr, int cmd);
-#define HAVE_SET_CONFIG
-        int                     (*set_config)(struct net_device *dev,
-                                              struct ifmap *map);
-#define HAVE_CHANGE_MTU
-        int                     (*change_mtu)(struct net_device *dev, int new_mtu);
-#define HAVE_TX_TIMEOUT
-        void                    (*tx_timeout) (struct net_device *dev);
-        void                    (*vlan_rx_register)(struct net_device *dev,
-                                                    struct vlan_group *grp);
-        void                    (*vlan_rx_add_vid)(struct net_device *dev,
-                                                   unsigned short vid);
-        void                    (*vlan_rx_kill_vid)(struct net_device *dev,
-                                                    unsigned short vid);
-        int                     (*neigh_setup)(struct net_device *dev, struct neigh_parms *);
 #ifdef CONFIG_NETPOLL
        struct netpoll_info     *npinfo;
 #endif
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        void                    (*poll_controller)(struct net_device *dev);
-#endif
-        u16                     (*select_queue)(struct net_device *dev,
-                                                struct sk_buff *skb);
 #ifdef CONFIG_NET_NS
        /* Network namespace this network device is inside */
@@ -763,6 +832,49 @@ struct net_device
        /* for setting kernel sock attribute on TCP connection setup */
 #define GSO_MAX_SIZE            65536
        unsigned int            gso_max_size;
+#ifdef CONFIG_DCB
+        /* Data Center Bridging netlink ops */
+        struct dcbnl_rtnl_ops *dcbnl_ops;
+#endif
+#ifdef CONFIG_COMPAT_NET_DEV_OPS
+        struct {
+                int                     (*init)(struct net_device *dev);
+                void                    (*uninit)(struct net_device *dev);
+                int                     (*open)(struct net_device *dev);
+                int                     (*stop)(struct net_device *dev);
+                int                     (*hard_start_xmit) (struct sk_buff *skb,
+                                                            struct net_device *dev);
+                u16                     (*select_queue)(struct net_device *dev,
+                                                        struct sk_buff *skb);
+                void                    (*change_rx_flags)(struct net_device *dev,
+                                                           int flags);
+                void                    (*set_rx_mode)(struct net_device *dev);
+                void                    (*set_multicast_list)(struct net_device *dev);
+                int                     (*set_mac_address)(struct net_device *dev,
+                                                           void *addr);
+                int                     (*validate_addr)(struct net_device *dev);
+                int                     (*do_ioctl)(struct net_device *dev,
+                                                    struct ifreq *ifr, int cmd);
+                int                     (*set_config)(struct net_device *dev,
+                                                      struct ifmap *map);
+                int                     (*change_mtu)(struct net_device *dev, int new_mtu);
+                int                     (*neigh_setup)(struct net_device *dev,
+                                                       struct neigh_parms *);
+                void                    (*tx_timeout) (struct net_device *dev);
+                struct net_device_stats* (*get_stats)(struct net_device *dev);
+                void                    (*vlan_rx_register)(struct net_device *dev,
+                                                            struct vlan_group *grp);
+                void                    (*vlan_rx_add_vid)(struct net_device *dev,
+                                                           unsigned short vid);
+                void                    (*vlan_rx_kill_vid)(struct net_device *dev,
+                                                            unsigned short vid);
+#ifdef CONFIG_NET_POLL_CONTROLLER
+                void                    (*poll_controller)(struct net_device *dev);
+#endif
+        };
+#endif
 };
 #define to_net_dev(d) container_of(d, struct net_device, dev)
@@ -858,22 +970,8 @@ static inline void *netdev_priv(const struct net_device *dev)
 * netif_napi_add() must be used to initialize a napi context prior to calling
 * *any* of the other napi related functions.
 */
-static inline void netif_napi_add(struct net_device *dev,
+void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
-                                  struct napi_struct *napi,
+                    int (*poll)(struct napi_struct *, int), int weight);
-                                  int (*poll)(struct napi_struct *, int),
-                                  int weight)
-{
-        INIT_LIST_HEAD(&napi->poll_list);
-        napi->poll = poll;
-        napi->weight = weight;
-#ifdef CONFIG_NETPOLL
-        napi->dev = dev;
-        list_add(&napi->dev_list, &dev->napi_list);
-        spin_lock_init(&napi->poll_lock);
-        napi->poll_owner = -1;
-#endif
-        set_bit(NAPI_STATE_SCHED, &napi->state);
-}
 /**
 *  netif_napi_del - remove a napi context
@@ -881,12 +979,20 @@ static inline void netif_napi_add(struct net_device *dev,
 *
 *  netif_napi_del() removes a napi context from the network device napi list
 */
-static inline void netif_napi_del(struct napi_struct *napi)
+void netif_napi_del(struct napi_struct *napi);
-{
-#ifdef CONFIG_NETPOLL
+struct napi_gro_cb {
-        list_del(&napi->dev_list);
+        /* This is non-zero if the packet may be of the same flow. */
-#endif
+        int same_flow;
-}
+        /* This is non-zero if the packet cannot be merged with the new skb. */
+        int flush;
+        /* Number of segments aggregated. */
+        int count;
+};
+#define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb)
 struct packet_type {
        __be16                  type;   /* This is really htons(ether_type). */
@@ -898,6 +1004,9 @@ struct packet_type {
        struct sk_buff          *(*gso_segment)(struct sk_buff *skb,
                                                int features);
        int                     (*gso_send_check)(struct sk_buff *skb);
+        struct sk_buff          **(*gro_receive)(struct sk_buff **head,
+                                               struct sk_buff *skb);
+        int                     (*gro_complete)(struct sk_buff *skb);
        void                    *af_packet_priv;
        struct list_head        list;
 };
@@ -1251,6 +1360,9 @@ extern int		netif_rx(struct sk_buff *skb);
 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              napi_gro_receive(struct napi_struct *napi,
+                                         struct sk_buff *skb);
 extern void             netif_nit_deliver(struct sk_buff *skb);
 extern int              dev_valid_name(const char *name);
 extern int              dev_ioctl(struct net *net, unsigned int cmd, void __user *);
@@ -1443,8 +1555,7 @@ static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits)
 }
 /* Test if receive needs to be scheduled but only if up */
-static inline int netif_rx_schedule_prep(struct net_device *dev,
+static inline int netif_rx_schedule_prep(struct napi_struct *napi)
-                                         struct napi_struct *napi)
 {
        return napi_schedule_prep(napi);
 }
@@ -1452,27 +1563,24 @@ static inline int netif_rx_schedule_prep(struct net_device *dev,
 /* Add interface to tail of rx poll list. This assumes that _prep has
 * already been called and returned 1.
 */
-static inline void __netif_rx_schedule(struct net_device *dev,
+static inline void __netif_rx_schedule(struct napi_struct *napi)
-                                       struct napi_struct *napi)
 {
        __napi_schedule(napi);
 }
 /* Try to reschedule poll. Called by irq handler. */
-static inline void netif_rx_schedule(struct net_device *dev,
+static inline void netif_rx_schedule(struct napi_struct *napi)
-                                     struct napi_struct *napi)
 {
-        if (netif_rx_schedule_prep(dev, napi))
+        if (netif_rx_schedule_prep(napi))
-                __netif_rx_schedule(dev, napi);
+                __netif_rx_schedule(napi);
 }
 /* Try to reschedule poll. Called by dev->poll() after netif_rx_complete().  */
-static inline int netif_rx_reschedule(struct net_device *dev,
+static inline int netif_rx_reschedule(struct napi_struct *napi)
-                                      struct napi_struct *napi)
 {
        if (napi_schedule_prep(napi)) {
-                __netif_rx_schedule(dev, napi);
+                __netif_rx_schedule(napi);
                return 1;
        }
        return 0;
@@ -1481,8 +1589,7 @@ static inline int netif_rx_reschedule(struct net_device *dev,
 /* same as netif_rx_complete, except that local_irq_save(flags)
 * has already been issued
 */
-static inline void __netif_rx_complete(struct net_device *dev,
+static inline void __netif_rx_complete(struct napi_struct *napi)
-                                       struct napi_struct *napi)
 {
        __napi_complete(napi);
 }
@@ -1492,14 +1599,9 @@ static inline void __netif_rx_complete(struct net_device *dev,
 * it completes the work. The device cannot be out of poll list at this
 * moment, it is BUG().
 */
-static inline void netif_rx_complete(struct net_device *dev,
+static inline void netif_rx_complete(struct napi_struct *napi)
-                                     struct napi_struct *napi)
 {
-        unsigned long flags;
+        napi_complete(napi);
-        local_irq_save(flags);
-        __netif_rx_complete(dev, napi);
-        local_irq_restore(flags);
 }
 static inline void __netif_tx_lock(struct netdev_queue *txq, int cpu)
@@ -1676,6 +1778,8 @@ extern void		netdev_features_change(struct net_device *dev);
 /* Load a device via the kmod */
 extern void             dev_load(struct net *net, const char *name);
 extern void             dev_mcast_init(void);
+extern const struct net_device_stats *dev_get_stats(struct net_device *dev);
 extern int              netdev_max_backlog;
 extern int              weight_p;
 extern int              netdev_set_master(struct net_device *dev, struct net_device *master);
@@ -1724,6 +1828,8 @@ static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
 {
        return skb_is_gso(skb) &&
               (!skb_gso_ok(skb, dev->features) ||
+                (skb_shinfo(skb)->frag_list &&
+                 !(dev->features & NETIF_F_FRAGLIST)) ||
                unlikely(skb->ip_summed != CHECKSUM_PARTIAL));
 }
@@ -1742,26 +1848,31 @@ static inline int skb_bond_should_drop(struct sk_buff *skb)
        struct net_device *dev = skb->dev;
        struct net_device *master = dev->master;
-        if (master &&
+        if (master) {
-            (dev->priv_flags & IFF_SLAVE_INACTIVE)) {
+                if (master->priv_flags & IFF_MASTER_ARPMON)
-                if ((dev->priv_flags & IFF_SLAVE_NEEDARP) &&
+                        dev->last_rx = jiffies;
-                    skb->protocol == __constant_htons(ETH_P_ARP))
-                        return 0;
-                if (master->priv_flags & IFF_MASTER_ALB) {
+                if (dev->priv_flags & IFF_SLAVE_INACTIVE) {
-                        if (skb->pkt_type != PACKET_BROADCAST &&
+                        if ((dev->priv_flags & IFF_SLAVE_NEEDARP) &&
-                            skb->pkt_type != PACKET_MULTICAST)
+                            skb->protocol == __constant_htons(ETH_P_ARP))
                                return 0;
-                }
-                if (master->priv_flags & IFF_MASTER_8023AD &&
-                    skb->protocol == __constant_htons(ETH_P_SLOW))
-                        return 0;
-                return 1;
+                        if (master->priv_flags & IFF_MASTER_ALB) {
+                                if (skb->pkt_type != PACKET_BROADCAST &&
+                                    skb->pkt_type != PACKET_MULTICAST)
+                                        return 0;
+                        }
+                        if (master->priv_flags & IFF_MASTER_8023AD &&
+                            skb->protocol == __constant_htons(ETH_P_SLOW))
+                                return 0;
+                        return 1;
+                }
        }
        return 0;
 }
+extern struct pernet_operations __net_initdata loopback_net_ops;
 #endif /* __KERNEL__ */
 #endif  /* _LINUX_DEV_H */
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h
index c19595c89304..29fe9ea1d346 100644
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
@@ -141,6 +141,7 @@ enum ctattr_protonat {
 #define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1)
 enum ctattr_natseq {
+        CTA_NAT_SEQ_UNSPEC,
        CTA_NAT_SEQ_CORRECTION_POS,
        CTA_NAT_SEQ_OFFSET_BEFORE,
        CTA_NAT_SEQ_OFFSET_AFTER,
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h
index d45e29cd1cfb..e40ddb94b1af 100644
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
@@ -300,7 +300,8 @@ struct ebt_table
 #define EBT_ALIGN(s) (((s) + (__alignof__(struct ebt_replace)-1)) & \
                     ~(__alignof__(struct ebt_replace)-1))
-extern int ebt_register_table(struct ebt_table *table);
+extern struct ebt_table *ebt_register_table(struct net *net,
+                                            struct ebt_table *table);
 extern void ebt_unregister_table(struct ebt_table *table);
 extern unsigned int ebt_do_table(unsigned int hook, struct sk_buff *skb,
   const struct net_device *in, const struct net_device *out,
diff --git a/include/linux/netfilter_ipv4/ipt_policy.h b/include/linux/netfilter_ipv4/ipt_policy.h
index b9478a255301..1037fb2cd206 100644
--- a/include/linux/netfilter_ipv4/ipt_policy.h
+++ b/include/linux/netfilter_ipv4/ipt_policy.h
@@ -1,6 +1,8 @@
 #ifndef _IPT_POLICY_H
 #define _IPT_POLICY_H
+#include <linux/netfilter/xt_policy.h>
 #define IPT_POLICY_MAX_ELEM             XT_POLICY_MAX_ELEM
 /* ipt_policy_flags */
diff --git a/include/linux/netfilter_ipv6/ip6t_policy.h b/include/linux/netfilter_ipv6/ip6t_policy.h
index 6bab3163d2fb..b1c449d7ec89 100644
--- a/include/linux/netfilter_ipv6/ip6t_policy.h
+++ b/include/linux/netfilter_ipv6/ip6t_policy.h
@@ -1,6 +1,8 @@
 #ifndef _IP6T_POLICY_H
 #define _IP6T_POLICY_H
+#include <linux/netfilter/xt_policy.h>
 #define IP6T_POLICY_MAX_ELEM            XT_POLICY_MAX_ELEM
 /* ip6t_policy_flags */
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 9ff1b54908f3..51b09a1f46c3 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -242,7 +242,8 @@ __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags)
        nlh->nlmsg_flags = flags;
        nlh->nlmsg_pid = pid;
        nlh->nlmsg_seq = seq;
-        memset(NLMSG_DATA(nlh) + len, 0, NLMSG_ALIGN(size) - size);
+        if (!__builtin_constant_p(size) || NLMSG_ALIGN(size) - size != 0)
+                memset(NLMSG_DATA(nlh) + len, 0, NLMSG_ALIGN(size) - size);
        return nlh;
 }
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index e3d79593fb3a..e38d3c9dccda 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -94,11 +94,6 @@ static inline void netpoll_poll_unlock(void *have)
        rcu_read_unlock();
 }
-static inline void netpoll_netdev_init(struct net_device *dev)
-{
-        INIT_LIST_HEAD(&dev->napi_list);
-}
 #else
 static inline int netpoll_rx(struct sk_buff *skb)
 {
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 4eaa8347a0d9..db867b04ac3c 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -83,7 +83,7 @@ struct nfs_open_context {
        struct rpc_cred *cred;
        struct nfs4_state *state;
        fl_owner_t lockowner;
-        int mode;
+        fmode_t mode;
        unsigned long flags;
 #define NFS_CONTEXT_ERROR_WRITE         (0)
@@ -130,7 +130,10 @@ struct nfs_inode {
         *
         * We need to revalidate the cached attrs for this inode if
         *
-         *      jiffies - read_cache_jiffies > attrtimeo
+         *      jiffies - read_cache_jiffies >= attrtimeo
+         *
+         * Please note the comparison is greater than or equal
+         * so that zero timeout values can be specified.
         */
        unsigned long           read_cache_jiffies;
        unsigned long           attrtimeo;
@@ -180,7 +183,7 @@ struct nfs_inode {
        /* NFSv4 state */
        struct list_head        open_states;
        struct nfs_delegation   *delegation;
-        int                      delegation_state;
+        fmode_t                  delegation_state;
        struct rw_semaphore     rwsem;
 #endif /* CONFIG_NFS_V4*/
        struct inode            vfs_inode;
@@ -342,7 +345,7 @@ extern int nfs_setattr(struct dentry *, struct iattr *);
 extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr);
 extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
 extern void put_nfs_open_context(struct nfs_open_context *ctx);
-extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, int mode);
+extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, fmode_t mode);
 extern u64 nfs_compat_user_ino64(u64 fileid);
 extern void nfs_fattr_init(struct nfs_fattr *fattr);
@@ -533,12 +536,6 @@ static inline void nfs3_forget_cached_acls(struct inode *inode)
 #endif /* CONFIG_NFS_V3_ACL */
 /*
- * linux/fs/mount_clnt.c
- */
-extern int  nfs_mount(struct sockaddr *, size_t, char *, char *,
-                      int, int, struct nfs_fh *);
-/*
 * inline functions
 */
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 4e477ae58699..9bb81aec91cf 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -42,12 +42,6 @@ struct nfs_client {
        struct rb_root          cl_openowner_id;
        struct rb_root          cl_lockowner_id;
-        /*
-         * The following rwsem ensures exclusive access to the server
-         * while we recover the state following a lease expiration.
-         */
-        struct rw_semaphore     cl_sem;
        struct list_head        cl_delegations;
        struct rb_root          cl_state_owners;
        spinlock_t              cl_lock;
diff --git a/include/linux/nfs_mount.h b/include/linux/nfs_mount.h
index 6549a06ac16e..4499016e6d0d 100644
--- a/include/linux/nfs_mount.h
+++ b/include/linux/nfs_mount.h
@@ -45,7 +45,7 @@ struct nfs_mount_data {
        char            context[NFS_MAX_CONTEXT_LEN + 1];       /* 6 */
 };
-/* bits in the flags field */
+/* bits in the flags field visible to user space */
 #define NFS_MOUNT_SOFT          0x0001  /* 1 */
 #define NFS_MOUNT_INTR          0x0002  /* 1 */ /* now unused, but ABI */
@@ -68,5 +68,6 @@ struct nfs_mount_data {
 /* The following are for internal use only */
 #define NFS_MOUNT_LOOKUP_CACHE_NONEG    0x10000
 #define NFS_MOUNT_LOOKUP_CACHE_NONE     0x20000
+#define NFS_MOUNT_NORESVPORT            0x40000
 #endif
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index c1c31acb8a2b..a550b528319f 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -120,13 +120,14 @@ struct nfs_openargs {
        const struct nfs_fh *   fh;
        struct nfs_seqid *      seqid;
        int                     open_flags;
+        fmode_t                 fmode;
        __u64                   clientid;
        __u64                   id;
        union {
                struct iattr *  attrs;    /* UNCHECKED, GUARDED */
                nfs4_verifier   verifier; /* EXCLUSIVE */
                nfs4_stateid    delegation;             /* CLAIM_DELEGATE_CUR */
-                int             delegation_type;        /* CLAIM_PREVIOUS */
+                fmode_t         delegation_type;        /* CLAIM_PREVIOUS */
        } u;
        const struct qstr *     name;
        const struct nfs_server *server;         /* Needed for ID mapping */
@@ -143,7 +144,7 @@ struct nfs_openres {
        struct nfs_fattr *      dir_attr;
        struct nfs_seqid *      seqid;
        const struct nfs_server *server;
-        int                     delegation_type;
+        fmode_t                 delegation_type;
        nfs4_stateid            delegation;
        __u32                   do_recall;
        __u64                   maxsize;
@@ -171,7 +172,7 @@ struct nfs_closeargs {
        struct nfs_fh *         fh;
        nfs4_stateid *          stateid;
        struct nfs_seqid *      seqid;
-        int                     open_flags;
+        fmode_t                 fmode;
        const u32 *             bitmask;
 };
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index d0fe2e378452..128298c0362d 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -124,6 +124,8 @@ struct nfs4_client {
        nfs4_verifier           cl_verifier;    /* generated by client */
        time_t                  cl_time;        /* time of last lease renewal */
        __be32                  cl_addr;        /* client ipaddress */
+        u32                     cl_flavor;      /* setclientid pseudoflavor */
+        char                    *cl_principal;  /* setclientid principal name */
        struct svc_cred         cl_cred;        /* setclientid principal */
        clientid_t              cl_clientid;    /* generated by server */
        nfs4_verifier           cl_confirm;     /* generated by server */
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 9bad65400fba..e86ed59f9ad5 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -3,7 +3,26 @@
 /*
 * 802.11 netlink interface public header
 *
- * Copyright 2006, 2007 Johannes Berg <johannes@sipsolutions.net>
+ * Copyright 2006, 2007, 2008 Johannes Berg <johannes@sipsolutions.net>
+ * Copyright 2008 Michael Wu <flamingice@sourmilk.net>
+ * Copyright 2008 Luis Carlos Cobo <luisca@cozybit.com>
+ * Copyright 2008 Michael Buesch <mb@bu3sch.de>
+ * Copyright 2008 Luis R. Rodriguez <lrodriguez@atheros.com>
+ * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
+ * Copyright 2008 Colin McCabe <colin@cozybit.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
 */
 /**
@@ -25,8 +44,10 @@
 *
 * @NL80211_CMD_GET_WIPHY: request information about a wiphy or dump request
 *      to get a list of all present wiphys.
- * @NL80211_CMD_SET_WIPHY: set wiphy name, needs %NL80211_ATTR_WIPHY and
+ * @NL80211_CMD_SET_WIPHY: set wiphy parameters, needs %NL80211_ATTR_WIPHY or
- *      %NL80211_ATTR_WIPHY_NAME.
+ *      %NL80211_ATTR_IFINDEX; can be used to set %NL80211_ATTR_WIPHY_NAME,
+ *      %NL80211_ATTR_WIPHY_TXQ_PARAMS, %NL80211_ATTR_WIPHY_FREQ, and/or
+ *      %NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET.
 * @NL80211_CMD_NEW_WIPHY: Newly created wiphy, response to get request
 *      or rename notification. Has attributes %NL80211_ATTR_WIPHY and
 *      %NL80211_ATTR_WIPHY_NAME.
@@ -106,6 +127,12 @@
 *      to the the specified ISO/IEC 3166-1 alpha2 country code. The core will
 *      store this as a valid request and then query userspace for it.
 *
+ * @NL80211_CMD_GET_MESH_PARAMS: Get mesh networking properties for the
+ *      interface identified by %NL80211_ATTR_IFINDEX
+ *
+ * @NL80211_CMD_SET_MESH_PARAMS: Set mesh networking properties for the
+ *      interface identified by %NL80211_ATTR_IFINDEX
+ *
 * @NL80211_CMD_MAX: highest used command number
 * @__NL80211_CMD_AFTER_LAST: internal use
 */
@@ -148,6 +175,9 @@ enum nl80211_commands {
        NL80211_CMD_SET_REG,
        NL80211_CMD_REQ_SET_REG,
+        NL80211_CMD_GET_MESH_PARAMS,
+        NL80211_CMD_SET_MESH_PARAMS,
        /* add new commands above here */
        /* used to define NL80211_CMD_MAX below */
@@ -169,6 +199,15 @@ enum nl80211_commands {
 * @NL80211_ATTR_WIPHY: index of wiphy to operate on, cf.
 *      /sys/class/ieee80211/<phyname>/index
 * @NL80211_ATTR_WIPHY_NAME: wiphy name (used for renaming)
+ * @NL80211_ATTR_WIPHY_TXQ_PARAMS: a nested array of TX queue parameters
+ * @NL80211_ATTR_WIPHY_FREQ: frequency of the selected channel in MHz
+ * @NL80211_ATTR_WIPHY_CHANNEL_TYPE: included with NL80211_ATTR_WIPHY_FREQ
+ *      if HT20 or HT40 are allowed (i.e., 802.11n disabled if not included):
+ *      NL80211_CHAN_NO_HT = HT not allowed (i.e., same as not including
+ *              this attribute)
+ *      NL80211_CHAN_HT20 = HT20 only
+ *      NL80211_CHAN_HT40MINUS = secondary channel is below the primary channel
+ *      NL80211_CHAN_HT40PLUS = secondary channel is above the primary channel
 *
 * @NL80211_ATTR_IFINDEX: network interface index of the device to operate on
 * @NL80211_ATTR_IFNAME: network interface name
@@ -234,6 +273,9 @@ enum nl80211_commands {
 *      (u8, 0 or 1)
 * @NL80211_ATTR_BSS_SHORT_SLOT_TIME: whether short slot time enabled
 *      (u8, 0 or 1)
+ * @NL80211_ATTR_BSS_BASIC_RATES: basic rates, array of basic
+ *      rates in format defined by IEEE 802.11 7.3.2.2 but without the length
+ *      restriction (at most %NL80211_MAX_SUPP_RATES).
 *
 * @NL80211_ATTR_HT_CAPABILITY: HT Capability information element (from
 *      association request when used with NL80211_CMD_NEW_STATION)
@@ -296,6 +338,14 @@ enum nl80211_attrs {
        NL80211_ATTR_REG_ALPHA2,
        NL80211_ATTR_REG_RULES,
+        NL80211_ATTR_MESH_PARAMS,
+        NL80211_ATTR_BSS_BASIC_RATES,
+        NL80211_ATTR_WIPHY_TXQ_PARAMS,
+        NL80211_ATTR_WIPHY_FREQ,
+        NL80211_ATTR_WIPHY_CHANNEL_TYPE,
        /* add attributes here, update the policy in nl80211.c */
        __NL80211_ATTR_AFTER_LAST,
@@ -307,6 +357,10 @@ enum nl80211_attrs {
 * here
 */
 #define NL80211_ATTR_HT_CAPABILITY NL80211_ATTR_HT_CAPABILITY
+#define NL80211_ATTR_BSS_BASIC_RATES NL80211_ATTR_BSS_BASIC_RATES
+#define NL80211_ATTR_WIPHY_TXQ_PARAMS NL80211_ATTR_WIPHY_TXQ_PARAMS
+#define NL80211_ATTR_WIPHY_FREQ NL80211_ATTR_WIPHY_FREQ
+#define NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET NL80211_ATTR_WIPHY_SEC_CHAN_OFFSET
 #define NL80211_MAX_SUPP_RATES                  32
 #define NL80211_MAX_SUPP_REG_RULES              32
@@ -371,6 +425,32 @@ enum nl80211_sta_flags {
 };
 /**
+ * enum nl80211_rate_info - bitrate information
+ *
+ * These attribute types are used with %NL80211_STA_INFO_TXRATE
+ * when getting information about the bitrate of a station.
+ *
+ * @__NL80211_RATE_INFO_INVALID: attribute number 0 is reserved
+ * @NL80211_RATE_INFO_BITRATE: total bitrate (u16, 100kbit/s)
+ * @NL80211_RATE_INFO_MCS: mcs index for 802.11n (u8)
+ * @NL80211_RATE_INFO_40_MHZ_WIDTH: 40 Mhz dualchannel bitrate
+ * @NL80211_RATE_INFO_SHORT_GI: 400ns guard interval
+ * @NL80211_RATE_INFO_MAX: highest rate_info number currently defined
+ * @__NL80211_RATE_INFO_AFTER_LAST: internal use
+ */
+enum nl80211_rate_info {
+        __NL80211_RATE_INFO_INVALID,
+        NL80211_RATE_INFO_BITRATE,
+        NL80211_RATE_INFO_MCS,
+        NL80211_RATE_INFO_40_MHZ_WIDTH,
+        NL80211_RATE_INFO_SHORT_GI,
+        /* keep last */
+        __NL80211_RATE_INFO_AFTER_LAST,
+        NL80211_RATE_INFO_MAX = __NL80211_RATE_INFO_AFTER_LAST - 1
+};
+/**
 * enum nl80211_sta_info - station information
 *
 * These attribute types are used with %NL80211_ATTR_STA_INFO
@@ -382,6 +462,9 @@ enum nl80211_sta_flags {
 * @NL80211_STA_INFO_TX_BYTES: total transmitted bytes (u32, to this station)
 * @__NL80211_STA_INFO_AFTER_LAST: internal
 * @NL80211_STA_INFO_MAX: highest possible station info attribute
+ * @NL80211_STA_INFO_SIGNAL: signal strength of last received PPDU (u8, dBm)
+ * @NL80211_STA_INFO_TX_BITRATE: current unicast tx rate, nested attribute
+ *      containing info as possible, see &enum nl80211_sta_info_txrate.
 */
 enum nl80211_sta_info {
        __NL80211_STA_INFO_INVALID,
@@ -391,6 +474,8 @@ enum nl80211_sta_info {
        NL80211_STA_INFO_LLID,
        NL80211_STA_INFO_PLID,
        NL80211_STA_INFO_PLINK_STATE,
+        NL80211_STA_INFO_SIGNAL,
+        NL80211_STA_INFO_TX_BITRATE,
        /* keep last */
        __NL80211_STA_INFO_AFTER_LAST,
@@ -452,17 +537,29 @@ enum nl80211_mpath_info {
 *      an array of nested frequency attributes
 * @NL80211_BAND_ATTR_RATES: supported bitrates in this band,
 *      an array of nested bitrate attributes
+ * @NL80211_BAND_ATTR_HT_MCS_SET: 16-byte attribute containing the MCS set as
+ *      defined in 802.11n
+ * @NL80211_BAND_ATTR_HT_CAPA: HT capabilities, as in the HT information IE
+ * @NL80211_BAND_ATTR_HT_AMPDU_FACTOR: A-MPDU factor, as in 11n
+ * @NL80211_BAND_ATTR_HT_AMPDU_DENSITY: A-MPDU density, as in 11n
 */
 enum nl80211_band_attr {
        __NL80211_BAND_ATTR_INVALID,
        NL80211_BAND_ATTR_FREQS,
        NL80211_BAND_ATTR_RATES,
+        NL80211_BAND_ATTR_HT_MCS_SET,
+        NL80211_BAND_ATTR_HT_CAPA,
+        NL80211_BAND_ATTR_HT_AMPDU_FACTOR,
+        NL80211_BAND_ATTR_HT_AMPDU_DENSITY,
        /* keep last */
        __NL80211_BAND_ATTR_AFTER_LAST,
        NL80211_BAND_ATTR_MAX = __NL80211_BAND_ATTR_AFTER_LAST - 1
 };
+#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
 /**
 * enum nl80211_frequency_attr - frequency attributes
 * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz
@@ -474,6 +571,8 @@ enum nl80211_band_attr {
 *      on this channel in current regulatory domain.
 * @NL80211_FREQUENCY_ATTR_RADAR: Radar detection is mandatory
 *      on this channel in current regulatory domain.
+ * @NL80211_FREQUENCY_ATTR_MAX_TX_POWER: Maximum transmission power in mBm
+ *      (100 * dBm).
 */
 enum nl80211_frequency_attr {
        __NL80211_FREQUENCY_ATTR_INVALID,
@@ -482,12 +581,15 @@ enum nl80211_frequency_attr {
        NL80211_FREQUENCY_ATTR_PASSIVE_SCAN,
        NL80211_FREQUENCY_ATTR_NO_IBSS,
        NL80211_FREQUENCY_ATTR_RADAR,
+        NL80211_FREQUENCY_ATTR_MAX_TX_POWER,
        /* keep last */
        __NL80211_FREQUENCY_ATTR_AFTER_LAST,
        NL80211_FREQUENCY_ATTR_MAX = __NL80211_FREQUENCY_ATTR_AFTER_LAST - 1
 };
+#define NL80211_FREQUENCY_ATTR_MAX_TX_POWER NL80211_FREQUENCY_ATTR_MAX_TX_POWER
 /**
 * enum nl80211_bitrate_attr - bitrate attributes
 * @NL80211_BITRATE_ATTR_RATE: Bitrate in units of 100 kbps
@@ -594,4 +696,119 @@ enum nl80211_mntr_flags {
        NL80211_MNTR_FLAG_MAX = __NL80211_MNTR_FLAG_AFTER_LAST - 1
 };
+/**
+ * enum nl80211_meshconf_params - mesh configuration parameters
+ *
+ * Mesh configuration parameters
+ *
+ * @__NL80211_MESHCONF_INVALID: internal use
+ *
+ * @NL80211_MESHCONF_RETRY_TIMEOUT: specifies the initial retry timeout in
+ * millisecond units, used by the Peer Link Open message
+ *
+ * @NL80211_MESHCONF_CONFIRM_TIMEOUT: specifies the inital confirm timeout, in
+ * millisecond units, used by the peer link management to close a peer link
+ *
+ * @NL80211_MESHCONF_HOLDING_TIMEOUT: specifies the holding timeout, in
+ * millisecond units
+ *
+ * @NL80211_MESHCONF_MAX_PEER_LINKS: maximum number of peer links allowed
+ * on this mesh interface
+ *
+ * @NL80211_MESHCONF_MAX_RETRIES: specifies the maximum number of peer link
+ * open retries that can be sent to establish a new peer link instance in a
+ * mesh
+ *
+ * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
+ * point.
+ *
+ * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically
+ * open peer links when we detect compatible mesh peers.
+ *
+ * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames
+ * containing a PREQ that an MP can send to a particular destination (path
+ * target)
+ *
+ * @NL80211_MESHCONF_PATH_REFRESH_TIME: how frequently to refresh mesh paths
+ * (in milliseconds)
+ *
+ * @NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT: minimum length of time to wait
+ * until giving up on a path discovery (in milliseconds)
+ *
+ * @NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT: The time (in TUs) for which mesh
+ * points receiving a PREQ shall consider the forwarding information from the
+ * root to be valid. (TU = time unit)
+ *
+ * @NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: The minimum interval of time (in
+ * TUs) during which an MP can send only one action frame containing a PREQ
+ * reference element
+ *
+ * @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_ATTR_MAX: highest possible mesh configuration attribute
+ *
+ * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
+ */
+enum nl80211_meshconf_params {
+        __NL80211_MESHCONF_INVALID,
+        NL80211_MESHCONF_RETRY_TIMEOUT,
+        NL80211_MESHCONF_CONFIRM_TIMEOUT,
+        NL80211_MESHCONF_HOLDING_TIMEOUT,
+        NL80211_MESHCONF_MAX_PEER_LINKS,
+        NL80211_MESHCONF_MAX_RETRIES,
+        NL80211_MESHCONF_TTL,
+        NL80211_MESHCONF_AUTO_OPEN_PLINKS,
+        NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
+        NL80211_MESHCONF_PATH_REFRESH_TIME,
+        NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
+        NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
+        NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
+        NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
+        /* keep last */
+        __NL80211_MESHCONF_ATTR_AFTER_LAST,
+        NL80211_MESHCONF_ATTR_MAX = __NL80211_MESHCONF_ATTR_AFTER_LAST - 1
+};
+/**
+ * enum nl80211_txq_attr - TX queue parameter attributes
+ * @__NL80211_TXQ_ATTR_INVALID: Attribute number 0 is reserved
+ * @NL80211_TXQ_ATTR_QUEUE: TX queue identifier (NL80211_TXQ_Q_*)
+ * @NL80211_TXQ_ATTR_TXOP: Maximum burst time in units of 32 usecs, 0 meaning
+ *      disabled
+ * @NL80211_TXQ_ATTR_CWMIN: Minimum contention window [a value of the form
+ *      2^n-1 in the range 1..32767]
+ * @NL80211_TXQ_ATTR_CWMAX: Maximum contention window [a value of the form
+ *      2^n-1 in the range 1..32767]
+ * @NL80211_TXQ_ATTR_AIFS: Arbitration interframe space [0..255]
+ * @__NL80211_TXQ_ATTR_AFTER_LAST: Internal
+ * @NL80211_TXQ_ATTR_MAX: Maximum TXQ attribute number
+ */
+enum nl80211_txq_attr {
+        __NL80211_TXQ_ATTR_INVALID,
+        NL80211_TXQ_ATTR_QUEUE,
+        NL80211_TXQ_ATTR_TXOP,
+        NL80211_TXQ_ATTR_CWMIN,
+        NL80211_TXQ_ATTR_CWMAX,
+        NL80211_TXQ_ATTR_AIFS,
+        /* keep last */
+        __NL80211_TXQ_ATTR_AFTER_LAST,
+        NL80211_TXQ_ATTR_MAX = __NL80211_TXQ_ATTR_AFTER_LAST - 1
+};
+enum nl80211_txq_q {
+        NL80211_TXQ_Q_VO,
+        NL80211_TXQ_Q_VI,
+        NL80211_TXQ_Q_BE,
+        NL80211_TXQ_Q_BK
+};
+enum nl80211_channel_type {
+        NL80211_CHAN_NO_HT,
+        NL80211_CHAN_HT20,
+        NL80211_CHAN_HT40MINUS,
+        NL80211_CHAN_HT40PLUS
+};
 #endif /* __LINUX_NL80211_H */
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index c8a768e59640..afad7dec1b36 100644
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -27,7 +27,6 @@ struct nsproxy {
        struct ipc_namespace *ipc_ns;
        struct mnt_namespace *mnt_ns;
        struct pid_namespace *pid_ns;
-        struct user_namespace *user_ns;
        struct net           *net_ns;
 };
 extern struct nsproxy init_nsproxy;
diff --git a/include/linux/of.h b/include/linux/of.h
index e2488f5e7cb2..6a7efa242f5e 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -57,6 +57,12 @@ extern struct device_node *of_get_next_child(const struct device_node *node,
        for (child = of_get_next_child(parent, NULL); child != NULL; \
             child = of_get_next_child(parent, child))
+extern struct device_node *of_find_node_with_property(
+        struct device_node *from, const char *prop_name);
+#define for_each_node_with_property(dn, prop_name) \
+        for (dn = of_find_node_with_property(NULL, prop_name); dn; \
+             dn = of_find_node_with_property(dn, prop_name))
 extern struct property *of_find_property(const struct device_node *np,
                                         const char *name,
                                         int *lenp);
diff --git a/include/linux/of_gpio.h b/include/linux/of_gpio.h
index 67db101d0eb8..fc2472c3c254 100644
--- a/include/linux/of_gpio.h
+++ b/include/linux/of_gpio.h
@@ -14,9 +14,22 @@
 #ifndef __LINUX_OF_GPIO_H
 #define __LINUX_OF_GPIO_H
+#include <linux/compiler.h>
+#include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/gpio.h>
+struct device_node;
+/*
+ * This is Linux-specific flags. By default controllers' and Linux' mapping
+ * match, but GPIO controllers are free to translate their own flags to
+ * Linux-specific in their .xlate callback. Though, 1:1 mapping is recommended.
+ */
+enum of_gpio_flags {
+        OF_GPIO_ACTIVE_LOW = 0x1,
+};
 #ifdef CONFIG_OF_GPIO
 /*
@@ -26,7 +39,7 @@ struct of_gpio_chip {
        struct gpio_chip gc;
        int gpio_cells;
        int (*xlate)(struct of_gpio_chip *of_gc, struct device_node *np,
-                     const void *gpio_spec);
+                     const void *gpio_spec, enum of_gpio_flags *flags);
 };
 static inline struct of_gpio_chip *to_of_gpio_chip(struct gpio_chip *gc)
@@ -50,20 +63,43 @@ static inline struct of_mm_gpio_chip *to_of_mm_gpio_chip(struct gpio_chip *gc)
        return container_of(of_gc, struct of_mm_gpio_chip, of_gc);
 }
-extern int of_get_gpio(struct device_node *np, int index);
+extern int of_get_gpio_flags(struct device_node *np, int index,
+                             enum of_gpio_flags *flags);
+extern unsigned int of_gpio_count(struct device_node *np);
 extern int of_mm_gpiochip_add(struct device_node *np,
                              struct of_mm_gpio_chip *mm_gc);
 extern int of_gpio_simple_xlate(struct of_gpio_chip *of_gc,
                                struct device_node *np,
-                                const void *gpio_spec);
+                                const void *gpio_spec,
+                                enum of_gpio_flags *flags);
 #else
 /* Drivers may not strictly depend on the GPIO support, so let them link. */
-static inline int of_get_gpio(struct device_node *np, int index)
+static inline int of_get_gpio_flags(struct device_node *np, int index,
+                                    enum of_gpio_flags *flags)
 {
        return -ENOSYS;
 }
+static inline unsigned int of_gpio_count(struct device_node *np)
+{
+        return 0;
+}
 #endif /* CONFIG_OF_GPIO */
+/**
+ * of_get_gpio - Get a GPIO number to use with GPIO API
+ * @np:         device node to get GPIO from
+ * @index:      index of the GPIO
+ *
+ * Returns GPIO number to use with Linux generic GPIO API, or one of the errno
+ * value on the error condition.
+ */
+static inline int of_get_gpio(struct device_node *np, int index)
+{
+        return of_get_gpio_flags(np, index, NULL);
+}
 #endif /* __LINUX_OF_GPIO_H */
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index a8efcfeea732..3d327b67d7e2 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -26,8 +26,7 @@ extern struct bus_type of_platform_bus_type;
 /*
 * An of_platform_driver driver is attached to a basic of_device on
- * the "platform bus" (of_platform_bus_type) (or ISA, EBUS and SBUS
+ * the "platform bus" (of_platform_bus_type).
- * busses on sparc).
 */
 struct of_platform_driver
 {
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index 5231861f357d..1ce9fe572e51 100644
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
@@ -86,8 +86,7 @@ int oprofile_arch_init(struct oprofile_operations * ops);
 void oprofile_arch_exit(void);
 /**
- * Add a sample. This may be called from any context. Pass
+ * Add a sample. This may be called from any context.
- * smp_processor_id() as cpu.
 */
 void oprofile_add_sample(struct pt_regs * const regs, unsigned long event);
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 709742be02f0..01ca0856caff 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -241,7 +241,8 @@ unsigned find_get_pages_contig(struct address_space *mapping, pgoff_t start,
 unsigned find_get_pages_tag(struct address_space *mapping, pgoff_t *index,
                        int tag, unsigned int nr_pages, struct page **pages);
-struct page *__grab_cache_page(struct address_space *mapping, pgoff_t index);
+struct page *grab_cache_page_write_begin(struct address_space *mapping,
+                        pgoff_t index, unsigned flags);
 /*
 * Returns locked page at given index in given cache, creating it if needed.
diff --git a/include/linux/pci.h b/include/linux/pci.h
index feb4657bb043..03b0b8c3c81b 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -134,6 +134,11 @@ enum pci_dev_flags {
        PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2,
 };
+enum pci_irq_reroute_variant {
+        INTEL_IRQ_REROUTE_VARIANT = 1,
+        MAX_IRQ_REROUTE_VARIANTS = 3
+};
 typedef unsigned short __bitwise pci_bus_flags_t;
 enum pci_bus_flags {
        PCI_BUS_FLAGS_NO_MSI   = (__force pci_bus_flags_t) 1,
@@ -218,6 +223,7 @@ struct pci_dev {
        unsigned int    no_msi:1;       /* device may not use msi */
        unsigned int    block_ucfg_access:1;    /* userspace config space access is blocked */
        unsigned int    broken_parity_status:1; /* Device generates false positive parity */
+        unsigned int    irq_reroute_variant:2;  /* device needs IRQ rerouting variant */
        unsigned int    msi_enabled:1;
        unsigned int    msix_enabled:1;
        unsigned int    ari_enabled:1;  /* ARI forwarding */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 1800f1d6e40d..218c73b1e6d4 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1766,6 +1766,7 @@
 #define PCI_DEVICE_ID_SIIG_8S_20x_650   0x2081
 #define PCI_DEVICE_ID_SIIG_8S_20x_850   0x2082
 #define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL    0x2050
+#define PCI_SUBDEVICE_ID_SIIG_DUAL_SERIAL       0x2530
 #define PCI_VENDOR_ID_RADISYS           0x1331
@@ -1795,6 +1796,7 @@
 #define PCI_DEVICE_ID_SEALEVEL_UCOMM232 0x7202
 #define PCI_DEVICE_ID_SEALEVEL_COMM4    0x7401
 #define PCI_DEVICE_ID_SEALEVEL_COMM8    0x7801
+#define PCI_DEVICE_ID_SEALEVEL_7803     0x7803
 #define PCI_DEVICE_ID_SEALEVEL_UCOMM8   0x7804
 #define PCI_VENDOR_ID_HYPERCOPE         0x1365
@@ -2304,6 +2306,10 @@
 #define PCI_DEVICE_ID_INTEL_PXH_0       0x0329
 #define PCI_DEVICE_ID_INTEL_PXH_1       0x032A
 #define PCI_DEVICE_ID_INTEL_PXHV        0x032C
+#define PCI_DEVICE_ID_INTEL_80332_0     0x0330
+#define PCI_DEVICE_ID_INTEL_80332_1     0x0332
+#define PCI_DEVICE_ID_INTEL_80333_0     0x0370
+#define PCI_DEVICE_ID_INTEL_80333_1     0x0372
 #define PCI_DEVICE_ID_INTEL_82375       0x0482
 #define PCI_DEVICE_ID_INTEL_82424       0x0483
 #define PCI_DEVICE_ID_INTEL_82378       0x0484
@@ -2376,6 +2382,7 @@
 #define PCI_DEVICE_ID_INTEL_ESB_4       0x25a4
 #define PCI_DEVICE_ID_INTEL_ESB_5       0x25a6
 #define PCI_DEVICE_ID_INTEL_ESB_9       0x25ab
+#define PCI_DEVICE_ID_INTEL_ESB_10      0x25ac
 #define PCI_DEVICE_ID_INTEL_82820_HB    0x2500
 #define PCI_DEVICE_ID_INTEL_82820_UP_HB 0x2501
 #define PCI_DEVICE_ID_INTEL_82850_HB    0x2530
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 77c4ed60b982..d7e54d98869f 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -467,6 +467,8 @@ int genphy_restart_aneg(struct phy_device *phydev);
 int genphy_config_aneg(struct phy_device *phydev);
 int genphy_update_link(struct phy_device *phydev);
 int genphy_read_status(struct phy_device *phydev);
+int genphy_suspend(struct phy_device *phydev);
+int genphy_resume(struct phy_device *phydev);
 void phy_driver_unregister(struct phy_driver *drv);
 int phy_driver_register(struct phy_driver *new_driver);
 void phy_prepare_link(struct phy_device *phydev,
diff --git a/include/linux/pid.h b/include/linux/pid.h
index d7e98ff8021e..bb206c56d1f0 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -147,9 +147,9 @@ pid_t pid_vnr(struct pid *pid);
 #define do_each_pid_task(pid, type, task)                               \
        do {                                                            \
                struct hlist_node *pos___;                              \
-                if (pid != NULL)                                        \
+                if ((pid) != NULL)                                      \
                        hlist_for_each_entry_rcu((task), pos___,        \
-                                &pid->tasks[type], pids[type].node) {
+                                &(pid)->tasks[type], pids[type].node) {
                        /*
                         * Both old and new leaders may be attached to
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 7cf7824df778..e6aa8482ad7a 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -394,6 +394,20 @@ enum
 #define TCA_BASIC_MAX (__TCA_BASIC_MAX - 1)
+/* Cgroup classifier */
+enum
+{
+        TCA_CGROUP_UNSPEC,
+        TCA_CGROUP_ACT,
+        TCA_CGROUP_POLICE,
+        TCA_CGROUP_EMATCHES,
+        __TCA_CGROUP_MAX,
+};
+#define TCA_CGROUP_MAX (__TCA_CGROUP_MAX - 1)
 /* Extended Matches */
 struct tcf_ematch_tree_hdr
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 5d921fa91a5b..e3f133adba78 100644
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -500,4 +500,20 @@ struct tc_netem_corrupt
 #define NETEM_DIST_SCALE        8192
+/* DRR */
+enum
+{
+        TCA_DRR_UNSPEC,
+        TCA_DRR_QUANTUM,
+        __TCA_DRR_MAX
+};
+#define TCA_DRR_MAX     (__TCA_DRR_MAX - 1)
+struct tc_drr_stats
+{
+        u32     deficit;
+};
 #endif
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index a7c721355549..4f71bf4e628c 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -45,7 +45,11 @@ struct k_itimer {
        int it_requeue_pending;         /* waiting to requeue this timer */
 #define REQUEUE_PENDING 1
        int it_sigev_notify;            /* notify word of sigevent struct */
-        struct task_struct *it_process; /* process to send signal to */
+        struct signal_struct *it_signal;
+        union {
+                struct pid *it_pid;     /* pid of process to send signal to */
+                struct task_struct *it_process; /* for clock_nanosleep */
+        };
        struct sigqueue *sigq;          /* signal queue entry. */
        union {
                struct {
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 22641d5d45df..98b93ca4db06 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -94,6 +94,7 @@ extern void ptrace_notify(int exit_code);
 extern void __ptrace_link(struct task_struct *child,
                          struct task_struct *new_parent);
 extern void __ptrace_unlink(struct task_struct *child);
+extern void ptrace_fork(struct task_struct *task, unsigned long clone_flags);
 #define PTRACE_MODE_READ   1
 #define PTRACE_MODE_ATTACH 2
 /* Returns 0 on success, -errno on denial. */
@@ -313,6 +314,27 @@ static inline void user_enable_block_step(struct task_struct *task)
 #define arch_ptrace_stop(code, info)            do { } while (0)
 #endif
+#ifndef arch_ptrace_untrace
+/*
+ * Do machine-specific work before untracing child.
+ *
+ * This is called for a normal detach as well as from ptrace_exit()
+ * when the tracing task dies.
+ *
+ * Called with write_lock(&tasklist_lock) held.
+ */
+#define arch_ptrace_untrace(task)               do { } while (0)
+#endif
+#ifndef arch_ptrace_fork
+/*
+ * Do machine-specific work to initialize a new task.
+ *
+ * This is called from copy_process().
+ */
+#define arch_ptrace_fork(child, clone_flags)    do { } while (0)
+#endif
 extern int task_current_syscall(struct task_struct *target, long *callno,
                                unsigned long args[6], unsigned int maxargs,
                                unsigned long *sp, unsigned long *pc);
diff --git a/include/linux/random.h b/include/linux/random.h
index 36f125c0c603..407ea3646f8f 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -8,6 +8,7 @@
 #define _LINUX_RANDOM_H
 #include <linux/ioctl.h>
+#include <linux/irqnr.h>
 /* ioctl()'s for the random number generator */
diff --git a/include/linux/rcuclassic.h b/include/linux/rcuclassic.h
index 5f89b62e6983..f3f697df1d71 100644
--- a/include/linux/rcuclassic.h
+++ b/include/linux/rcuclassic.h
@@ -41,7 +41,7 @@
 #include <linux/seqlock.h>
 #ifdef CONFIG_RCU_CPU_STALL_DETECTOR
-#define RCU_SECONDS_TILL_STALL_CHECK    ( 3 * HZ) /* for rcp->jiffies_stall */
+#define RCU_SECONDS_TILL_STALL_CHECK    (10 * HZ) /* for rcp->jiffies_stall */
 #define RCU_SECONDS_TILL_STALL_RECHECK  (30 * HZ) /* for rcp->jiffies_stall */
 #endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
@@ -59,8 +59,8 @@ struct rcu_ctrlblk {
        int     signaled;
        spinlock_t      lock    ____cacheline_internodealigned_in_smp;
-        cpumask_t       cpumask; /* CPUs that need to switch in order    */
+        DECLARE_BITMAP(cpumask, NR_CPUS); /* CPUs that need to switch for */
-                                 /* for current batch to proceed.        */
+                                          /* current batch to proceed.     */
 } ____cacheline_internodealigned_in_smp;
 /* Is batch a before batch b ? */
diff --git a/include/linux/rculist_nulls.h b/include/linux/rculist_nulls.h
new file mode 100644
index 000000000000..f9ddd03961a8
--- /dev/null
+++ b/include/linux/rculist_nulls.h
@@ -0,0 +1,110 @@
+#ifndef _LINUX_RCULIST_NULLS_H
+#define _LINUX_RCULIST_NULLS_H
+#ifdef __KERNEL__
+/*
+ * RCU-protected list version
+ */
+#include <linux/list_nulls.h>
+#include <linux/rcupdate.h>
+/**
+ * hlist_nulls_del_init_rcu - deletes entry from hash list with re-initialization
+ * @n: the element to delete from the hash list.
+ *
+ * Note: hlist_nulls_unhashed() on the node return true after this. It is
+ * useful for RCU based read lockfree traversal if the writer side
+ * must know if the list entry is still hashed or already unhashed.
+ *
+ * In particular, it means that we can not poison the forward pointers
+ * that may still be used for walking the hash list and we can only
+ * zero the pprev pointer so list_unhashed() will return true after
+ * this.
+ *
+ * The caller must take whatever precautions are necessary (such as
+ * holding appropriate locks) to avoid racing with another
+ * list-mutation primitive, such as hlist_nulls_add_head_rcu() or
+ * hlist_nulls_del_rcu(), running on this same list.  However, it is
+ * perfectly legal to run concurrently with the _rcu list-traversal
+ * primitives, such as hlist_nulls_for_each_entry_rcu().
+ */
+static inline void hlist_nulls_del_init_rcu(struct hlist_nulls_node *n)
+{
+        if (!hlist_nulls_unhashed(n)) {
+                __hlist_nulls_del(n);
+                n->pprev = NULL;
+        }
+}
+/**
+ * hlist_nulls_del_rcu - deletes entry from hash list without re-initialization
+ * @n: the element to delete from the hash list.
+ *
+ * Note: hlist_nulls_unhashed() on entry does not return true after this,
+ * the entry is in an undefined state. It is useful for RCU based
+ * lockfree traversal.
+ *
+ * In particular, it means that we can not poison the forward
+ * pointers that may still be used for walking the hash list.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as hlist_nulls_add_head_rcu()
+ * or hlist_nulls_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * hlist_nulls_for_each_entry().
+ */
+static inline void hlist_nulls_del_rcu(struct hlist_nulls_node *n)
+{
+        __hlist_nulls_del(n);
+        n->pprev = LIST_POISON2;
+}
+/**
+ * hlist_nulls_add_head_rcu
+ * @n: the element to add to the hash list.
+ * @h: the list to add to.
+ *
+ * Description:
+ * Adds the specified element to the specified hlist_nulls,
+ * while permitting racing traversals.
+ *
+ * The caller must take whatever precautions are necessary
+ * (such as holding appropriate locks) to avoid racing
+ * with another list-mutation primitive, such as hlist_nulls_add_head_rcu()
+ * or hlist_nulls_del_rcu(), running on this same list.
+ * However, it is perfectly legal to run concurrently with
+ * the _rcu list-traversal primitives, such as
+ * hlist_nulls_for_each_entry_rcu(), used to prevent memory-consistency
+ * problems on Alpha CPUs.  Regardless of the type of CPU, the
+ * list-traversal primitive must be guarded by rcu_read_lock().
+ */
+static inline void hlist_nulls_add_head_rcu(struct hlist_nulls_node *n,
+                                        struct hlist_nulls_head *h)
+{
+        struct hlist_nulls_node *first = h->first;
+        n->next = first;
+        n->pprev = &h->first;
+        rcu_assign_pointer(h->first, n);
+        if (!is_a_nulls(first))
+                first->pprev = &n->next;
+}
+/**
+ * hlist_nulls_for_each_entry_rcu - iterate over rcu list of given type
+ * @tpos:       the type * to use as a loop cursor.
+ * @pos:        the &struct hlist_nulls_node to use as a loop cursor.
+ * @head:       the head for your list.
+ * @member:     the name of the hlist_nulls_node within the struct.
+ *
+ */
+#define hlist_nulls_for_each_entry_rcu(tpos, pos, head, member) \
+        for (pos = rcu_dereference((head)->first);                       \
+                (!is_a_nulls(pos)) &&                   \
+                ({ tpos = hlist_nulls_entry(pos, typeof(*tpos), member); 1; }); \
+                pos = rcu_dereference(pos->next))
+#endif
+#endif
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 86f1f5e43e33..1168fbcea8d4 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -52,11 +52,15 @@ struct rcu_head {
        void (*func)(struct rcu_head *head);
 };
-#ifdef CONFIG_CLASSIC_RCU
+#if defined(CONFIG_CLASSIC_RCU)
 #include <linux/rcuclassic.h>
-#else /* #ifdef CONFIG_CLASSIC_RCU */
+#elif defined(CONFIG_TREE_RCU)
+#include <linux/rcutree.h>
+#elif defined(CONFIG_PREEMPT_RCU)
 #include <linux/rcupreempt.h>
-#endif /* #else #ifdef CONFIG_CLASSIC_RCU */
+#else
+#error "Unknown RCU implementation specified to kernel configuration"
+#endif /* #else #if defined(CONFIG_CLASSIC_RCU) */
 #define RCU_HEAD_INIT   { .next = NULL, .func = NULL }
 #define RCU_HEAD(head) struct rcu_head head = RCU_HEAD_INIT
@@ -142,6 +146,7 @@ struct rcu_head {
 * on the write-side to insure proper synchronization.
 */
 #define rcu_read_lock_sched() preempt_disable()
+#define rcu_read_lock_sched_notrace() preempt_disable_notrace()
 /*
 * rcu_read_unlock_sched - marks the end of a RCU-classic critical section
@@ -149,6 +154,7 @@ struct rcu_head {
 * See rcu_read_lock_sched for more information.
 */
 #define rcu_read_unlock_sched() preempt_enable()
+#define rcu_read_unlock_sched_notrace() preempt_enable_notrace()
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
new file mode 100644
index 000000000000..d4368b7975c3
--- /dev/null
+++ b/include/linux/rcutree.h
@@ -0,0 +1,329 @@
+/*
+ * Read-Copy Update mechanism for mutual exclusion (tree-based version)
+ *
+ * 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: Dipankar Sarma <dipankar@in.ibm.com>
+ *         Paul E. McKenney <paulmck@linux.vnet.ibm.com> Hierarchical algorithm
+ *
+ * Based on the original work by Paul McKenney <paulmck@us.ibm.com>
+ * and inputs from Rusty Russell, Andrea Arcangeli and Andi Kleen.
+ *
+ * For detailed explanation of Read-Copy Update mechanism see -
+ *      Documentation/RCU
+ */
+#ifndef __LINUX_RCUTREE_H
+#define __LINUX_RCUTREE_H
+#include <linux/cache.h>
+#include <linux/spinlock.h>
+#include <linux/threads.h>
+#include <linux/percpu.h>
+#include <linux/cpumask.h>
+#include <linux/seqlock.h>
+/*
+ * Define shape of hierarchy based on NR_CPUS and CONFIG_RCU_FANOUT.
+ * In theory, it should be possible to add more levels straightforwardly.
+ * In practice, this has not been tested, so there is probably some
+ * bug somewhere.
+ */
+#define MAX_RCU_LVLS 3
+#define RCU_FANOUT            (CONFIG_RCU_FANOUT)
+#define RCU_FANOUT_SQ         (RCU_FANOUT * RCU_FANOUT)
+#define RCU_FANOUT_CUBE       (RCU_FANOUT_SQ * RCU_FANOUT)
+#if NR_CPUS <= RCU_FANOUT
+#  define NUM_RCU_LVLS        1
+#  define NUM_RCU_LVL_0       1
+#  define NUM_RCU_LVL_1       (NR_CPUS)
+#  define NUM_RCU_LVL_2       0
+#  define NUM_RCU_LVL_3       0
+#elif NR_CPUS <= RCU_FANOUT_SQ
+#  define NUM_RCU_LVLS        2
+#  define NUM_RCU_LVL_0       1
+#  define NUM_RCU_LVL_1       (((NR_CPUS) + RCU_FANOUT - 1) / RCU_FANOUT)
+#  define NUM_RCU_LVL_2       (NR_CPUS)
+#  define NUM_RCU_LVL_3       0
+#elif NR_CPUS <= RCU_FANOUT_CUBE
+#  define NUM_RCU_LVLS        3
+#  define NUM_RCU_LVL_0       1
+#  define NUM_RCU_LVL_1       (((NR_CPUS) + RCU_FANOUT_SQ - 1) / RCU_FANOUT_SQ)
+#  define NUM_RCU_LVL_2       (((NR_CPUS) + (RCU_FANOUT) - 1) / (RCU_FANOUT))
+#  define NUM_RCU_LVL_3       NR_CPUS
+#else
+# error "CONFIG_RCU_FANOUT insufficient for NR_CPUS"
+#endif /* #if (NR_CPUS) <= RCU_FANOUT */
+#define RCU_SUM (NUM_RCU_LVL_0 + NUM_RCU_LVL_1 + NUM_RCU_LVL_2 + NUM_RCU_LVL_3)
+#define NUM_RCU_NODES (RCU_SUM - NR_CPUS)
+/*
+ * Dynticks per-CPU state.
+ */
+struct rcu_dynticks {
+        int dynticks_nesting;   /* Track nesting level, sort of. */
+        int dynticks;           /* Even value for dynticks-idle, else odd. */
+        int dynticks_nmi;       /* Even value for either dynticks-idle or */
+                                /*  not in nmi handler, else odd.  So this */
+                                /*  remains even for nmi from irq handler. */
+};
+/*
+ * Definition for node within the RCU grace-period-detection hierarchy.
+ */
+struct rcu_node {
+        spinlock_t lock;
+        unsigned long qsmask;   /* CPUs or groups that need to switch in */
+                                /*  order for current grace period to proceed.*/
+        unsigned long qsmaskinit;
+                                /* Per-GP initialization for qsmask. */
+        unsigned long grpmask;  /* Mask to apply to parent qsmask. */
+        int     grplo;          /* lowest-numbered CPU or group here. */
+        int     grphi;          /* highest-numbered CPU or group here. */
+        u8      grpnum;         /* CPU/group number for next level up. */
+        u8      level;          /* root is at level 0. */
+        struct rcu_node *parent;
+} ____cacheline_internodealigned_in_smp;
+/* Index values for nxttail array in struct rcu_data. */
+#define RCU_DONE_TAIL           0       /* Also RCU_WAIT head. */
+#define RCU_WAIT_TAIL           1       /* Also RCU_NEXT_READY head. */
+#define RCU_NEXT_READY_TAIL     2       /* Also RCU_NEXT head. */
+#define RCU_NEXT_TAIL           3
+#define RCU_NEXT_SIZE           4
+/* Per-CPU data for read-copy update. */
+struct rcu_data {
+        /* 1) quiescent-state and grace-period handling : */
+        long            completed;      /* Track rsp->completed gp number */
+                                        /*  in order to detect GP end. */
+        long            gpnum;          /* Highest gp number that this CPU */
+                                        /*  is aware of having started. */
+        long            passed_quiesc_completed;
+                                        /* Value of completed at time of qs. */
+        bool            passed_quiesc;  /* User-mode/idle loop etc. */
+        bool            qs_pending;     /* Core waits for quiesc state. */
+        bool            beenonline;     /* CPU online at least once. */
+        struct rcu_node *mynode;        /* This CPU's leaf of hierarchy */
+        unsigned long grpmask;          /* Mask to apply to leaf qsmask. */
+        /* 2) batch handling */
+        /*
+         * If nxtlist is not NULL, it is partitioned as follows.
+         * Any of the partitions might be empty, in which case the
+         * pointer to that partition will be equal to the pointer for
+         * the following partition.  When the list is empty, all of
+         * the nxttail elements point to nxtlist, which is NULL.
+         *
+         * [*nxttail[RCU_NEXT_READY_TAIL], NULL = *nxttail[RCU_NEXT_TAIL]):
+         *      Entries that might have arrived after current GP ended
+         * [*nxttail[RCU_WAIT_TAIL], *nxttail[RCU_NEXT_READY_TAIL]):
+         *      Entries known to have arrived before current GP ended
+         * [*nxttail[RCU_DONE_TAIL], *nxttail[RCU_WAIT_TAIL]):
+         *      Entries that batch # <= ->completed - 1: waiting for current GP
+         * [nxtlist, *nxttail[RCU_DONE_TAIL]):
+         *      Entries that batch # <= ->completed
+         *      The grace period for these entries has completed, and
+         *      the other grace-period-completed entries may be moved
+         *      here temporarily in rcu_process_callbacks().
+         */
+        struct rcu_head *nxtlist;
+        struct rcu_head **nxttail[RCU_NEXT_SIZE];
+        long            qlen;           /* # of queued callbacks */
+        long            blimit;         /* Upper limit on a processed batch */
+#ifdef CONFIG_NO_HZ
+        /* 3) dynticks interface. */
+        struct rcu_dynticks *dynticks;  /* Shared per-CPU dynticks state. */
+        int dynticks_snap;              /* Per-GP tracking for dynticks. */
+        int dynticks_nmi_snap;          /* Per-GP tracking for dynticks_nmi. */
+#endif /* #ifdef CONFIG_NO_HZ */
+        /* 4) reasons this CPU needed to be kicked by force_quiescent_state */
+#ifdef CONFIG_NO_HZ
+        unsigned long dynticks_fqs;     /* Kicked due to dynticks idle. */
+#endif /* #ifdef CONFIG_NO_HZ */
+        unsigned long offline_fqs;      /* Kicked due to being offline. */
+        unsigned long resched_ipi;      /* Sent a resched IPI. */
+        /* 5) state to allow this CPU to force_quiescent_state on others */
+        long n_rcu_pending;             /* rcu_pending() calls since boot. */
+        long n_rcu_pending_force_qs;    /* when to force quiescent states. */
+        int cpu;
+};
+/* Values for signaled field in struct rcu_state. */
+#define RCU_GP_INIT             0       /* Grace period being initialized. */
+#define RCU_SAVE_DYNTICK        1       /* Need to scan dyntick state. */
+#define RCU_FORCE_QS            2       /* Need to force quiescent state. */
+#ifdef CONFIG_NO_HZ
+#define RCU_SIGNAL_INIT         RCU_SAVE_DYNTICK
+#else /* #ifdef CONFIG_NO_HZ */
+#define RCU_SIGNAL_INIT         RCU_FORCE_QS
+#endif /* #else #ifdef CONFIG_NO_HZ */
+#define RCU_JIFFIES_TILL_FORCE_QS        3      /* for rsp->jiffies_force_qs */
+#ifdef CONFIG_RCU_CPU_STALL_DETECTOR
+#define RCU_SECONDS_TILL_STALL_CHECK   (10 * HZ)  /* for rsp->jiffies_stall */
+#define RCU_SECONDS_TILL_STALL_RECHECK (30 * HZ)  /* for rsp->jiffies_stall */
+#define RCU_STALL_RAT_DELAY             2         /* Allow other CPUs time */
+                                                  /*  to take at least one */
+                                                  /*  scheduling clock irq */
+                                                  /*  before ratting on them. */
+#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
+/*
+ * RCU global state, including node hierarchy.  This hierarchy is
+ * represented in "heap" form in a dense array.  The root (first level)
+ * of the hierarchy is in ->node[0] (referenced by ->level[0]), the second
+ * level in ->node[1] through ->node[m] (->node[1] referenced by ->level[1]),
+ * and the third level in ->node[m+1] and following (->node[m+1] referenced
+ * by ->level[2]).  The number of levels is determined by the number of
+ * CPUs and by CONFIG_RCU_FANOUT.  Small systems will have a "hierarchy"
+ * consisting of a single rcu_node.
+ */
+struct rcu_state {
+        struct rcu_node node[NUM_RCU_NODES];    /* Hierarchy. */
+        struct rcu_node *level[NUM_RCU_LVLS];   /* Hierarchy levels. */
+        u32 levelcnt[MAX_RCU_LVLS + 1];         /* # nodes in each level. */
+        u8 levelspread[NUM_RCU_LVLS];           /* kids/node in each level. */
+        struct rcu_data *rda[NR_CPUS];          /* array of rdp pointers. */
+        /* The following fields are guarded by the root rcu_node's lock. */
+        u8      signaled ____cacheline_internodealigned_in_smp;
+                                                /* Force QS state. */
+        long    gpnum;                          /* Current gp number. */
+        long    completed;                      /* # of last completed gp. */
+        spinlock_t onofflock;                   /* exclude on/offline and */
+                                                /*  starting new GP. */
+        spinlock_t fqslock;                     /* Only one task forcing */
+                                                /*  quiescent states. */
+        unsigned long jiffies_force_qs;         /* Time at which to invoke */
+                                                /*  force_quiescent_state(). */
+        unsigned long n_force_qs;               /* Number of calls to */
+                                                /*  force_quiescent_state(). */
+        unsigned long n_force_qs_lh;            /* ~Number of calls leaving */
+                                                /*  due to lock unavailable. */
+        unsigned long n_force_qs_ngp;           /* Number of calls leaving */
+                                                /*  due to no GP active. */
+#ifdef CONFIG_RCU_CPU_STALL_DETECTOR
+        unsigned long gp_start;                 /* Time at which GP started, */
+                                                /*  but in jiffies. */
+        unsigned long jiffies_stall;            /* Time at which to check */
+                                                /*  for CPU stalls. */
+#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
+#ifdef CONFIG_NO_HZ
+        long dynticks_completed;                /* Value of completed @ snap. */
+#endif /* #ifdef CONFIG_NO_HZ */
+};
+extern struct rcu_state rcu_state;
+DECLARE_PER_CPU(struct rcu_data, rcu_data);
+extern struct rcu_state rcu_bh_state;
+DECLARE_PER_CPU(struct rcu_data, rcu_bh_data);
+/*
+ * Increment the quiescent state counter.
+ * The counter is a bit degenerated: We do not need to know
+ * how many quiescent states passed, just if there was at least
+ * one since the start of the grace period. Thus just a flag.
+ */
+static inline void rcu_qsctr_inc(int cpu)
+{
+        struct rcu_data *rdp = &per_cpu(rcu_data, cpu);
+        rdp->passed_quiesc = 1;
+        rdp->passed_quiesc_completed = rdp->completed;
+}
+static inline void rcu_bh_qsctr_inc(int cpu)
+{
+        struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);
+        rdp->passed_quiesc = 1;
+        rdp->passed_quiesc_completed = rdp->completed;
+}
+extern int rcu_pending(int cpu);
+extern int rcu_needs_cpu(int cpu);
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+extern struct lockdep_map rcu_lock_map;
+# define rcu_read_acquire()     \
+                        lock_acquire(&rcu_lock_map, 0, 0, 2, 1, NULL, _THIS_IP_)
+# define rcu_read_release()     lock_release(&rcu_lock_map, 1, _THIS_IP_)
+#else
+# define rcu_read_acquire()     do { } while (0)
+# define rcu_read_release()     do { } while (0)
+#endif
+static inline void __rcu_read_lock(void)
+{
+        preempt_disable();
+        __acquire(RCU);
+        rcu_read_acquire();
+}
+static inline void __rcu_read_unlock(void)
+{
+        rcu_read_release();
+        __release(RCU);
+        preempt_enable();
+}
+static inline void __rcu_read_lock_bh(void)
+{
+        local_bh_disable();
+        __acquire(RCU_BH);
+        rcu_read_acquire();
+}
+static inline void __rcu_read_unlock_bh(void)
+{
+        rcu_read_release();
+        __release(RCU_BH);
+        local_bh_enable();
+}
+#define __synchronize_sched() synchronize_rcu()
+#define call_rcu_sched(head, func) call_rcu(head, func)
+static inline void rcu_init_sched(void)
+{
+}
+extern void __rcu_init(void);
+extern void rcu_check_callbacks(int cpu, int user);
+extern void rcu_restart_cpu(int cpu);
+extern long rcu_batches_completed(void);
+extern long rcu_batches_completed_bh(void);
+#ifdef CONFIG_NO_HZ
+void rcu_enter_nohz(void);
+void rcu_exit_nohz(void);
+#else /* CONFIG_NO_HZ */
+static inline void rcu_enter_nohz(void)
+{
+}
+static inline void rcu_exit_nohz(void)
+{
+}
+#endif /* CONFIG_NO_HZ */
+#endif /* __LINUX_RCUTREE_H */
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 4cd64b0d9825..164332cbb77c 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -108,6 +108,7 @@ struct rfkill {
        struct device dev;
        struct list_head node;
+        enum rfkill_state state_for_resume;
 };
 #define to_rfkill(d)    container_of(d, struct rfkill, dev)
@@ -148,11 +149,4 @@ static inline char *rfkill_get_led_name(struct rfkill *rfkill)
 #endif
 }
-/* rfkill notification chain */
-#define RFKILL_STATE_CHANGED            0x0001  /* state of a normal rfkill
-                                                   switch has changed */
-int register_rfkill_notifier(struct notifier_block *nb);
-int unregister_rfkill_notifier(struct notifier_block *nb);
 #endif /* RFKILL_H */
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h
index e097c2e6b6dc..b3b359660082 100644
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
@@ -28,17 +28,19 @@ struct ring_buffer_event {
 *                               size = 8 bytes
 *
 * @RINGBUF_TYPE_TIME_STAMP:    Sync time stamp with external clock
- *                               array[0] = tv_nsec
+ *                               array[0]    = tv_nsec
- *                               array[1] = tv_sec
+ *                               array[1..2] = tv_sec
 *                               size = 16 bytes
 *
 * @RINGBUF_TYPE_DATA:          Data record
 *                               If len is zero:
 *                                array[0] holds the actual length
- *                                array[1..(length+3)/4-1] holds data
+ *                                array[1..(length+3)/4] holds data
+ *                                size = 4 + 4 + length (bytes)
 *                               else
 *                                length = len << 2
- *                                array[0..(length+3)/4] holds data
+ *                                array[0..(length+3)/4-1] holds data
+ *                                size = 4 + length (bytes)
 */
 enum ring_buffer_type {
        RINGBUF_TYPE_PADDING,
@@ -116,12 +118,20 @@ void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu);
 unsigned long ring_buffer_entries(struct ring_buffer *buffer);
 unsigned long ring_buffer_overruns(struct ring_buffer *buffer);
+unsigned long ring_buffer_entries_cpu(struct ring_buffer *buffer, int cpu);
+unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu);
 u64 ring_buffer_time_stamp(int cpu);
 void ring_buffer_normalize_time_stamp(int cpu, u64 *ts);
 void tracing_on(void);
 void tracing_off(void);
+void tracing_off_permanent(void);
+void *ring_buffer_alloc_read_page(struct ring_buffer *buffer);
+void ring_buffer_free_read_page(struct ring_buffer *buffer, void *data);
+int ring_buffer_read_page(struct ring_buffer *buffer,
+                          void **data_page, int cpu, int full);
 enum ring_buffer_flags {
        RB_FL_OVERWRITE         = 1 << 0,
diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h
index 90987b7bcc1b..32c0547ffafc 100644
--- a/include/linux/rio_drv.h
+++ b/include/linux/rio_drv.h
@@ -427,9 +427,9 @@ void rio_dev_put(struct rio_dev *);
 * Get the unique RIO device identifier. Returns the device
 * identifier string.
 */
-static inline char *rio_name(struct rio_dev *rdev)
+static inline const char *rio_name(struct rio_dev *rdev)
 {
-        return rdev->dev.bus_id;
+        return dev_name(&rdev->dev);
 }
 /**
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 91f597ad6acc..4046b75563c1 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -145,6 +145,8 @@ struct rtc_class_ops {
        int (*irq_set_state)(struct device *, int enabled);
        int (*irq_set_freq)(struct device *, int freq);
        int (*read_callback)(struct device *, int data);
+        int (*alarm_irq_enable)(struct device *, unsigned int enabled);
+        int (*update_irq_enable)(struct device *, unsigned int enabled);
 };
 #define RTC_DEVICE_NAME_SIZE 20
@@ -181,7 +183,7 @@ struct rtc_device
        struct timer_list uie_timer;
        /* Those fields are protected by rtc->irq_lock */
        unsigned int oldsecs;
-        unsigned int irq_active:1;
+        unsigned int uie_irq_active:1;
        unsigned int stop_uie_polling:1;
        unsigned int uie_task_active:1;
        unsigned int uie_timer_active:1;
@@ -216,6 +218,10 @@ extern int rtc_irq_set_state(struct rtc_device *rtc,
                                struct rtc_task *task, int enabled);
 extern int rtc_irq_set_freq(struct rtc_device *rtc,
                                struct rtc_task *task, int freq);
+extern int rtc_update_irq_enable(struct rtc_device *rtc, unsigned int enabled);
+extern int rtc_alarm_irq_enable(struct rtc_device *rtc, unsigned int enabled);
+extern int rtc_dev_update_irq_enable_emul(struct rtc_device *rtc,
+                                                unsigned int enabled);
 typedef struct rtc_task {
        void (*func)(void *private_data);
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 2b3d51c6ec9c..e88f7058b3a1 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -107,6 +107,11 @@ enum {
        RTM_GETADDRLABEL,
 #define RTM_GETADDRLABEL RTM_GETADDRLABEL
+        RTM_GETDCB = 78,
+#define RTM_GETDCB RTM_GETDCB
+        RTM_SETDCB,
+#define RTM_SETDCB RTM_SETDCB
        __RTM_MAX,
 #define RTM_MAX         (((__RTM_MAX + 3) & ~3) - 1)
 };
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 55e30d114477..38a3f4b15394 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -96,6 +96,7 @@ struct exec_domain;
 struct futex_pi_state;
 struct robust_list_head;
 struct bio;
+struct bts_tracer;
 /*
 * List of flags we want to share for kernel threads,
@@ -249,7 +250,7 @@ extern void init_idle_bootup_task(struct task_struct *idle);
 extern int runqueue_is_locked(void);
 extern void task_rq_unlock_wait(struct task_struct *p);
-extern cpumask_t nohz_cpu_mask;
+extern cpumask_var_t nohz_cpu_mask;
 #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)
 extern int select_nohz_load_balancer(int cpu);
 #else
@@ -259,8 +260,6 @@ static inline int select_nohz_load_balancer(int cpu)
 }
 #endif
-extern unsigned long rt_needs_cpu(int cpu);
 /*
 * Only dump TASK_* tasks. (0 for all tasks)
 */
@@ -285,7 +284,6 @@ long io_schedule_timeout(long timeout);
 extern void cpu_init (void);
 extern void trap_init(void);
-extern void account_process_tick(struct task_struct *task, int user);
 extern void update_process_times(int user);
 extern void scheduler_tick(void);
@@ -572,12 +570,6 @@ struct signal_struct {
         */
        struct rlimit rlim[RLIM_NLIMITS];
-        /* keep the process-shared keyrings here so that they do the right
-         * thing in threads created with CLONE_THREAD */
-#ifdef CONFIG_KEYS
-        struct key *session_keyring;    /* keyring inherited over fork */
-        struct key *process_keyring;    /* keyring private to this process */
-#endif
 #ifdef CONFIG_BSD_PROCESS_ACCT
        struct pacct_struct pacct;      /* per-process accounting information */
 #endif
@@ -648,6 +640,7 @@ struct user_struct {
        /* Hash table maintenance information */
        struct hlist_node uidhash_node;
        uid_t uid;
+        struct user_namespace *user_ns;
 #ifdef CONFIG_USER_SCHED
        struct task_group *tg;
@@ -665,6 +658,7 @@ extern struct user_struct *find_user(uid_t);
 extern struct user_struct root_user;
 #define INIT_USER (&root_user)
 struct backing_dev_info;
 struct reclaim_state;
@@ -672,8 +666,7 @@ struct reclaim_state;
 struct sched_info {
        /* cumulative counters */
        unsigned long pcount;         /* # of times run on this cpu */
-        unsigned long long cpu_time,  /* time spent on the cpu */
+        unsigned long long run_delay; /* time spent waiting on a runqueue */
-                           run_delay; /* time spent waiting on a runqueue */
        /* timestamps */
        unsigned long long last_arrival,/* when we last ran on a cpu */
@@ -764,20 +757,51 @@ enum cpu_idle_type {
 #define SD_SERIALIZE            1024    /* Only a single load balancing instance */
 #define SD_WAKE_IDLE_FAR        2048    /* Gain latency sacrificing cache hit */
-#define BALANCE_FOR_MC_POWER    \
+enum powersavings_balance_level {
-        (sched_smt_power_savings ? SD_POWERSAVINGS_BALANCE : 0)
+        POWERSAVINGS_BALANCE_NONE = 0,  /* No power saving load balance */
+        POWERSAVINGS_BALANCE_BASIC,     /* Fill one thread/core/package
+                                         * first for long running threads
+                                         */
+        POWERSAVINGS_BALANCE_WAKEUP,    /* Also bias task wakeups to semi-idle
+                                         * cpu package for power savings
+                                         */
+        MAX_POWERSAVINGS_BALANCE_LEVELS
+};
+extern int sched_mc_power_savings, sched_smt_power_savings;
+static inline int sd_balance_for_mc_power(void)
+{
+        if (sched_smt_power_savings)
+                return SD_POWERSAVINGS_BALANCE;
-#define BALANCE_FOR_PKG_POWER   \
+        return 0;
-        ((sched_mc_power_savings || sched_smt_power_savings) ?  \
+}
-         SD_POWERSAVINGS_BALANCE : 0)
-#define test_sd_parent(sd, flag)        ((sd->parent &&         \
+static inline int sd_balance_for_package_power(void)
-                                         (sd->parent->flags & flag)) ? 1 : 0)
+{
+        if (sched_mc_power_savings | sched_smt_power_savings)
+                return SD_POWERSAVINGS_BALANCE;
+        return 0;
+}
+/*
+ * Optimise SD flags for power savings:
+ * SD_BALANCE_NEWIDLE helps agressive task consolidation and power savings.
+ * Keep default SD flags if sched_{smt,mc}_power_saving=0
+ */
+static inline int sd_power_saving_flags(void)
+{
+        if (sched_mc_power_savings | sched_smt_power_savings)
+                return SD_BALANCE_NEWIDLE;
+        return 0;
+}
 struct sched_group {
        struct sched_group *next;       /* Must be a circular list */
-        cpumask_t cpumask;
        /*
         * CPU power of this group, SCHED_LOAD_SCALE being max power for a
@@ -790,8 +814,15 @@ struct sched_group {
         * (see include/linux/reciprocal_div.h)
         */
        u32 reciprocal_cpu_power;
+        unsigned long cpumask[];
 };
+static inline struct cpumask *sched_group_cpus(struct sched_group *sg)
+{
+        return to_cpumask(sg->cpumask);
+}
 enum sched_domain_level {
        SD_LV_NONE = 0,
        SD_LV_SIBLING,
@@ -815,7 +846,6 @@ struct sched_domain {
        struct sched_domain *parent;    /* top domain must be null terminated */
        struct sched_domain *child;     /* bottom domain must be null terminated */
        struct sched_group *groups;     /* the balancing groups of the domain */
-        cpumask_t span;                 /* span of all CPUs in this domain */
        unsigned long min_interval;     /* Minimum balance interval ms */
        unsigned long max_interval;     /* Maximum balance interval ms */
        unsigned int busy_factor;       /* less balancing by factor if busy */
@@ -870,56 +900,42 @@ struct sched_domain {
 #ifdef CONFIG_SCHED_DEBUG
        char *name;
 #endif
+        /* span of all CPUs in this domain */
+        unsigned long span[];
 };
-extern void partition_sched_domains(int ndoms_new, cpumask_t *doms_new,
+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,
                                    struct sched_domain_attr *dattr_new);
 extern int arch_reinit_sched_domains(void);
+/* Test a flag in parent sched domain */
+static inline int test_sd_parent(struct sched_domain *sd, int flag)
+{
+        if (sd->parent && (sd->parent->flags & flag))
+                return 1;
+        return 0;
+}
 #else /* CONFIG_SMP */
 struct sched_domain_attr;
 static inline void
-partition_sched_domains(int ndoms_new, cpumask_t *doms_new,
+partition_sched_domains(int ndoms_new, struct cpumask *doms_new,
                        struct sched_domain_attr *dattr_new)
 {
 }
 #endif  /* !CONFIG_SMP */
 struct io_context;                      /* See blkdev.h */
-#define NGROUPS_SMALL           32
-#define NGROUPS_PER_BLOCK       ((unsigned int)(PAGE_SIZE / sizeof(gid_t)))
-struct group_info {
-        int ngroups;
-        atomic_t usage;
-        gid_t small_block[NGROUPS_SMALL];
-        int nblocks;
-        gid_t *blocks[0];
-};
-/*
- * get_group_info() must be called with the owning task locked (via task_lock())
- * when task != current.  The reason being that the vast majority of callers are
- * looking at current->group_info, which can not be changed except by the
- * current task.  Changing current->group_info requires the task lock, too.
- */
-#define get_group_info(group_info) do { \
-        atomic_inc(&(group_info)->usage); \
-} while (0)
-#define put_group_info(group_info) do { \
-        if (atomic_dec_and_test(&(group_info)->usage)) \
-                groups_free(group_info); \
-} while (0)
-extern struct group_info *groups_alloc(int gidsetsize);
-extern void groups_free(struct group_info *group_info);
-extern int set_current_groups(struct group_info *group_info);
-extern int groups_search(struct group_info *group_info, gid_t grp);
-/* access the groups "array" with this macro */
-#define GROUP_AT(gi, i) \
-    ((gi)->blocks[(i)/NGROUPS_PER_BLOCK][(i)%NGROUPS_PER_BLOCK])
 #ifdef ARCH_HAS_PREFETCH_SWITCH_STACK
 extern void prefetch_stack(struct task_struct *t);
@@ -963,7 +979,7 @@ struct sched_class {
        void (*task_wake_up) (struct rq *this_rq, struct task_struct *task);
        void (*set_cpus_allowed)(struct task_struct *p,
-                                 const cpumask_t *newmask);
+                                 const struct cpumask *newmask);
        void (*rq_online)(struct rq *rq);
        void (*rq_offline)(struct rq *rq);
@@ -1165,6 +1181,19 @@ struct task_struct {
        struct list_head ptraced;
        struct list_head ptrace_entry;
+#ifdef CONFIG_X86_PTRACE_BTS
+        /*
+         * This is the tracer handle for the ptrace BTS extension.
+         * This field actually belongs to the ptracer task.
+         */
+        struct bts_tracer *bts;
+        /*
+         * The buffer to hold the BTS data.
+         */
+        void *bts_buffer;
+        size_t bts_size;
+#endif /* CONFIG_X86_PTRACE_BTS */
        /* PID/PID hash table linkage. */
        struct pid_link pids[PIDTYPE_MAX];
        struct list_head thread_group;
@@ -1186,17 +1215,12 @@ struct task_struct {
        struct list_head cpu_timers[3];
 /* process credentials */
-        uid_t uid,euid,suid,fsuid;
+        const struct cred *real_cred;   /* objective and real subjective task
-        gid_t gid,egid,sgid,fsgid;
+                                         * credentials (COW) */
-        struct group_info *group_info;
+        const struct cred *cred;        /* effective (overridable) subjective task
-        kernel_cap_t   cap_effective, cap_inheritable, cap_permitted, cap_bset;
+                                         * credentials (COW) */
-        struct user_struct *user;
+        struct mutex cred_exec_mutex;   /* execve vs ptrace cred calculation mutex */
-        unsigned securebits;
-#ifdef CONFIG_KEYS
-        unsigned char jit_keyring;      /* default keyring to attach requested keys to */
-        struct key *request_key_auth;   /* assumed request_key authority */
-        struct key *thread_keyring;     /* keyring private to this thread */
-#endif
        char comm[TASK_COMM_LEN]; /* executable name excluding path
                                     - access with [gs]et_task_comm (which lock
                                       it with task_lock())
@@ -1233,9 +1257,6 @@ struct task_struct {
        int (*notifier)(void *priv);
        void *notifier_data;
        sigset_t *notifier_mask;
-#ifdef CONFIG_SECURITY
-        void *security;
-#endif
        struct audit_context *audit_context;
 #ifdef CONFIG_AUDITSYSCALL
        uid_t loginuid;
@@ -1356,6 +1377,23 @@ struct task_struct {
        unsigned long default_timer_slack_ns;
        struct list_head        *scm_work_list;
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+        /* Index of current stored adress in ret_stack */
+        int curr_ret_stack;
+        /* Stack of return addresses for return function tracing */
+        struct ftrace_ret_stack *ret_stack;
+        /*
+         * Number of functions that haven't been traced
+         * because of depth overrun.
+         */
+        atomic_t trace_overrun;
+        /* Pause for the tracing */
+        atomic_t tracing_graph_pause;
+#endif
+#ifdef CONFIG_TRACING
+        /* state flags for use by tracers */
+        unsigned long trace;
+#endif
 };
 /*
@@ -1594,12 +1632,12 @@ extern cputime_t task_gtime(struct task_struct *p);
 #ifdef CONFIG_SMP
 extern int set_cpus_allowed_ptr(struct task_struct *p,
-                                const cpumask_t *new_mask);
+                                const struct cpumask *new_mask);
 #else
 static inline int set_cpus_allowed_ptr(struct task_struct *p,
-                                       const cpumask_t *new_mask)
+                                       const struct cpumask *new_mask)
 {
-        if (!cpu_isset(0, *new_mask))
+        if (!cpumask_test_cpu(0, new_mask))
                return -EINVAL;
        return 0;
 }
@@ -1775,7 +1813,6 @@ static inline struct user_struct *get_uid(struct user_struct *u)
        return u;
 }
 extern void free_uid(struct user_struct *);
-extern void switch_uid(struct user_struct *);
 extern void release_uids(struct user_namespace *ns);
 #include <asm/current.h>
@@ -1794,9 +1831,6 @@ extern void wake_up_new_task(struct task_struct *tsk,
 extern void sched_fork(struct task_struct *p, int clone_flags);
 extern void sched_dead(struct task_struct *p);
-extern int in_group_p(gid_t);
-extern int in_egroup_p(gid_t);
 extern void proc_caches_init(void);
 extern void flush_signals(struct task_struct *);
 extern void ignore_signals(struct task_struct *);
@@ -1928,6 +1962,8 @@ static inline unsigned long wait_task_inactive(struct task_struct *p,
 #define for_each_process(p) \
        for (p = &init_task ; (p = next_task(p)) != &init_task ; )
+extern bool is_single_threaded(struct task_struct *);
 /*
 * Careful: do_each_thread/while_each_thread is a double loop so
 *          'break' will not work as expected - use goto instead.
@@ -2212,10 +2248,8 @@ __trace_special(void *__tr, void *__data,
 }
 #endif
-extern long sched_setaffinity(pid_t pid, const cpumask_t *new_mask);
+extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask);
-extern long sched_getaffinity(pid_t pid, cpumask_t *mask);
+extern long sched_getaffinity(pid_t pid, struct cpumask *mask);
-extern int sched_mc_power_savings, sched_smt_power_savings;
 extern void normalize_rt_tasks(void);
@@ -2224,6 +2258,7 @@ extern void normalize_rt_tasks(void);
 extern struct task_group init_task_group;
 #ifdef CONFIG_USER_SCHED
 extern struct task_group root_task_group;
+extern void set_tg_uid(struct user_struct *user);
 #endif
 extern struct task_group *sched_create_group(struct task_group *parent);
diff --git a/include/linux/securebits.h b/include/linux/securebits.h
index 92f09bdf1175..d2c5ed845bcc 100644
--- a/include/linux/securebits.h
+++ b/include/linux/securebits.h
@@ -32,7 +32,7 @@
   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->securebits)
+#define issecure(X)             (issecure_mask(X) & current_cred_xxx(securebits))
 #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 e3d4ecda2673..b92b5e453f64 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -37,6 +37,10 @@
 /* Maximum number of letters for an LSM name string */
 #define SECURITY_NAME_MAX       10
+/* If capable should audit the security request */
+#define SECURITY_CAP_NOAUDIT 0
+#define SECURITY_CAP_AUDIT 1
 struct ctl_table;
 struct audit_krule;
@@ -44,25 +48,25 @@ struct audit_krule;
 * These functions are in security/capability.c and are used
 * as the default capabilities functions
 */
-extern int cap_capable(struct task_struct *tsk, int cap);
+extern int cap_capable(struct task_struct *tsk, int cap, int audit);
 extern int cap_settime(struct timespec *ts, struct timezone *tz);
 extern int cap_ptrace_may_access(struct task_struct *child, unsigned int mode);
 extern int cap_ptrace_traceme(struct task_struct *parent);
 extern int cap_capget(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
-extern int cap_capset_check(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
+extern int cap_capset(struct cred *new, const struct cred *old,
-extern void cap_capset_set(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
+                      const kernel_cap_t *effective,
-extern int cap_bprm_set_security(struct linux_binprm *bprm);
+                      const kernel_cap_t *inheritable,
-extern void cap_bprm_apply_creds(struct linux_binprm *bprm, int unsafe);
+                      const kernel_cap_t *permitted);
+extern int cap_bprm_set_creds(struct linux_binprm *bprm);
 extern int cap_bprm_secureexec(struct linux_binprm *bprm);
 extern int cap_inode_setxattr(struct dentry *dentry, const char *name,
                              const void *value, size_t size, int flags);
 extern int cap_inode_removexattr(struct dentry *dentry, const char *name);
 extern int cap_inode_need_killpriv(struct dentry *dentry);
 extern int cap_inode_killpriv(struct dentry *dentry);
-extern int cap_task_post_setuid(uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags);
+extern int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags);
-extern void cap_task_reparent_to_init(struct task_struct *p);
 extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
-                          unsigned long arg4, unsigned long arg5, long *rc_p);
+                          unsigned long arg4, unsigned long arg5);
 extern int cap_task_setscheduler(struct task_struct *p, int policy, struct sched_param *lp);
 extern int cap_task_setioprio(struct task_struct *p, int ioprio);
 extern int cap_task_setnice(struct task_struct *p, int nice);
@@ -105,7 +109,7 @@ extern unsigned long mmap_min_addr;
 struct sched_param;
 struct request_sock;
-/* bprm_apply_creds unsafe reasons */
+/* bprm->unsafe reasons */
 #define LSM_UNSAFE_SHARE        1
 #define LSM_UNSAFE_PTRACE       2
 #define LSM_UNSAFE_PTRACE_CAP   4
@@ -149,36 +153,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *
 * Security hooks for program execution operations.
 *
- * @bprm_alloc_security:
+ * @bprm_set_creds:
- *      Allocate and attach a security structure to the @bprm->security field.
- *      The security field is initialized to NULL when the bprm structure is
- *      allocated.
- *      @bprm contains the linux_binprm structure to be modified.
- *      Return 0 if operation was successful.
- * @bprm_free_security:
- *      @bprm contains the linux_binprm structure to be modified.
- *      Deallocate and clear the @bprm->security field.
- * @bprm_apply_creds:
- *      Compute and set the security attributes of a process being transformed
- *      by an execve operation based on the old attributes (current->security)
- *      and the information saved in @bprm->security by the set_security hook.
- *      Since this hook function (and its caller) are void, this hook can not
- *      return an error.  However, it can leave the security attributes of the
- *      process unchanged if an access failure occurs at this point.
- *      bprm_apply_creds is called under task_lock.  @unsafe indicates various
- *      reasons why it may be unsafe to change security state.
- *      @bprm contains the linux_binprm structure.
- * @bprm_post_apply_creds:
- *      Runs after bprm_apply_creds with the task_lock dropped, so that
- *      functions which cannot be called safely under the task_lock can
- *      be used.  This hook is a good place to perform state changes on
- *      the process such as closing open file descriptors to which access
- *      is no longer granted if the attributes were changed.
- *      Note that a security module might need to save state between
- *      bprm_apply_creds and bprm_post_apply_creds to store the decision
- *      on whether the process may proceed.
- *      @bprm contains the linux_binprm structure.
- * @bprm_set_security:
 *      Save security information in the bprm->security field, typically based
 *      on information about the bprm->file, for later use by the apply_creds
 *      hook.  This hook may also optionally check permissions (e.g. for
@@ -191,15 +166,30 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @bprm contains the linux_binprm structure.
 *      Return 0 if the hook is successful and permission is granted.
 * @bprm_check_security:
- *      This hook mediates the point when a search for a binary handler will
+ *      This hook mediates the point when a search for a binary handler will
- *      begin.  It allows a check the @bprm->security value which is set in
+ *      begin.  It allows a check the @bprm->security value which is set in the
- *      the preceding set_security call.  The primary difference from
+ *      preceding set_creds call.  The primary difference from set_creds is
- *      set_security is that the argv list and envp list are reliably
+ *      that the argv list and envp list are reliably available in @bprm.  This
- *      available in @bprm.  This hook may be called multiple times
+ *      hook may be called multiple times during a single execve; and in each
- *      during a single execve; and in each pass set_security is called
+ *      pass set_creds is called first.
- *      first.
 *      @bprm contains the linux_binprm structure.
 *      Return 0 if the hook is successful and permission is granted.
+ * @bprm_committing_creds:
+ *      Prepare to install the new security attributes of a process being
+ *      transformed by an execve operation, based on the old credentials
+ *      pointed to by @current->cred and the information set in @bprm->cred by
+ *      the bprm_set_creds hook.  @bprm points to the linux_binprm structure.
+ *      This hook is a good place to perform state changes on the process such
+ *      as closing open file descriptors to which access will no longer be
+ *      granted when the attributes are changed.  This is called immediately
+ *      before commit_creds().
+ * @bprm_committed_creds:
+ *      Tidy up after the installation of the new security attributes of a
+ *      process being transformed by an execve operation.  The new credentials
+ *      have, by this point, been set to @current->cred.  @bprm points to the
+ *      linux_binprm structure.  This hook is a good place to perform state
+ *      changes on the process such as clearing out non-inheritable signal
+ *      state.  This is called immediately after commit_creds().
 * @bprm_secureexec:
 *      Return a boolean value (0 or 1) indicating whether a "secure exec"
 *      is required.  The flag is passed in the auxiliary table
@@ -345,17 +335,37 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @dir contains the inode structure of the parent directory of the new link.
 *      @new_dentry contains the dentry structure for the new link.
 *      Return 0 if permission is granted.
+ * @path_link:
+ *      Check permission before creating a new hard link to a file.
+ *      @old_dentry contains the dentry structure for an existing link
+ *      to the file.
+ *      @new_dir contains the path structure of the parent directory of
+ *      the new link.
+ *      @new_dentry contains the dentry structure for the new link.
+ *      Return 0 if permission is granted.
 * @inode_unlink:
 *      Check the permission to remove a hard link to a file.
 *      @dir contains the inode structure of parent directory of the file.
 *      @dentry contains the dentry structure for file to be unlinked.
 *      Return 0 if permission is granted.
+ * @path_unlink:
+ *      Check the permission to remove a hard link to a file.
+ *      @dir contains the path structure of parent directory of the file.
+ *      @dentry contains the dentry structure for file to be unlinked.
+ *      Return 0 if permission is granted.
 * @inode_symlink:
 *      Check the permission to create a symbolic link to a file.
 *      @dir contains the inode structure of parent directory of the symbolic link.
 *      @dentry contains the dentry structure of the symbolic link.
 *      @old_name contains the pathname of file.
 *      Return 0 if permission is granted.
+ * @path_symlink:
+ *      Check the permission to create a symbolic link to a file.
+ *      @dir contains the path structure of parent directory of
+ *      the symbolic link.
+ *      @dentry contains the dentry structure of the symbolic link.
+ *      @old_name contains the pathname of file.
+ *      Return 0 if permission is granted.
 * @inode_mkdir:
 *      Check permissions to create a new directory in the existing directory
 *      associated with inode strcture @dir.
@@ -363,11 +373,25 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @dentry contains the dentry structure of new directory.
 *      @mode contains the mode of new directory.
 *      Return 0 if permission is granted.
+ * @path_mkdir:
+ *      Check permissions to create a new directory in the existing directory
+ *      associated with path strcture @path.
+ *      @dir containst the path structure of parent of the directory
+ *      to be created.
+ *      @dentry contains the dentry structure of new directory.
+ *      @mode contains the mode of new directory.
+ *      Return 0 if permission is granted.
 * @inode_rmdir:
 *      Check the permission to remove a directory.
 *      @dir contains the inode structure of parent of the directory to be removed.
 *      @dentry contains the dentry structure of directory to be removed.
 *      Return 0 if permission is granted.
+ * @path_rmdir:
+ *      Check the permission to remove a directory.
+ *      @dir contains the path structure of parent of the directory to be
+ *      removed.
+ *      @dentry contains the dentry structure of directory to be removed.
+ *      Return 0 if permission is granted.
 * @inode_mknod:
 *      Check permissions when creating a special file (or a socket or a fifo
 *      file created via the mknod system call).  Note that if mknod operation
@@ -378,6 +402,15 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @mode contains the mode of the new file.
 *      @dev contains the device number.
 *      Return 0 if permission is granted.
+ * @path_mknod:
+ *      Check permissions when creating a file. Note that this hook is called
+ *      even if mknod operation is being done for a regular file.
+ *      @dir contains the path structure of parent of the new file.
+ *      @dentry contains the dentry structure of the new file.
+ *      @mode contains the mode of the new file.
+ *      @dev contains the undecoded device number. Use new_decode_dev() to get
+ *      the decoded device number.
+ *      Return 0 if permission is granted.
 * @inode_rename:
 *      Check for permission to rename a file or directory.
 *      @old_dir contains the inode structure for parent of the old link.
@@ -385,6 +418,13 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @new_dir contains the inode structure for parent of the new link.
 *      @new_dentry contains the dentry structure of the new link.
 *      Return 0 if permission is granted.
+ * @path_rename:
+ *      Check for permission to rename a file or directory.
+ *      @old_dir contains the path structure for parent of the old link.
+ *      @old_dentry contains the dentry structure of the old link.
+ *      @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.
 * @inode_readlink:
 *      Check the permission to read the symbolic link.
 *      @dentry contains the dentry structure for the file link.
@@ -413,6 +453,12 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @dentry contains the dentry structure for the file.
 *      @attr is the iattr structure containing the new file attributes.
 *      Return 0 if permission is granted.
+ * @path_truncate:
+ *      Check permission before truncating a file.
+ *      @path contains the path structure for the file.
+ *      @length is the new length of the file.
+ *      @time_attrs is the flags passed to do_truncate().
+ *      Return 0 if permission is granted.
 * @inode_getattr:
 *      Check permission before obtaining file attributes.
 *      @mnt is the vfsmount where the dentry was looked up
@@ -585,15 +631,31 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      manual page for definitions of the @clone_flags.
 *      @clone_flags contains the flags indicating what should be shared.
 *      Return 0 if permission is granted.
- * @task_alloc_security:
+ * @cred_free:
- *      @p contains the task_struct for child process.
+ *      @cred points to the credentials.
- *      Allocate and attach a security structure to the p->security field. The
+ *      Deallocate and clear the cred->security field in a set of credentials.
- *      security field is initialized to NULL when the task structure is
+ * @cred_prepare:
- *      allocated.
+ *      @new points to the new credentials.
- *      Return 0 if operation was successful.
+ *      @old points to the original credentials.
- * @task_free_security:
+ *      @gfp indicates the atomicity of any memory allocations.
- *      @p contains the task_struct for process.
+ *      Prepare a new set of credentials by copying the data from the old set.
- *      Deallocate and clear the p->security field.
+ * @cred_commit:
+ *      @new points to the new credentials.
+ *      @old points to the original credentials.
+ *      Install a new set of credentials.
+ * @kernel_act_as:
+ *      Set the credentials for a kernel service to act as (subjective context).
+ *      @new points to the credentials to be modified.
+ *      @secid specifies the security ID to be set
+ *      The current task must be the one that nominated @secid.
+ *      Return 0 if successful.
+ * @kernel_create_files_as:
+ *      Set the file creation context in a set of credentials to be the same as
+ *      the objective context of the specified inode.
+ *      @new points to the credentials to be modified.
+ *      @inode points to the inode to use as a reference.
+ *      The current task must be the one that nominated @inode.
+ *      Return 0 if successful.
 * @task_setuid:
 *      Check permission before setting one or more of the user identity
 *      attributes of the current process.  The @flags parameter indicates
@@ -606,15 +668,13 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @id2 contains a uid.
 *      @flags contains one of the LSM_SETID_* values.
 *      Return 0 if permission is granted.
- * @task_post_setuid:
+ * @task_fix_setuid:
 *      Update the module's state after setting one or more of the user
 *      identity attributes of the current process.  The @flags parameter
 *      indicates which of the set*uid system calls invoked this hook.  If
- *      @flags is LSM_SETID_FS, then @old_ruid is the old fs uid and the other
+ *      @new is the set of credentials that will be installed.  Modifications
- *      parameters are not used.
+ *      should be made to this rather than to @current->cred.
- *      @old_ruid contains the old real uid (or fs uid if LSM_SETID_FS).
+ *      @old is the set of credentials that are being replaces
- *      @old_euid contains the old effective uid (or -1 if LSM_SETID_FS).
- *      @old_suid contains the old saved uid (or -1 if LSM_SETID_FS).
 *      @flags contains one of the LSM_SETID_* values.
 *      Return 0 on success.
 * @task_setgid:
@@ -717,13 +777,8 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @arg3 contains a argument.
 *      @arg4 contains a argument.
 *      @arg5 contains a argument.
- *      @rc_p contains a pointer to communicate back the forced return code
+ *      Return -ENOSYS if no-one wanted to handle this op, any other value to
- *      Return 0 if permission is granted, and non-zero if the security module
+ *      cause prctl() to return immediately with that value.
- *      has taken responsibility (setting *rc_p) for the prctl call.
- * @task_reparent_to_init:
- *      Set the security attributes in @p->security for a kernel thread that
- *      is being reparented to the init task.
- *      @p contains the task_struct for the kernel thread.
 * @task_to_inode:
 *      Set the security attributes for an inode based on an associated task's
 *      security attributes, e.g. for /proc/pid inodes.
@@ -1000,7 +1055,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      See whether a specific operational right is granted to a process on a
 *      key.
 *      @key_ref refers to the key (key pointer + possession attribute bit).
- *      @context points to the process to provide the context against which to
+ *      @cred points to the credentials to provide the context against which to
 *      evaluate the security data on the key.
 *      @perm describes the combination of permissions required of this key.
 *      Return 1 if permission granted, 0 if permission denied and -ve it the
@@ -1162,6 +1217,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @child process.
 *      Security modules may also want to perform a process tracing check
 *      during an execve in the set_security or apply_creds hooks of
+ *      tracing check during an execve in the bprm_set_creds hook of
 *      binprm_security_ops if the process is being traced and its security
 *      attributes would be changed by the execve.
 *      @child contains the task_struct structure for the target process.
@@ -1185,29 +1241,15 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @inheritable contains the inheritable capability set.
 *      @permitted contains the permitted capability set.
 *      Return 0 if the capability sets were successfully obtained.
- * @capset_check:
+ * @capset:
- *      Check permission before setting the @effective, @inheritable, and
- *      @permitted capability sets for the @target process.
- *      Caveat:  @target is also set to current if a set of processes is
- *      specified (i.e. all processes other than current and init or a
- *      particular process group).  Hence, the capset_set hook may need to
- *      revalidate permission to the actual target process.
- *      @target contains the task_struct structure for target process.
- *      @effective contains the effective capability set.
- *      @inheritable contains the inheritable capability set.
- *      @permitted contains the permitted capability set.
- *      Return 0 if permission is granted.
- * @capset_set:
 *      Set the @effective, @inheritable, and @permitted capability sets for
- *      the @target process.  Since capset_check cannot always check permission
+ *      the current process.
- *      to the real @target process, this hook may also perform permission
+ *      @new contains the new credentials structure for target process.
- *      checking to determine if the current process is allowed to set the
+ *      @old contains the current credentials structure for target process.
- *      capability sets of the @target process.  However, this hook has no way
- *      of returning an error due to the structure of the sys_capset code.
- *      @target contains the task_struct structure for target process.
 *      @effective contains the effective capability set.
 *      @inheritable contains the inheritable capability set.
 *      @permitted contains the permitted capability set.
+ *      Return 0 and update @new if permission is granted.
 * @capable:
 *      Check whether the @tsk process has the @cap capability.
 *      @tsk contains the task_struct for the process.
@@ -1299,15 +1341,12 @@ struct security_operations {
        int (*capget) (struct task_struct *target,
                       kernel_cap_t *effective,
                       kernel_cap_t *inheritable, kernel_cap_t *permitted);
-        int (*capset_check) (struct task_struct *target,
+        int (*capset) (struct cred *new,
-                             kernel_cap_t *effective,
+                       const struct cred *old,
-                             kernel_cap_t *inheritable,
+                       const kernel_cap_t *effective,
-                             kernel_cap_t *permitted);
+                       const kernel_cap_t *inheritable,
-        void (*capset_set) (struct task_struct *target,
+                       const kernel_cap_t *permitted);
-                            kernel_cap_t *effective,
+        int (*capable) (struct task_struct *tsk, int cap, int audit);
-                            kernel_cap_t *inheritable,
-                            kernel_cap_t *permitted);
-        int (*capable) (struct task_struct *tsk, int cap);
        int (*acct) (struct file *file);
        int (*sysctl) (struct ctl_table *table, int op);
        int (*quotactl) (int cmds, int type, int id, struct super_block *sb);
@@ -1316,18 +1355,16 @@ struct security_operations {
        int (*settime) (struct timespec *ts, struct timezone *tz);
        int (*vm_enough_memory) (struct mm_struct *mm, long pages);
-        int (*bprm_alloc_security) (struct linux_binprm *bprm);
+        int (*bprm_set_creds) (struct linux_binprm *bprm);
-        void (*bprm_free_security) (struct linux_binprm *bprm);
-        void (*bprm_apply_creds) (struct linux_binprm *bprm, int unsafe);
-        void (*bprm_post_apply_creds) (struct linux_binprm *bprm);
-        int (*bprm_set_security) (struct linux_binprm *bprm);
        int (*bprm_check_security) (struct linux_binprm *bprm);
        int (*bprm_secureexec) (struct linux_binprm *bprm);
+        void (*bprm_committing_creds) (struct linux_binprm *bprm);
+        void (*bprm_committed_creds) (struct linux_binprm *bprm);
        int (*sb_alloc_security) (struct super_block *sb);
        void (*sb_free_security) (struct super_block *sb);
        int (*sb_copy_data) (char *orig, char *copy);
-        int (*sb_kern_mount) (struct super_block *sb, void *data);
+        int (*sb_kern_mount) (struct super_block *sb, int flags, void *data);
        int (*sb_show_options) (struct seq_file *m, struct super_block *sb);
        int (*sb_statfs) (struct dentry *dentry);
        int (*sb_mount) (char *dev_name, struct path *path,
@@ -1350,6 +1387,22 @@ struct security_operations {
                                   struct super_block *newsb);
        int (*sb_parse_opts_str) (char *options, struct security_mnt_opts *opts);
+#ifdef CONFIG_SECURITY_PATH
+        int (*path_unlink) (struct path *dir, struct dentry *dentry);
+        int (*path_mkdir) (struct path *dir, struct dentry *dentry, int mode);
+        int (*path_rmdir) (struct path *dir, struct dentry *dentry);
+        int (*path_mknod) (struct path *dir, struct dentry *dentry, int mode,
+                           unsigned int dev);
+        int (*path_truncate) (struct path *path, loff_t length,
+                              unsigned int time_attrs);
+        int (*path_symlink) (struct path *dir, struct dentry *dentry,
+                             const char *old_name);
+        int (*path_link) (struct dentry *old_dentry, struct path *new_dir,
+                          struct dentry *new_dentry);
+        int (*path_rename) (struct path *old_dir, struct dentry *old_dentry,
+                            struct path *new_dir, struct dentry *new_dentry);
+#endif
        int (*inode_alloc_security) (struct inode *inode);
        void (*inode_free_security) (struct inode *inode);
        int (*inode_init_security) (struct inode *inode, struct inode *dir,
@@ -1406,14 +1459,18 @@ struct security_operations {
        int (*file_send_sigiotask) (struct task_struct *tsk,
                                    struct fown_struct *fown, int sig);
        int (*file_receive) (struct file *file);
-        int (*dentry_open) (struct file *file);
+        int (*dentry_open) (struct file *file, const struct cred *cred);
        int (*task_create) (unsigned long clone_flags);
-        int (*task_alloc_security) (struct task_struct *p);
+        void (*cred_free) (struct cred *cred);
-        void (*task_free_security) (struct task_struct *p);
+        int (*cred_prepare)(struct cred *new, const struct cred *old,
+                            gfp_t gfp);
+        void (*cred_commit)(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 (*task_setuid) (uid_t id0, uid_t id1, uid_t id2, int flags);
-        int (*task_post_setuid) (uid_t old_ruid /* or fsuid */ ,
+        int (*task_fix_setuid) (struct cred *new, const struct cred *old,
-                                 uid_t old_euid, uid_t old_suid, int flags);
+                                int flags);
        int (*task_setgid) (gid_t id0, gid_t id1, gid_t id2, int flags);
        int (*task_setpgid) (struct task_struct *p, pid_t pgid);
        int (*task_getpgid) (struct task_struct *p);
@@ -1433,8 +1490,7 @@ struct security_operations {
        int (*task_wait) (struct task_struct *p);
        int (*task_prctl) (int option, unsigned long arg2,
                           unsigned long arg3, unsigned long arg4,
-                           unsigned long arg5, long *rc_p);
+                           unsigned long arg5);
-        void (*task_reparent_to_init) (struct task_struct *p);
        void (*task_to_inode) (struct task_struct *p, struct inode *inode);
        int (*ipc_permission) (struct kern_ipc_perm *ipcp, short flag);
@@ -1539,10 +1595,10 @@ struct security_operations {
        /* key management security hooks */
 #ifdef CONFIG_KEYS
-        int (*key_alloc) (struct key *key, struct task_struct *tsk, unsigned long flags);
+        int (*key_alloc) (struct key *key, const struct cred *cred, unsigned long flags);
        void (*key_free) (struct key *key);
        int (*key_permission) (key_ref_t key_ref,
-                               struct task_struct *context,
+                               const struct cred *cred,
                               key_perm_t perm);
        int (*key_getsecurity)(struct key *key, char **_buffer);
 #endif  /* CONFIG_KEYS */
@@ -1568,15 +1624,12 @@ int security_capget(struct task_struct *target,
                    kernel_cap_t *effective,
                    kernel_cap_t *inheritable,
                    kernel_cap_t *permitted);
-int security_capset_check(struct task_struct *target,
+int security_capset(struct cred *new, const struct cred *old,
-                          kernel_cap_t *effective,
+                    const kernel_cap_t *effective,
-                          kernel_cap_t *inheritable,
+                    const kernel_cap_t *inheritable,
-                          kernel_cap_t *permitted);
+                    const kernel_cap_t *permitted);
-void security_capset_set(struct task_struct *target,
-                         kernel_cap_t *effective,
-                         kernel_cap_t *inheritable,
-                         kernel_cap_t *permitted);
 int security_capable(struct task_struct *tsk, int cap);
+int security_capable_noaudit(struct task_struct *tsk, int cap);
 int security_acct(struct file *file);
 int security_sysctl(struct ctl_table *table, int op);
 int security_quotactl(int cmds, int type, int id, struct super_block *sb);
@@ -1586,17 +1639,15 @@ int security_settime(struct timespec *ts, struct timezone *tz);
 int security_vm_enough_memory(long pages);
 int security_vm_enough_memory_mm(struct mm_struct *mm, long pages);
 int security_vm_enough_memory_kern(long pages);
-int security_bprm_alloc(struct linux_binprm *bprm);
+int security_bprm_set_creds(struct linux_binprm *bprm);
-void security_bprm_free(struct linux_binprm *bprm);
-void security_bprm_apply_creds(struct linux_binprm *bprm, int unsafe);
-void security_bprm_post_apply_creds(struct linux_binprm *bprm);
-int security_bprm_set(struct linux_binprm *bprm);
 int security_bprm_check(struct linux_binprm *bprm);
+void security_bprm_committing_creds(struct linux_binprm *bprm);
+void security_bprm_committed_creds(struct linux_binprm *bprm);
 int security_bprm_secureexec(struct linux_binprm *bprm);
 int security_sb_alloc(struct super_block *sb);
 void security_sb_free(struct super_block *sb);
 int security_sb_copy_data(char *orig, char *copy);
-int security_sb_kern_mount(struct super_block *sb, void *data);
+int security_sb_kern_mount(struct super_block *sb, int flags, void *data);
 int security_sb_show_options(struct seq_file *m, struct super_block *sb);
 int security_sb_statfs(struct dentry *dentry);
 int security_sb_mount(char *dev_name, struct path *path,
@@ -1663,13 +1714,16 @@ int security_file_set_fowner(struct file *file);
 int security_file_send_sigiotask(struct task_struct *tsk,
                                 struct fown_struct *fown, int sig);
 int security_file_receive(struct file *file);
-int security_dentry_open(struct file *file);
+int security_dentry_open(struct file *file, const struct cred *cred);
 int security_task_create(unsigned long clone_flags);
-int security_task_alloc(struct task_struct *p);
+void security_cred_free(struct cred *cred);
-void security_task_free(struct task_struct *p);
+int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp);
+void security_commit_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_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags);
-int security_task_post_setuid(uid_t old_ruid, uid_t old_euid,
+int security_task_fix_setuid(struct cred *new, const struct cred *old,
-                              uid_t old_suid, int flags);
+                             int flags);
 int security_task_setgid(gid_t id0, gid_t id1, gid_t id2, int flags);
 int security_task_setpgid(struct task_struct *p, pid_t pgid);
 int security_task_getpgid(struct task_struct *p);
@@ -1688,8 +1742,7 @@ int security_task_kill(struct task_struct *p, struct siginfo *info,
                        int sig, u32 secid);
 int security_task_wait(struct task_struct *p);
 int security_task_prctl(int option, unsigned long arg2, unsigned long arg3,
-                         unsigned long arg4, unsigned long arg5, long *rc_p);
+                        unsigned long arg4, unsigned long arg5);
-void security_task_reparent_to_init(struct task_struct *p);
 void security_task_to_inode(struct task_struct *p, struct inode *inode);
 int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag);
 void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid);
@@ -1764,25 +1817,23 @@ static inline int security_capget(struct task_struct *target,
        return cap_capget(target, effective, inheritable, permitted);
 }
-static inline int security_capset_check(struct task_struct *target,
+static inline int security_capset(struct cred *new,
-                                         kernel_cap_t *effective,
+                                   const struct cred *old,
-                                         kernel_cap_t *inheritable,
+                                   const kernel_cap_t *effective,
-                                         kernel_cap_t *permitted)
+                                   const kernel_cap_t *inheritable,
+                                   const kernel_cap_t *permitted)
 {
-        return cap_capset_check(target, effective, inheritable, permitted);
+        return cap_capset(new, old, effective, inheritable, permitted);
 }
-static inline void security_capset_set(struct task_struct *target,
+static inline int security_capable(struct task_struct *tsk, int cap)
-                                        kernel_cap_t *effective,
-                                        kernel_cap_t *inheritable,
-                                        kernel_cap_t *permitted)
 {
-        cap_capset_set(target, effective, inheritable, permitted);
+        return cap_capable(tsk, cap, SECURITY_CAP_AUDIT);
 }
-static inline int security_capable(struct task_struct *tsk, int cap)
+static inline int security_capable_noaudit(struct task_struct *tsk, int cap)
 {
-        return cap_capable(tsk, cap);
+        return cap_capable(tsk, cap, SECURITY_CAP_NOAUDIT);
 }
 static inline int security_acct(struct file *file)
@@ -1835,32 +1886,22 @@ static inline int security_vm_enough_memory_kern(long pages)
        return cap_vm_enough_memory(current->mm, pages);
 }
-static inline int security_bprm_alloc(struct linux_binprm *bprm)
+static inline int security_bprm_set_creds(struct linux_binprm *bprm)
-{
-        return 0;
-}
-static inline void security_bprm_free(struct linux_binprm *bprm)
-{ }
-static inline void security_bprm_apply_creds(struct linux_binprm *bprm, int unsafe)
 {
-        cap_bprm_apply_creds(bprm, unsafe);
+        return cap_bprm_set_creds(bprm);
 }
-static inline void security_bprm_post_apply_creds(struct linux_binprm *bprm)
+static inline int security_bprm_check(struct linux_binprm *bprm)
 {
-        return;
+        return 0;
 }
-static inline int security_bprm_set(struct linux_binprm *bprm)
+static inline void security_bprm_committing_creds(struct linux_binprm *bprm)
 {
-        return cap_bprm_set_security(bprm);
 }
-static inline int security_bprm_check(struct linux_binprm *bprm)
+static inline void security_bprm_committed_creds(struct linux_binprm *bprm)
 {
-        return 0;
 }
 static inline int security_bprm_secureexec(struct linux_binprm *bprm)
@@ -1881,7 +1922,7 @@ static inline int security_sb_copy_data(char *orig, char *copy)
        return 0;
 }
-static inline int security_sb_kern_mount(struct super_block *sb, void *data)
+static inline int security_sb_kern_mount(struct super_block *sb, int flags, void *data)
 {
        return 0;
 }
@@ -2177,7 +2218,8 @@ static inline int security_file_receive(struct file *file)
        return 0;
 }
-static inline int security_dentry_open(struct file *file)
+static inline int security_dentry_open(struct file *file,
+                                       const struct cred *cred)
 {
        return 0;
 }
@@ -2187,13 +2229,31 @@ static inline int security_task_create(unsigned long clone_flags)
        return 0;
 }
-static inline int security_task_alloc(struct task_struct *p)
+static inline void security_cred_free(struct cred *cred)
+{ }
+static inline int security_prepare_creds(struct cred *new,
+                                         const struct cred *old,
+                                         gfp_t gfp)
 {
        return 0;
 }
-static inline void security_task_free(struct task_struct *p)
+static inline void security_commit_creds(struct cred *new,
-{ }
+                                         const struct cred *old)
+{
+}
+static inline int security_kernel_act_as(struct cred *cred, u32 secid)
+{
+        return 0;
+}
+static inline int security_kernel_create_files_as(struct cred *cred,
+                                                  struct inode *inode)
+{
+        return 0;
+}
 static inline int security_task_setuid(uid_t id0, uid_t id1, uid_t id2,
                                       int flags)
@@ -2201,10 +2261,11 @@ static inline int security_task_setuid(uid_t id0, uid_t id1, uid_t id2,
        return 0;
 }
-static inline int security_task_post_setuid(uid_t old_ruid, uid_t old_euid,
+static inline int security_task_fix_setuid(struct cred *new,
-                                            uid_t old_suid, int flags)
+                                           const struct cred *old,
+                                           int flags)
 {
-        return cap_task_post_setuid(old_ruid, old_euid, old_suid, flags);
+        return cap_task_fix_setuid(new, old, flags);
 }
 static inline int security_task_setgid(gid_t id0, gid_t id1, gid_t id2,
@@ -2291,14 +2352,9 @@ static inline int security_task_wait(struct task_struct *p)
 static inline int security_task_prctl(int option, unsigned long arg2,
                                      unsigned long arg3,
                                      unsigned long arg4,
-                                      unsigned long arg5, long *rc_p)
+                                      unsigned long arg5)
 {
-        return cap_task_prctl(option, arg2, arg3, arg3, arg5, rc_p);
+        return cap_task_prctl(option, arg2, arg3, arg3, arg5);
-}
-static inline void security_task_reparent_to_init(struct task_struct *p)
-{
-        cap_task_reparent_to_init(p);
 }
 static inline void security_task_to_inode(struct task_struct *p, struct inode *inode)
@@ -2721,19 +2777,84 @@ static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi
 #endif  /* CONFIG_SECURITY_NETWORK_XFRM */
+#ifdef CONFIG_SECURITY_PATH
+int security_path_unlink(struct path *dir, struct dentry *dentry);
+int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode);
+int security_path_rmdir(struct path *dir, struct dentry *dentry);
+int security_path_mknod(struct path *dir, struct dentry *dentry, int mode,
+                        unsigned int dev);
+int security_path_truncate(struct path *path, loff_t length,
+                           unsigned int time_attrs);
+int security_path_symlink(struct path *dir, struct dentry *dentry,
+                          const char *old_name);
+int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+                       struct dentry *new_dentry);
+int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+                         struct path *new_dir, struct dentry *new_dentry);
+#else   /* CONFIG_SECURITY_PATH */
+static inline int security_path_unlink(struct path *dir, struct dentry *dentry)
+{
+        return 0;
+}
+static inline int security_path_mkdir(struct path *dir, struct dentry *dentry,
+                                      int mode)
+{
+        return 0;
+}
+static inline int security_path_rmdir(struct path *dir, struct dentry *dentry)
+{
+        return 0;
+}
+static inline int security_path_mknod(struct path *dir, struct dentry *dentry,
+                                      int mode, unsigned int dev)
+{
+        return 0;
+}
+static inline int security_path_truncate(struct path *path, loff_t length,
+                                         unsigned int time_attrs)
+{
+        return 0;
+}
+static inline int security_path_symlink(struct path *dir, struct dentry *dentry,
+                                        const char *old_name)
+{
+        return 0;
+}
+static inline int security_path_link(struct dentry *old_dentry,
+                                     struct path *new_dir,
+                                     struct dentry *new_dentry)
+{
+        return 0;
+}
+static inline int security_path_rename(struct path *old_dir,
+                                       struct dentry *old_dentry,
+                                       struct path *new_dir,
+                                       struct dentry *new_dentry)
+{
+        return 0;
+}
+#endif  /* CONFIG_SECURITY_PATH */
 #ifdef CONFIG_KEYS
 #ifdef CONFIG_SECURITY
-int security_key_alloc(struct key *key, struct task_struct *tsk, unsigned long flags);
+int security_key_alloc(struct key *key, const struct cred *cred, unsigned long flags);
 void security_key_free(struct key *key);
 int security_key_permission(key_ref_t key_ref,
-                            struct task_struct *context, key_perm_t perm);
+                            const struct cred *cred, key_perm_t perm);
 int security_key_getsecurity(struct key *key, char **_buffer);
 #else
 static inline int security_key_alloc(struct key *key,
-                                     struct task_struct *tsk,
+                                     const struct cred *cred,
                                     unsigned long flags)
 {
        return 0;
@@ -2744,7 +2865,7 @@ static inline void security_key_free(struct key *key)
 }
 static inline int security_key_permission(key_ref_t key_ref,
-                                          struct task_struct *context,
+                                          const struct cred *cred,
                                          key_perm_t perm)
 {
        return 0;
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index dc50bcc282a8..40ea5058c2ec 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -34,6 +34,7 @@ struct seq_operations {
 #define SEQ_SKIP 1
+char *mangle_path(char *s, char *p, char *esc);
 int seq_open(struct file *, const struct seq_operations *);
 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
 loff_t seq_lseek(struct file *, loff_t, int);
@@ -49,10 +50,11 @@ int seq_path(struct seq_file *, struct path *, char *);
 int seq_dentry(struct seq_file *, struct dentry *, char *);
 int seq_path_root(struct seq_file *m, struct path *path, struct path *root,
                  char *esc);
-int seq_bitmap(struct seq_file *m, unsigned long *bits, unsigned int nr_bits);
+int seq_bitmap(struct seq_file *m, const unsigned long *bits,
-static inline int seq_cpumask(struct seq_file *m, cpumask_t *mask)
+                                   unsigned int nr_bits);
+static inline int seq_cpumask(struct seq_file *m, const struct cpumask *mask)
 {
-        return seq_bitmap(m, mask->bits, NR_CPUS);
+        return seq_bitmap(m, mask->bits, nr_cpu_ids);
 }
 static inline int seq_nodemask(struct seq_file *m, nodemask_t *mask)
diff --git a/include/linux/serial.h b/include/linux/serial.h
index 1ea8d9265bf6..9136cc5608c3 100644
--- a/include/linux/serial.h
+++ b/include/linux/serial.h
@@ -10,8 +10,9 @@
 #ifndef _LINUX_SERIAL_H
 #define _LINUX_SERIAL_H
-#ifdef __KERNEL__
 #include <linux/types.h>
+#ifdef __KERNEL__
 #include <asm/page.h>
 /*
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 3d37c94abbc8..d4d2a78ad43e 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -28,6 +28,9 @@ struct plat_serial8250_port {
        unsigned char   iotype;         /* UPIO_* */
        unsigned char   hub6;
        upf_t           flags;          /* UPF_* flags */
+        unsigned int    type;           /* If UPF_FIXED_TYPE */
+        unsigned int    (*serial_in)(struct uart_port *, int);
+        void            (*serial_out)(struct uart_port *, int, int);
 };
 /*
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 4e4f1277f3bf..b4199841f1fc 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -40,7 +40,8 @@
 #define PORT_NS16550A   14
 #define PORT_XSCALE     15
 #define PORT_RM9000     16      /* PMC-Sierra RM9xxx internal UART */
-#define PORT_MAX_8250   16      /* max port ID */
+#define PORT_OCTEON     17      /* Cavium OCTEON internal UART */
+#define PORT_MAX_8250   17      /* max port ID */
 /*
 * ARM specific type numbers.  These are not currently guaranteed
@@ -158,6 +159,8 @@
 /* SH-SCI */
 #define PORT_SCIFA      83
+#define PORT_S3C6400    84
 #ifdef __KERNEL__
 #include <linux/compiler.h>
@@ -246,6 +249,8 @@ struct uart_port {
        spinlock_t              lock;                   /* port lock */
        unsigned long           iobase;                 /* in/out[bwl] */
        unsigned char __iomem   *membase;               /* read/write[bwl] */
+        unsigned int            (*serial_in)(struct uart_port *, int);
+        void                    (*serial_out)(struct uart_port *, int, int);
        unsigned int            irq;                    /* irq number */
        unsigned int            uartclk;                /* base uart clock */
        unsigned int            fifosize;               /* tx fifo size */
@@ -291,6 +296,8 @@ struct uart_port {
 #define UPF_MAGIC_MULTIPLIER    ((__force upf_t) (1 << 16))
 #define UPF_CONS_FLOW           ((__force upf_t) (1 << 23))
 #define UPF_SHARE_IRQ           ((__force upf_t) (1 << 24))
+/* The exact UART type is known and should not be probed.  */
+#define UPF_FIXED_TYPE          ((__force upf_t) (1 << 27))
 #define UPF_BOOT_AUTOCONF       ((__force upf_t) (1 << 28))
 #define UPF_FIXED_PORT          ((__force upf_t) (1 << 29))
 #define UPF_DEAD                ((__force upf_t) (1 << 30))
@@ -314,35 +321,13 @@ struct uart_port {
 };
 /*
- * This is the state information which is persistent across opens.
- * The low level driver must not to touch any elements contained
- * within.
- */
-struct uart_state {
-        unsigned int            close_delay;            /* msec */
-        unsigned int            closing_wait;           /* msec */
-#define USF_CLOSING_WAIT_INF    (0)
-#define USF_CLOSING_WAIT_NONE   (~0U)
-        int                     count;
-        int                     pm_state;
-        struct uart_info        *info;
-        struct uart_port        *port;
-        struct mutex            mutex;
-};
-#define UART_XMIT_SIZE  PAGE_SIZE
-typedef unsigned int __bitwise__ uif_t;
-/*
 * This is the state information which is only valid when the port
- * is open; it may be freed by the core driver once the device has
+ * is open; it may be cleared the core driver once the device has
 * been closed.  Either the low level driver or the core can modify
 * stuff here.
 */
+typedef unsigned int __bitwise__ uif_t;
 struct uart_info {
        struct tty_port         port;
        struct circ_buf         xmit;
@@ -364,6 +349,29 @@ struct uart_info {
        wait_queue_head_t       delta_msr_wait;
 };
+/*
+ * This is the state information which is persistent across opens.
+ * The low level driver must not to touch any elements contained
+ * within.
+ */
+struct uart_state {
+        unsigned int            close_delay;            /* msec */
+        unsigned int            closing_wait;           /* msec */
+#define USF_CLOSING_WAIT_INF    (0)
+#define USF_CLOSING_WAIT_NONE   (~0U)
+        int                     count;
+        int                     pm_state;
+        struct uart_info        info;
+        struct uart_port        *port;
+        struct mutex            mutex;
+};
+#define UART_XMIT_SIZE  PAGE_SIZE
 /* number of characters left in xmit buffer before we ask for more */
 #define WAKEUP_CHARS            256
@@ -437,8 +445,13 @@ int uart_resume_port(struct uart_driver *reg, struct uart_port *port);
 #define uart_circ_chars_free(circ)      \
        (CIRC_SPACE((circ)->head, (circ)->tail, UART_XMIT_SIZE))
-#define uart_tx_stopped(portp)          \
+static inline int uart_tx_stopped(struct uart_port *port)
-        ((portp)->info->port.tty->stopped || (portp)->info->port.tty->hw_stopped)
+{
+        struct tty_struct *tty = port->info->port.tty;
+        if(tty->stopped || tty->hw_stopped)
+                return 1;
+        return 0;
+}
 /*
 * The following are helper functions for the low level drivers.
@@ -449,7 +462,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
 #ifdef SUPPORT_SYSRQ
        if (port->sysrq) {
                if (ch && time_before(jiffies, port->sysrq)) {
-                        handle_sysrq(ch, port->info ? port->info->port.tty : NULL);
+                        handle_sysrq(ch, port->info->port.tty);
                        port->sysrq = 0;
                        return 1;
                }
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 2725f4e5a9bf..cf2cb50f77d1 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -250,6 +250,9 @@ typedef unsigned char *sk_buff_data_t;
 *      @tc_verd: traffic control verdict
 *      @ndisc_nodetype: router type (from link layer)
 *      @do_not_encrypt: set to prevent encryption of this frame
+ *      @requeue: set to indicate that the wireless core should attempt
+ *              a software retry on this frame if we failed to
+ *              receive an ACK for it
 *      @dma_cookie: a cookie to one of several possible DMA operations
 *              done by skb DMA functions
 *      @secmark: security marking
@@ -269,8 +272,9 @@ struct sk_buff {
                struct  dst_entry       *dst;
                struct  rtable          *rtable;
        };
+#ifdef CONFIG_XFRM
        struct  sec_path        *sp;
+#endif
        /*
         * This is the control buffer. It is free to use for every
         * layer. Please put your private variables there. If you
@@ -325,6 +329,7 @@ struct sk_buff {
 #endif
 #if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
        __u8                    do_not_encrypt:1;
+        __u8                    requeue:1;
 #endif
        /* 0/13/14 bit hole */
@@ -488,6 +493,19 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
 }
 /**
+ *      skb_queue_is_first - check if skb is the first entry in the queue
+ *      @list: queue head
+ *      @skb: buffer
+ *
+ *      Returns true if @skb is the first buffer on the list.
+ */
+static inline bool skb_queue_is_first(const struct sk_buff_head *list,
+                                      const struct sk_buff *skb)
+{
+        return (skb->prev == (struct sk_buff *) list);
+}
+/**
 *      skb_queue_next - return the next packet in the queue
 *      @list: queue head
 *      @skb: current buffer
@@ -506,6 +524,24 @@ static inline struct sk_buff *skb_queue_next(const struct sk_buff_head *list,
 }
 /**
+ *      skb_queue_prev - return the prev packet in the queue
+ *      @list: queue head
+ *      @skb: current buffer
+ *
+ *      Return the prev packet in @list before @skb.  It is only valid to
+ *      call this if skb_queue_is_first() evaluates to false.
+ */
+static inline struct sk_buff *skb_queue_prev(const struct sk_buff_head *list,
+                                             const struct sk_buff *skb)
+{
+        /* This BUG_ON may seem severe, but if we just return then we
+         * are going to dereference garbage.
+         */
+        BUG_ON(skb_queue_is_first(list, skb));
+        return skb->prev;
+}
+/**
 *      skb_get - reference buffer
 *      @skb: buffer to reference
 *
@@ -1647,8 +1683,12 @@ extern int             skb_splice_bits(struct sk_buff *skb,
 extern void            skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to);
 extern void            skb_split(struct sk_buff *skb,
                                 struct sk_buff *skb1, const u32 len);
+extern int             skb_shift(struct sk_buff *tgt, struct sk_buff *skb,
+                                 int shiftlen);
 extern struct sk_buff *skb_segment(struct sk_buff *skb, int features);
+extern int             skb_gro_receive(struct sk_buff **head,
+                                       struct sk_buff *skb);
 static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
                                       int len, void *buffer)
@@ -1864,6 +1904,18 @@ static inline void skb_copy_queue_mapping(struct sk_buff *to, const struct sk_bu
        to->queue_mapping = from->queue_mapping;
 }
+#ifdef CONFIG_XFRM
+static inline struct sec_path *skb_sec_path(struct sk_buff *skb)
+{
+        return skb->sp;
+}
+#else
+static inline struct sec_path *skb_sec_path(struct sk_buff *skb)
+{
+        return NULL;
+}
+#endif
 static inline int skb_is_gso(const struct sk_buff *skb)
 {
        return skb_shinfo(skb)->gso_size;
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 000da12b5cf0..f96d13c281e8 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -253,9 +253,9 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
 * request comes from.
 */
 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB)
-extern void *__kmalloc_track_caller(size_t, gfp_t, void*);
+extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
 #define kmalloc_track_caller(size, flags) \
-        __kmalloc_track_caller(size, flags, __builtin_return_address(0))
+        __kmalloc_track_caller(size, flags, _RET_IP_)
 #else
 #define kmalloc_track_caller(size, flags) \
        __kmalloc(size, flags)
@@ -271,10 +271,10 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, void*);
 * allocation request comes from.
 */
 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB)
-extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, void *);
+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
 #define kmalloc_node_track_caller(size, flags, node) \
        __kmalloc_node_track_caller(size, flags, node, \
-                        __builtin_return_address(0))
+                        _RET_IP_)
 #else
 #define kmalloc_node_track_caller(size, flags, node) \
        __kmalloc_node(size, flags, node)
@@ -285,7 +285,7 @@ extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, void *);
 #define kmalloc_node_track_caller(size, flags, node) \
        kmalloc_track_caller(size, flags)
-#endif /* DEBUG_SLAB */
+#endif /* CONFIG_NUMA */
 /*
 * Shortcuts
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 3f9a60043a97..b82466968101 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -21,6 +21,9 @@ struct call_single_data {
        u16 priv;
 };
+/* total number of cpus in this system (may exceed NR_CPUS) */
+extern unsigned int total_cpus;
 #ifdef CONFIG_SMP
 #include <linux/preempt.h>
@@ -64,15 +67,16 @@ extern void smp_cpus_done(unsigned int max_cpus);
 * Call a function on all other processors
 */
 int smp_call_function(void(*func)(void *info), void *info, int wait);
-/* Deprecated: use smp_call_function_many() which uses a cpumask ptr. */
+void smp_call_function_many(const struct cpumask *mask,
-int smp_call_function_mask(cpumask_t mask, void(*func)(void *info), void *info,
+                            void (*func)(void *info), void *info, bool wait);
-                                int wait);
-static inline void smp_call_function_many(const struct cpumask *mask,
+/* Deprecated: Use smp_call_function_many which takes a pointer to the mask. */
-                                          void (*func)(void *info), void *info,
+static inline int
-                                          int wait)
+smp_call_function_mask(cpumask_t mask, void(*func)(void *info), void *info,
+                       int wait)
 {
-        smp_call_function_mask(*mask, func, info, wait);
+        smp_call_function_many(&mask, func, info, wait);
+        return 0;
 }
 int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
@@ -146,6 +150,8 @@ static inline void smp_send_reschedule(int cpu) { }
 })
 #define smp_call_function_mask(mask, func, info, wait) \
                        (up_smp_call_function(func, info))
+#define smp_call_function_many(mask, func, info, wait) \
+                        (up_smp_call_function(func, info))
 static inline void init_call_single_data(void)
 {
 }
diff --git a/include/linux/smsc911x.h b/include/linux/smsc911x.h
new file mode 100644
index 000000000000..1cbf0313adde
--- /dev/null
+++ b/include/linux/smsc911x.h
@@ -0,0 +1,47 @@
+/***************************************************************************
+ *
+ * Copyright (C) 2004-2008 SMSC
+ * Copyright (C) 2005-2008 ARM
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ ***************************************************************************/
+#ifndef __LINUX_SMSC911X_H__
+#define __LINUX_SMSC911X_H__
+#include <linux/phy.h>
+/* platform_device configuration data, should be assigned to
+ * the platform_device's dev.platform_data */
+struct smsc911x_platform_config {
+        unsigned int irq_polarity;
+        unsigned int irq_type;
+        unsigned int flags;
+        phy_interface_t phy_interface;
+};
+/* Constants for platform_device irq polarity configuration */
+#define SMSC911X_IRQ_POLARITY_ACTIVE_LOW        0
+#define SMSC911X_IRQ_POLARITY_ACTIVE_HIGH       1
+/* Constants for platform_device irq type configuration */
+#define SMSC911X_IRQ_TYPE_OPEN_DRAIN            0
+#define SMSC911X_IRQ_TYPE_PUSH_PULL             1
+/* Constants for flags */
+#define SMSC911X_USE_16BIT                      (BIT(0))
+#define SMSC911X_USE_32BIT                      (BIT(1))
+#endif /* __LINUX_SMSC911X_H__ */
diff --git a/include/linux/snmp.h b/include/linux/snmp.h
index 7a6e6bba4a71..aee3f1e1d1ce 100644
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
@@ -216,6 +216,9 @@ enum
        LINUX_MIB_TCPSPURIOUSRTOS,              /* TCPSpuriousRTOs */
        LINUX_MIB_TCPMD5NOTFOUND,               /* TCPMD5NotFound */
        LINUX_MIB_TCPMD5UNEXPECTED,             /* TCPMD5Unexpected */
+        LINUX_MIB_SACKSHIFTED,
+        LINUX_MIB_SACKMERGED,
+        LINUX_MIB_SACKSHIFTFALLBACK,
        __LINUX_MIB_MAX
 };
diff --git a/include/linux/spi/mmc_spi.h b/include/linux/spi/mmc_spi.h
index a3626aedaec9..0f4eb165f254 100644
--- a/include/linux/spi/mmc_spi.h
+++ b/include/linux/spi/mmc_spi.h
@@ -1,9 +1,10 @@
 #ifndef __LINUX_SPI_MMC_SPI_H
 #define __LINUX_SPI_MMC_SPI_H
+#include <linux/device.h>
+#include <linux/spi/spi.h>
 #include <linux/interrupt.h>
-struct device;
 struct mmc_host;
 /* Put this in platform_data of a device being used to manage an MMC/SD
@@ -41,4 +42,16 @@ struct mmc_spi_platform_data {
        void (*setpower)(struct device *, unsigned int maskval);
 };
+#ifdef CONFIG_OF
+extern struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi);
+extern void mmc_spi_put_pdata(struct spi_device *spi);
+#else
+static inline struct mmc_spi_platform_data *
+mmc_spi_get_pdata(struct spi_device *spi)
+{
+        return spi->dev.platform_data;
+}
+static inline void mmc_spi_put_pdata(struct spi_device *spi) {}
+#endif /* CONFIG_OF */
 #endif /* __LINUX_SPI_MMC_SPI_H */
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 4be01bb44377..82229317753d 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -19,6 +19,8 @@
 #ifndef __LINUX_SPI_H
 #define __LINUX_SPI_H
+#include <linux/device.h>
 /*
 * INTERFACES between SPI master-side drivers and SPI infrastructure.
 * (There's no SPI slave support for Linux yet...)
diff --git a/include/linux/stacktrace.h b/include/linux/stacktrace.h
index b106fd8e0d5c..1a8cecc4f38c 100644
--- a/include/linux/stacktrace.h
+++ b/include/linux/stacktrace.h
@@ -15,9 +15,17 @@ extern void save_stack_trace_tsk(struct task_struct *tsk,
                                struct stack_trace *trace);
 extern void print_stack_trace(struct stack_trace *trace, int spaces);
+#ifdef CONFIG_USER_STACKTRACE_SUPPORT
+extern void save_stack_trace_user(struct stack_trace *trace);
+#else
+# define save_stack_trace_user(trace)              do { } while (0)
+#endif
 #else
 # define save_stack_trace(trace)                        do { } while (0)
 # define save_stack_trace_tsk(tsk, trace)               do { } while (0)
+# define save_stack_trace_user(trace)                   do { } while (0)
 # define print_stack_trace(trace, spaces)               do { } while (0)
 #endif
diff --git a/include/linux/stop_machine.h b/include/linux/stop_machine.h
index faf1519b5adc..74d59a641362 100644
--- a/include/linux/stop_machine.h
+++ b/include/linux/stop_machine.h
@@ -23,7 +23,7 @@
 *
 * This can be thought of as a very heavy write lock, equivalent to
 * grabbing every spinlock in the kernel. */
-int stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus);
+int stop_machine(int (*fn)(void *), void *data, const struct cpumask *cpus);
 /**
 * __stop_machine: freeze the machine on all CPUs and run this function
@@ -34,11 +34,11 @@ int stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus);
 * Description: This is a special version of the above, which assumes cpus
 * won't come or go while it's being called.  Used by hotplug cpu.
 */
-int __stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus);
+int __stop_machine(int (*fn)(void *), void *data, const struct cpumask *cpus);
 #else
 static inline int stop_machine(int (*fn)(void *), void *data,
-                               const cpumask_t *cpus)
+                               const struct cpumask *cpus)
 {
        int ret;
        local_irq_disable();
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 6f0ee1b84a4f..c39a21040dcb 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -58,6 +58,7 @@ struct rpc_clnt {
        struct rpc_timeout      cl_timeout_default;
        struct rpc_program *    cl_program;
        char                    cl_inline_name[32];
+        char                    *cl_principal;  /* target to authenticate to */
 };
 /*
@@ -108,6 +109,7 @@ struct rpc_create_args {
        u32                     version;
        rpc_authflavor_t        authflavor;
        unsigned long           flags;
+        char                    *client_name;
 };
 /* Values for "flags" field */
diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
index 51b977a4ca20..cea764c2359f 100644
--- a/include/linux/sunrpc/rpc_pipe_fs.h
+++ b/include/linux/sunrpc/rpc_pipe_fs.h
@@ -15,6 +15,7 @@ struct rpc_pipe_ops {
        ssize_t (*upcall)(struct file *, struct rpc_pipe_msg *, char __user *, size_t);
        ssize_t (*downcall)(struct file *, const char __user *, size_t);
        void (*release_pipe)(struct inode *);
+        int (*open_pipe)(struct inode *);
        void (*destroy_msg)(struct rpc_pipe_msg *);
 };
diff --git a/include/linux/sunrpc/svc_xprt.h b/include/linux/sunrpc/svc_xprt.h
index 6fd7b016517f..0127daca4354 100644
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
@@ -139,14 +139,14 @@ static inline char *__svc_print_addr(struct sockaddr *addr,
 {
        switch (addr->sa_family) {
        case AF_INET:
-                snprintf(buf, len, "%u.%u.%u.%u, port=%u",
+                snprintf(buf, len, "%pI4, port=%u",
-                        NIPQUAD(((struct sockaddr_in *) addr)->sin_addr),
+                        &((struct sockaddr_in *)addr)->sin_addr,
                        ntohs(((struct sockaddr_in *) addr)->sin_port));
                break;
        case AF_INET6:
-                snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x, port=%u",
+                snprintf(buf, len, "%pI6, port=%u",
-                        NIP6(((struct sockaddr_in6 *) addr)->sin6_addr),
+                         &((struct sockaddr_in6 *)addr)->sin6_addr,
                        ntohs(((struct sockaddr_in6 *) addr)->sin6_port));
                break;
diff --git a/include/linux/sunrpc/svcauth_gss.h b/include/linux/sunrpc/svcauth_gss.h
index c9165d9771a8..ca7d725861fc 100644
--- a/include/linux/sunrpc/svcauth_gss.h
+++ b/include/linux/sunrpc/svcauth_gss.h
@@ -20,6 +20,7 @@ int gss_svc_init(void);
 void gss_svc_shutdown(void);
 int svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name);
 u32 svcauth_gss_flavor(struct auth_domain *dom);
+char *svc_gss_principal(struct svc_rqst *);
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SUNRPC_SVCAUTH_GSS_H */
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index e4057d729f03..49e1eb454465 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -37,21 +37,6 @@ struct xdr_netobj {
 typedef int     (*kxdrproc_t)(void *rqstp, __be32 *data, void *obj);
 /*
- * We're still requiring the BKL in the xdr code until it's been
- * more carefully audited, at which point this wrapper will become
- * unnecessary.
- */
-static inline int rpc_call_xdrproc(kxdrproc_t xdrproc, void *rqstp, __be32 *data, void *obj)
-{
-        int ret;
-        lock_kernel();
-        ret = xdrproc(rqstp, data, obj);
-        unlock_kernel();
-        return ret;
-}
-/*
 * Basic structure for transmission/reception of a client XDR message.
 * Features a header (for a linear buffer containing RPC headers
 * and the data payload for short messages), and then an array of
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 4d80a118d538..11fc71d50c1e 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -76,8 +76,7 @@ struct rpc_rqst {
        struct list_head        rq_list;
        __u32 *                 rq_buffer;      /* XDR encode buffer */
-        size_t                  rq_bufsize,
+        size_t                  rq_callsize,
-                                rq_callsize,
                                rq_rcvsize;
        struct xdr_buf          rq_private_buf;         /* The receive buffer
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index b18ec5533e8c..325af1de0351 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -7,9 +7,31 @@ struct device;
 struct dma_attrs;
 struct scatterlist;
+/*
+ * Maximum allowable number of contiguous slabs to map,
+ * must be a power of 2.  What is the appropriate value ?
+ * The complexity of {map,unmap}_single is linearly dependent on this value.
+ */
+#define IO_TLB_SEGSIZE  128
+/*
+ * log of the size of each IO TLB slab.  The number of slabs is command line
+ * controllable.
+ */
+#define IO_TLB_SHIFT 11
 extern void
 swiotlb_init(void);
+extern void *swiotlb_alloc_boot(size_t bytes, unsigned long nslabs);
+extern void *swiotlb_alloc(unsigned order, unsigned long nslabs);
+extern dma_addr_t swiotlb_phys_to_bus(phys_addr_t address);
+extern phys_addr_t swiotlb_bus_to_phys(dma_addr_t address);
+extern int swiotlb_arch_range_needs_mapping(void *ptr, size_t size);
 extern void
 *swiotlb_alloc_coherent(struct device *hwdev, size_t size,
                        dma_addr_t *dma_handle, gfp_t flags);
diff --git a/include/linux/threads.h b/include/linux/threads.h
index 38d1a5d6568e..052b12bec8bd 100644
--- a/include/linux/threads.h
+++ b/include/linux/threads.h
@@ -8,17 +8,17 @@
 */
 /*
- * Maximum supported processors that can run under SMP.  This value is
+ * Maximum supported processors.  Setting this smaller saves quite a
- * set via configure setting.  The maximum is equal to the size of the
+ * bit of memory.  Use nr_cpu_ids instead of this except for static bitmaps.
- * bitmasks used on that platform, i.e. 32 or 64.  Setting this smaller
- * saves quite a bit of memory.
 */
-#ifdef CONFIG_SMP
+#ifndef CONFIG_NR_CPUS
-#define NR_CPUS         CONFIG_NR_CPUS
+/* FIXME: This should be fixed in the arch's Kconfig */
-#else
+#define CONFIG_NR_CPUS  1
-#define NR_CPUS         1
 #endif
+/* Places which use this should consider cpumask_var_t. */
+#define NR_CPUS         CONFIG_NR_CPUS
 #define MIN_THREADS_LEFT_FOR_ROOT 4
 /*
diff --git a/include/linux/tick.h b/include/linux/tick.h
index b6ec8189ac0c..469b82d88b3b 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -84,10 +84,10 @@ static inline void tick_cancel_sched_timer(int cpu) { }
 # ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
 extern struct tick_device *tick_get_broadcast_device(void);
-extern cpumask_t *tick_get_broadcast_mask(void);
+extern struct cpumask *tick_get_broadcast_mask(void);
 #  ifdef CONFIG_TICK_ONESHOT
-extern cpumask_t *tick_get_broadcast_oneshot_mask(void);
+extern struct cpumask *tick_get_broadcast_oneshot_mask(void);
 #  endif
 # endif /* BROADCAST */
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 9007313b5b71..998a55d80acf 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -53,47 +53,11 @@
 #ifndef _LINUX_TIMEX_H
 #define _LINUX_TIMEX_H
-#include <linux/compiler.h>
 #include <linux/time.h>
-#include <asm/param.h>
 #define NTP_API         4       /* NTP API version */
 /*
- * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen
- * for a slightly underdamped convergence characteristic. SHIFT_KH
- * establishes the damping of the FLL and is chosen by wisdom and black
- * art.
- *
- * MAXTC establishes the maximum time constant of the PLL. With the
- * SHIFT_KG and SHIFT_KF values given and a time constant range from
- * zero to MAXTC, the PLL will converge in 15 minutes to 16 hours,
- * respectively.
- */
-#define SHIFT_PLL       4       /* PLL frequency factor (shift) */
-#define SHIFT_FLL       2       /* FLL frequency factor (shift) */
-#define MAXTC           10      /* maximum time constant (shift) */
-/*
- * SHIFT_USEC defines the scaling (shift) of the time_freq and
- * time_tolerance variables, which represent the current frequency
- * offset and maximum frequency tolerance.
- */
-#define SHIFT_USEC 16           /* frequency offset scale (shift) */
-#define PPM_SCALE (NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))
-#define PPM_SCALE_INV_SHIFT 19
-#define PPM_SCALE_INV ((1ll << (PPM_SCALE_INV_SHIFT + NTP_SCALE_SHIFT)) / \
-                       PPM_SCALE + 1)
-#define MAXPHASE 500000000l     /* max phase error (ns) */
-#define MAXFREQ 500000          /* max frequency error (ns/s) */
-#define MAXFREQ_SCALED ((s64)MAXFREQ << NTP_SCALE_SHIFT)
-#define MINSEC 256              /* min interval between updates (s) */
-#define MAXSEC 2048             /* max interval between updates (s) */
-#define NTP_PHASE_LIMIT ((MAXPHASE / NSEC_PER_USEC) << 5) /* beyond max. dispersion */
-/*
 * syscall interface - used (mainly by NTP daemon)
 * to discipline kernel clock oscillator
 */
@@ -199,9 +163,46 @@ struct timex {
 #define TIME_BAD        TIME_ERROR /* bw compat */
 #ifdef __KERNEL__
+#include <linux/compiler.h>
+#include <linux/types.h>
+#include <linux/param.h>
 #include <asm/timex.h>
 /*
+ * SHIFT_KG and SHIFT_KF establish the damping of the PLL and are chosen
+ * for a slightly underdamped convergence characteristic. SHIFT_KH
+ * establishes the damping of the FLL and is chosen by wisdom and black
+ * art.
+ *
+ * MAXTC establishes the maximum time constant of the PLL. With the
+ * SHIFT_KG and SHIFT_KF values given and a time constant range from
+ * zero to MAXTC, the PLL will converge in 15 minutes to 16 hours,
+ * respectively.
+ */
+#define SHIFT_PLL       4       /* PLL frequency factor (shift) */
+#define SHIFT_FLL       2       /* FLL frequency factor (shift) */
+#define MAXTC           10      /* maximum time constant (shift) */
+/*
+ * SHIFT_USEC defines the scaling (shift) of the time_freq and
+ * time_tolerance variables, which represent the current frequency
+ * offset and maximum frequency tolerance.
+ */
+#define SHIFT_USEC 16           /* frequency offset scale (shift) */
+#define PPM_SCALE (NSEC_PER_USEC << (NTP_SCALE_SHIFT - SHIFT_USEC))
+#define PPM_SCALE_INV_SHIFT 19
+#define PPM_SCALE_INV ((1ll << (PPM_SCALE_INV_SHIFT + NTP_SCALE_SHIFT)) / \
+                       PPM_SCALE + 1)
+#define MAXPHASE 500000000l     /* max phase error (ns) */
+#define MAXFREQ 500000          /* max frequency error (ns/s) */
+#define MAXFREQ_SCALED ((s64)MAXFREQ << NTP_SCALE_SHIFT)
+#define MINSEC 256              /* min interval between updates (s) */
+#define MAXSEC 2048             /* max interval between updates (s) */
+#define NTP_PHASE_LIMIT ((MAXPHASE / NSEC_PER_USEC) << 5) /* beyond max. dispersion */
+/*
 * kernel variables
 * Note: maximum error = NTP synch distance = dispersion + delay / 2;
 * estimated error = NTP dispersion.
diff --git a/include/linux/topology.h b/include/linux/topology.h
index 117f1b7405cf..e632d29f0544 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -49,7 +49,7 @@
        for_each_online_node(node)                      \
                if (nr_cpus_node(node))
-void arch_update_cpu_topology(void);
+int arch_update_cpu_topology(void);
 /* Conform to ACPI 2.0 SLIT distance definitions */
 #define LOCAL_DISTANCE          10
@@ -125,7 +125,8 @@ void arch_update_cpu_topology(void);
                                | SD_WAKE_AFFINE        \
                                | SD_WAKE_BALANCE       \
                                | SD_SHARE_PKG_RESOURCES\
-                                | BALANCE_FOR_MC_POWER, \
+                                | sd_balance_for_mc_power()\
+                                | sd_power_saving_flags(),\
        .last_balance           = jiffies,              \
        .balance_interval       = 1,                    \
 }
@@ -150,7 +151,8 @@ void arch_update_cpu_topology(void);
                                | SD_BALANCE_FORK       \
                                | SD_WAKE_AFFINE        \
                                | SD_WAKE_BALANCE       \
-                                | BALANCE_FOR_PKG_POWER,\
+                                | sd_balance_for_package_power()\
+                                | sd_power_saving_flags(),\
        .last_balance           = jiffies,              \
        .balance_interval       = 1,                    \
 }
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index c5bb39c7a770..757005458366 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -24,8 +24,12 @@ struct tracepoint {
        const char *name;               /* Tracepoint name */
        int state;                      /* State. */
        void **funcs;
-} __attribute__((aligned(8)));
+} __attribute__((aligned(32)));         /*
+                                         * Aligned on 32 bytes because it is
+                                         * globally visible and gcc happily
+                                         * align these on the structure size.
+                                         * Keep in sync with vmlinux.lds.h.
+                                         */
 #define TPPROTO(args...)        args
 #define TPARGS(args...)         args
@@ -40,14 +44,14 @@ struct tracepoint {
        do {                                                            \
                void **it_func;                                         \
                                                                        \
-                rcu_read_lock_sched();                                  \
+                rcu_read_lock_sched_notrace();                          \
                it_func = rcu_dereference((tp)->funcs);                 \
                if (it_func) {                                          \
                        do {                                            \
                                ((void(*)(proto))(*it_func))(args);     \
                        } while (*(++it_func));                         \
                }                                                       \
-                rcu_read_unlock_sched();                                \
+                rcu_read_unlock_sched_notrace();                        \
        } while (0)
 /*
@@ -55,35 +59,40 @@ struct tracepoint {
 * not add unwanted padding between the beginning of the section and the
 * structure. Force alignment to the same alignment as the section start.
 */
-#define DEFINE_TRACE(name, proto, args)                                 \
+#define DECLARE_TRACE(name, proto, args)                                \
+        extern struct tracepoint __tracepoint_##name;                   \
        static inline void trace_##name(proto)                          \
        {                                                               \
-                static const char __tpstrtab_##name[]                   \
-                __attribute__((section("__tracepoints_strings")))       \
-                = #name ":" #proto;                                     \
-                static struct tracepoint __tracepoint_##name            \
-                __attribute__((section("__tracepoints"), aligned(8))) = \
-                { __tpstrtab_##name, 0, NULL };                         \
                if (unlikely(__tracepoint_##name.state))                \
                        __DO_TRACE(&__tracepoint_##name,                \
                                TPPROTO(proto), TPARGS(args));          \
        }                                                               \
        static inline int register_trace_##name(void (*probe)(proto))   \
        {                                                               \
-                return tracepoint_probe_register(#name ":" #proto,      \
+                return tracepoint_probe_register(#name, (void *)probe); \
-                        (void *)probe);                                 \
        }                                                               \
-        static inline void unregister_trace_##name(void (*probe)(proto))\
+        static inline int unregister_trace_##name(void (*probe)(proto)) \
        {                                                               \
-                tracepoint_probe_unregister(#name ":" #proto,           \
+                return tracepoint_probe_unregister(#name, (void *)probe);\
-                        (void *)probe);                                 \
        }
+#define DEFINE_TRACE(name)                                              \
+        static const char __tpstrtab_##name[]                           \
+        __attribute__((section("__tracepoints_strings"))) = #name;      \
+        struct tracepoint __tracepoint_##name                           \
+        __attribute__((section("__tracepoints"), aligned(32))) =        \
+                { __tpstrtab_##name, 0, NULL }
+#define EXPORT_TRACEPOINT_SYMBOL_GPL(name)                              \
+        EXPORT_SYMBOL_GPL(__tracepoint_##name)
+#define EXPORT_TRACEPOINT_SYMBOL(name)                                  \
+        EXPORT_SYMBOL(__tracepoint_##name)
 extern void tracepoint_update_probe_range(struct tracepoint *begin,
        struct tracepoint *end);
 #else /* !CONFIG_TRACEPOINTS */
-#define DEFINE_TRACE(name, proto, args)                 \
+#define DECLARE_TRACE(name, proto, args)                                \
        static inline void _do_trace_##name(struct tracepoint *tp, proto) \
        { }                                                             \
        static inline void trace_##name(proto)                          \
@@ -92,8 +101,14 @@ extern void tracepoint_update_probe_range(struct tracepoint *begin,
        {                                                               \
                return -ENOSYS;                                         \
        }                                                               \
-        static inline void unregister_trace_##name(void (*probe)(proto))\
+        static inline int unregister_trace_##name(void (*probe)(proto)) \
-        { }
+        {                                                               \
+                return -ENOSYS;                                         \
+        }
+#define DEFINE_TRACE(name)
+#define EXPORT_TRACEPOINT_SYMBOL_GPL(name)
+#define EXPORT_TRACEPOINT_SYMBOL(name)
 static inline void tracepoint_update_probe_range(struct tracepoint *begin,
        struct tracepoint *end)
@@ -112,6 +127,10 @@ extern int tracepoint_probe_register(const char *name, void *probe);
 */
 extern int tracepoint_probe_unregister(const char *name, void *probe);
+extern int tracepoint_probe_register_noupdate(const char *name, void *probe);
+extern int tracepoint_probe_unregister_noupdate(const char *name, void *probe);
+extern void tracepoint_probe_update_all(void);
 struct tracepoint_iter {
        struct module *module;
        struct tracepoint *tracepoint;
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 3b8121d4e36f..fc39db95499f 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -180,8 +180,17 @@ struct signal_struct;
 * until a hangup so don't use the wrong path.
 */
+struct tty_port;
+struct tty_port_operations {
+        /* Return 1 if the carrier is raised */
+        int (*carrier_raised)(struct tty_port *port);
+        void (*raise_dtr_rts)(struct tty_port *port);
+};
+        
 struct tty_port {
        struct tty_struct       *tty;           /* Back pointer */
+        const struct tty_port_operations *ops;  /* Port operations */
        spinlock_t              lock;           /* Lock protecting tty field */
        int                     blocked_open;   /* Waiting to open */
        int                     count;          /* Usage count */
@@ -253,6 +262,7 @@ struct tty_struct {
        unsigned int column;
        unsigned char lnext:1, erasing:1, raw:1, real_raw:1, icanon:1;
        unsigned char closing:1;
+        unsigned char echo_overrun:1;
        unsigned short minimum_to_wake;
        unsigned long overrun_time;
        int num_overrun;
@@ -262,11 +272,16 @@ struct tty_struct {
        int read_tail;
        int read_cnt;
        unsigned long read_flags[N_TTY_BUF_SIZE/(8*sizeof(unsigned long))];
+        unsigned char *echo_buf;
+        unsigned int echo_pos;
+        unsigned int echo_cnt;
        int canon_data;
        unsigned long canon_head;
        unsigned int canon_column;
        struct mutex atomic_read_lock;
        struct mutex atomic_write_lock;
+        struct mutex output_lock;
+        struct mutex echo_lock;
        unsigned char *write_buf;
        int write_cnt;
        spinlock_t read_lock;
@@ -295,6 +310,7 @@ struct tty_struct {
 #define TTY_PUSH                6       /* n_tty private */
 #define TTY_CLOSING             7       /* ->close() in progress */
 #define TTY_LDISC               9       /* Line discipline attached */
+#define TTY_LDISC_CHANGING      10      /* Line discipline changing */
 #define TTY_HW_COOK_OUT         14      /* Hardware can do output cooking */
 #define TTY_HW_COOK_IN          15      /* Hardware can do input cooking */
 #define TTY_PTY_LOCK            16      /* pty private */
@@ -325,7 +341,7 @@ extern struct class *tty_class;
 *      go away
 */
-extern inline struct tty_struct *tty_kref_get(struct tty_struct *tty)
+static inline struct tty_struct *tty_kref_get(struct tty_struct *tty)
 {
        if (tty)
                kref_get(&tty->kref);
@@ -354,8 +370,7 @@ extern int tty_write_room(struct tty_struct *tty);
 extern void tty_driver_flush_buffer(struct tty_struct *tty);
 extern void tty_throttle(struct tty_struct *tty);
 extern void tty_unthrottle(struct tty_struct *tty);
-extern int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty,
+extern int tty_do_resize(struct tty_struct *tty, struct winsize *ws);
-                                                struct winsize *ws);
 extern void tty_shutdown(struct tty_struct *tty);
 extern void tty_free_termios(struct tty_struct *tty);
 extern int is_current_pgrp_orphaned(void);
@@ -421,6 +436,14 @@ extern int tty_port_alloc_xmit_buf(struct tty_port *port);
 extern void tty_port_free_xmit_buf(struct tty_port *port);
 extern struct tty_struct *tty_port_tty_get(struct tty_port *port);
 extern void tty_port_tty_set(struct tty_port *port, struct tty_struct *tty);
+extern int tty_port_carrier_raised(struct tty_port *port);
+extern void tty_port_raise_dtr_rts(struct tty_port *port);
+extern void tty_port_hangup(struct tty_port *port);
+extern int tty_port_block_til_ready(struct tty_port *port,
+                                struct tty_struct *tty, struct file *filp);
+extern int tty_port_close_start(struct tty_port *port,
+                                struct tty_struct *tty, struct file *filp);
+extern void tty_port_close_end(struct tty_port *port, struct tty_struct *tty);
 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
 extern int tty_unregister_ldisc(int disc);
@@ -442,6 +465,7 @@ extern void tty_audit_add_data(struct tty_struct *tty, unsigned char *data,
                               size_t size);
 extern void tty_audit_exit(void);
 extern void tty_audit_fork(struct signal_struct *sig);
+extern void tty_audit_tiocsti(struct tty_struct *tty, char ch);
 extern void tty_audit_push(struct tty_struct *tty);
 extern void tty_audit_push_task(struct task_struct *tsk,
                                        uid_t loginuid, u32 sessionid);
@@ -450,6 +474,9 @@ static inline void tty_audit_add_data(struct tty_struct *tty,
                                      unsigned char *data, size_t size)
 {
 }
+static inline void tty_audit_tiocsti(struct tty_struct *tty, char ch)
+{
+}
 static inline void tty_audit_exit(void)
 {
 }
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 78416b901589..08e088334dba 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -196,8 +196,7 @@
 *      Optional: If not provided then the write method is called under
 *      the atomic write lock to keep it serialized with the ldisc.
 *
- * int (*resize)(struct tty_struct *tty, struct tty_struct *real_tty,
+ * int (*resize)(struct tty_struct *tty, struct winsize *ws)
- *                              unsigned int rows, unsigned int cols);
 *
 *      Called when a termios request is issued which changes the
 *      requested terminal geometry.
@@ -258,8 +257,7 @@ struct tty_operations {
        int (*tiocmget)(struct tty_struct *tty, struct file *file);
        int (*tiocmset)(struct tty_struct *tty, struct file *file,
                        unsigned int set, unsigned int clear);
-        int (*resize)(struct tty_struct *tty, struct tty_struct *real_tty,
+        int (*resize)(struct tty_struct *tty, struct winsize *ws);
-                                struct winsize *ws);
        int (*set_termiox)(struct tty_struct *tty, struct termiox *tnew);
 #ifdef CONFIG_CONSOLE_POLL
        int (*poll_init)(struct tty_driver *driver, int line, char *options);
diff --git a/include/linux/types.h b/include/linux/types.h
index 1d98330b1f2c..121f349cb7ec 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -135,19 +135,14 @@ typedef		__s64		int64_t;
 *
 * Linux always considers sectors to be 512 bytes long independently
 * of the devices real block size.
+ *
+ * blkcnt_t is the type of the inode's block count.
 */
 #ifdef CONFIG_LBD
 typedef u64 sector_t;
-#else
-typedef unsigned long sector_t;
-#endif
-/*
- * The type of the inode's block count.
- */
-#ifdef CONFIG_LSF
 typedef u64 blkcnt_t;
 #else
+typedef unsigned long sector_t;
 typedef unsigned long blkcnt_t;
 #endif
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index fec6decfb983..6b58367d145e 100644
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -78,7 +78,7 @@ static inline unsigned long __copy_from_user_nocache(void *to,
                                                        \
                set_fs(KERNEL_DS);                      \
                pagefault_disable();                    \
-                ret = __get_user(retval, (__force typeof(retval) __user *)(addr));              \
+                ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval));            \
                pagefault_enable();                     \
                set_fs(old_fs);                         \
                ret;                                    \
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index 73a2f4eb1f7a..9b42baed3900 100644
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -158,8 +158,12 @@ struct usb_ctrlrequest {
 * (rarely) accepted by SET_DESCRIPTOR.
 *
 * Note that all multi-byte values here are encoded in little endian
- * byte order "on the wire".  But when exposed through Linux-USB APIs,
+ * byte order "on the wire".  Within the kernel and when exposed
- * they've been converted to cpu byte order.
+ * through the Linux-USB APIs, they are not converted to cpu byte
+ * order; it is the responsibility of the client code to do this.
+ * The single exception is when device and configuration descriptors (but
+ * not other descriptors) are read from usbfs (i.e. /proc/bus/usb/BBB/DDD);
+ * in this case the fields are converted to host endianness by the kernel.
 */
 /*
diff --git a/include/linux/usb/wusb-wa.h b/include/linux/usb/wusb-wa.h
index a102561e7026..fb7c359bdfba 100644
--- a/include/linux/usb/wusb-wa.h
+++ b/include/linux/usb/wusb-wa.h
@@ -51,6 +51,7 @@ enum {
        WUSB_REQ_GET_TIME       = 25,
        WUSB_REQ_SET_STREAM_IDX = 26,
        WUSB_REQ_SET_WUSB_MAS   = 27,
+        WUSB_REQ_CHAN_STOP      = 28,
 };
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index b5f41d4c2eec..315bcd375224 100644
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -12,7 +12,7 @@
 struct user_namespace {
        struct kref             kref;
        struct hlist_head       uidhash_table[UIDHASH_SZ];
-        struct user_struct      *root_user;
+        struct user_struct      *creator;
 };
 extern struct user_namespace init_user_ns;
@@ -26,8 +26,7 @@ static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
        return ns;
 }
-extern struct user_namespace *copy_user_ns(int flags,
+extern int create_user_ns(struct cred *new);
-                                           struct user_namespace *old_ns);
 extern void free_user_ns(struct kref *kref);
 static inline void put_user_ns(struct user_namespace *ns)
@@ -43,13 +42,9 @@ static inline struct user_namespace *get_user_ns(struct user_namespace *ns)
        return &init_user_ns;
 }
-static inline struct user_namespace *copy_user_ns(int flags,
+static inline int create_user_ns(struct cred *new)
-                                                  struct user_namespace *old_ns)
 {
-        if (flags & CLONE_NEWUSER)
+        return -EINVAL;
-                return ERR_PTR(-EINVAL);
-        return old_ns;
 }
 static inline void put_user_ns(struct user_namespace *ns)
diff --git a/include/linux/uwb.h b/include/linux/uwb.h
index f9ccbd9a2ced..c02128991ff7 100644
--- a/include/linux/uwb.h
+++ b/include/linux/uwb.h
@@ -30,6 +30,7 @@
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/timer.h>
+#include <linux/wait.h>
 #include <linux/workqueue.h>
 #include <linux/uwb/spec.h>
@@ -66,6 +67,7 @@ struct uwb_dev {
        struct uwb_dev_addr dev_addr;
        int beacon_slot;
        DECLARE_BITMAP(streams, UWB_NUM_STREAMS);
+        DECLARE_BITMAP(last_availability_bm, UWB_NUM_MAS);
 };
 #define to_uwb_dev(d) container_of(d, struct uwb_dev, dev)
@@ -86,12 +88,31 @@ struct uwb_notifs_chain {
        struct mutex mutex;
 };
+/* Beacon cache list */
+struct uwb_beca {
+        struct list_head list;
+        size_t entries;
+        struct mutex mutex;
+};
+/* Event handling thread. */
+struct uwbd {
+        int pid;
+        struct task_struct *task;
+        wait_queue_head_t wq;
+        struct list_head event_list;
+        spinlock_t event_list_lock;
+};
 /**
 * struct uwb_mas_bm - a bitmap of all MAS in a superframe
 * @bm: a bitmap of length #UWB_NUM_MAS
 */
 struct uwb_mas_bm {
        DECLARE_BITMAP(bm, UWB_NUM_MAS);
+        DECLARE_BITMAP(unsafe_bm, UWB_NUM_MAS);
+        int safe;
+        int unsafe;
 };
 /**
@@ -117,14 +138,24 @@ struct uwb_mas_bm {
 * FIXME: further target states TBD.
 */
 enum uwb_rsv_state {
-        UWB_RSV_STATE_NONE,
+        UWB_RSV_STATE_NONE = 0,
        UWB_RSV_STATE_O_INITIATED,
        UWB_RSV_STATE_O_PENDING,
        UWB_RSV_STATE_O_MODIFIED,
        UWB_RSV_STATE_O_ESTABLISHED,
+        UWB_RSV_STATE_O_TO_BE_MOVED,
+        UWB_RSV_STATE_O_MOVE_EXPANDING,
+        UWB_RSV_STATE_O_MOVE_COMBINING,
+        UWB_RSV_STATE_O_MOVE_REDUCING,
        UWB_RSV_STATE_T_ACCEPTED,
        UWB_RSV_STATE_T_DENIED,
+        UWB_RSV_STATE_T_CONFLICT,
        UWB_RSV_STATE_T_PENDING,
+        UWB_RSV_STATE_T_EXPANDING_ACCEPTED,
+        UWB_RSV_STATE_T_EXPANDING_CONFLICT,
+        UWB_RSV_STATE_T_EXPANDING_PENDING,
+        UWB_RSV_STATE_T_EXPANDING_DENIED,
+        UWB_RSV_STATE_T_RESIZED,
        UWB_RSV_STATE_LAST,
 };
@@ -149,6 +180,12 @@ struct uwb_rsv_target {
        };
 };
+struct uwb_rsv_move {
+        struct uwb_mas_bm final_mas;
+        struct uwb_ie_drp *companion_drp_ie;
+        struct uwb_mas_bm companion_mas;
+};
 /*
 * Number of streams reserved for reservations targeted at DevAddrs.
 */
@@ -186,6 +223,7 @@ typedef void (*uwb_rsv_cb_f)(struct uwb_rsv *rsv);
 *
 * @status:         negotiation status
 * @stream:         stream index allocated for this reservation
+ * @tiebreaker:     conflict tiebreaker for this reservation
 * @mas:            reserved MAS
 * @drp_ie:         the DRP IE
 * @ie_valid:       true iff the DRP IE matches the reservation parameters
@@ -201,25 +239,29 @@ struct uwb_rsv {
        struct uwb_rc *rc;
        struct list_head rc_node;
        struct list_head pal_node;
+        struct kref kref;
        struct uwb_dev *owner;
        struct uwb_rsv_target target;
        enum uwb_drp_type type;
        int max_mas;
        int min_mas;
-        int sparsity;
+        int max_interval;
        bool is_multicast;
        uwb_rsv_cb_f callback;
        void *pal_priv;
        enum uwb_rsv_state state;
+        bool needs_release_companion_mas;
        u8 stream;
+        u8 tiebreaker;
        struct uwb_mas_bm mas;
        struct uwb_ie_drp *drp_ie;
+        struct uwb_rsv_move mv;
        bool ie_valid;
        struct timer_list timer;
-        bool expired;
+        struct work_struct handle_timeout_work;
 };
 static const
@@ -261,6 +303,13 @@ struct uwb_drp_avail {
        bool ie_valid;
 };
+struct uwb_drp_backoff_win {
+        u8 window;
+        u8 n;
+        int total_expired;
+        struct timer_list timer;
+        bool can_reserve_extra_mases;
+};
 const char *uwb_rsv_state_str(enum uwb_rsv_state state);
 const char *uwb_rsv_type_str(enum uwb_drp_type type);
@@ -276,6 +325,8 @@ void uwb_rsv_terminate(struct uwb_rsv *rsv);
 void uwb_rsv_accept(struct uwb_rsv *rsv, uwb_rsv_cb_f cb, void *pal_priv);
+void uwb_rsv_get_usable_mas(struct uwb_rsv *orig_rsv, struct uwb_mas_bm *mas);
 /**
 * Radio Control Interface instance
 *
@@ -337,23 +388,33 @@ struct uwb_rc {
        u8 ctx_roll;
        int beaconing;                  /* Beaconing state [channel number] */
+        int beaconing_forced;
        int scanning;
        enum uwb_scan_type scan_type:3;
        unsigned ready:1;
        struct uwb_notifs_chain notifs_chain;
+        struct uwb_beca uwb_beca;
+        struct uwbd uwbd;
+        struct uwb_drp_backoff_win bow;
        struct uwb_drp_avail drp_avail;
        struct list_head reservations;
+        struct list_head cnflt_alien_list;
+        struct uwb_mas_bm cnflt_alien_bitmap;
        struct mutex rsvs_mutex;
+        spinlock_t rsvs_lock;
        struct workqueue_struct *rsv_workq;
-        struct work_struct rsv_update_work;
+        struct delayed_work rsv_update_work;
+        struct delayed_work rsv_alien_bp_work;
+        int set_drp_ie_pending;
        struct mutex ies_mutex;
        struct uwb_rc_cmd_set_ie *ies;
        size_t ies_capacity;
-        spinlock_t pal_lock;
        struct list_head pals;
+        int active_pals;
        struct uwb_dbg *dbg;
 };
@@ -361,11 +422,19 @@ struct uwb_rc {
 /**
 * struct uwb_pal - a UWB PAL
- * @name:    descriptive name for this PAL (wushc, wlp, etc.).
+ * @name:    descriptive name for this PAL (wusbhc, wlp, etc.).
 * @device:  a device for the PAL.  Used to link the PAL and the radio
 *           controller in sysfs.
+ * @rc:      the radio controller the PAL uses.
+ * @channel_changed: called when the channel used by the radio changes.
+ *           A channel of -1 means the channel has been stopped.
 * @new_rsv: called when a peer requests a reservation (may be NULL if
 *           the PAL cannot accept reservation requests).
+ * @channel: channel being used by the PAL; 0 if the PAL isn't using
+ *           the radio; -1 if the PAL wishes to use the radio but
+ *           cannot.
+ * @debugfs_dir: a debugfs directory which the PAL can use for its own
+ *           debugfs files.
 *
 * A Protocol Adaptation Layer (PAL) is a user of the WiMedia UWB
 * radio platform (e.g., WUSB, WLP or Bluetooth UWB AMP).
@@ -384,12 +453,21 @@ struct uwb_pal {
        struct list_head node;
        const char *name;
        struct device *device;
-        void (*new_rsv)(struct uwb_rsv *rsv);
+        struct uwb_rc *rc;
+        void (*channel_changed)(struct uwb_pal *pal, int channel);
+        void (*new_rsv)(struct uwb_pal *pal, struct uwb_rsv *rsv);
+        int channel;
+        struct dentry *debugfs_dir;
 };
 void uwb_pal_init(struct uwb_pal *pal);
-int uwb_pal_register(struct uwb_rc *rc, struct uwb_pal *pal);
+int uwb_pal_register(struct uwb_pal *pal);
-void uwb_pal_unregister(struct uwb_rc *rc, struct uwb_pal *pal);
+void uwb_pal_unregister(struct uwb_pal *pal);
+int uwb_radio_start(struct uwb_pal *pal);
+void uwb_radio_stop(struct uwb_pal *pal);
 /*
 * General public API
@@ -443,8 +521,6 @@ ssize_t uwb_rc_vcmd(struct uwb_rc *rc, const char *cmd_name,
                    struct uwb_rccb *cmd, size_t cmd_size,
                    u8 expected_type, u16 expected_event,
                    struct uwb_rceb **preply);
-ssize_t uwb_rc_get_ie(struct uwb_rc *, struct uwb_rc_evt_get_ie **);
-int uwb_bg_joined(struct uwb_rc *rc);
 size_t __uwb_addr_print(char *, size_t, const unsigned char *, int);
@@ -520,6 +596,8 @@ void uwb_rc_rm(struct uwb_rc *);
 void uwb_rc_neh_grok(struct uwb_rc *, void *, size_t);
 void uwb_rc_neh_error(struct uwb_rc *, int);
 void uwb_rc_reset_all(struct uwb_rc *rc);
+void uwb_rc_pre_reset(struct uwb_rc *rc);
+void uwb_rc_post_reset(struct uwb_rc *rc);
 /**
 * uwb_rsv_is_owner - is the owner of this reservation the RC?
@@ -531,7 +609,9 @@ static inline bool uwb_rsv_is_owner(struct uwb_rsv *rsv)
 }
 /**
- * Events generated by UWB that can be passed to any listeners
+ * enum uwb_notifs - UWB events that can be passed to any listeners
+ * @UWB_NOTIF_ONAIR: a new neighbour has joined the beacon group.
+ * @UWB_NOTIF_OFFAIR: a neighbour has left the beacon group.
 *
 * Higher layers can register callback functions with the radio
 * controller using uwb_notifs_register(). The radio controller
@@ -539,8 +619,6 @@ static inline bool uwb_rsv_is_owner(struct uwb_rsv *rsv)
 * nodes when an event occurs.
 */
 enum uwb_notifs {
-        UWB_NOTIF_BG_JOIN = 0,  /* radio controller joined a beacon group */
-        UWB_NOTIF_BG_LEAVE = 1, /* radio controller left a beacon group */
        UWB_NOTIF_ONAIR,
        UWB_NOTIF_OFFAIR,
 };
@@ -652,22 +730,9 @@ static inline int edc_inc(struct edc *err_hist, u16 max_err, u16 timeframe)
 /* Information Element handling */
-/* For representing the state of writing to a buffer when iterating */
-struct uwb_buf_ctx {
-        char *buf;
-        size_t bytes, size;
-};
-typedef int (*uwb_ie_f)(struct uwb_dev *, const struct uwb_ie_hdr *,
-                        size_t, void *);
 struct uwb_ie_hdr *uwb_ie_next(void **ptr, size_t *len);
-ssize_t uwb_ie_for_each(struct uwb_dev *uwb_dev, uwb_ie_f fn, void *data,
+int uwb_rc_ie_add(struct uwb_rc *uwb_rc, const struct uwb_ie_hdr *ies, size_t size);
-                        const void *buf, size_t size);
+int uwb_rc_ie_rm(struct uwb_rc *uwb_rc, enum uwb_ie element_id);
-int uwb_ie_dump_hex(struct uwb_dev *, const struct uwb_ie_hdr *,
-                    size_t, void *);
-int uwb_rc_set_ie(struct uwb_rc *, struct uwb_rc_cmd_set_ie *);
-struct uwb_ie_hdr *uwb_ie_next(void **ptr, size_t *len);
 /*
 * Transmission statistics
diff --git a/include/linux/uwb/debug-cmd.h b/include/linux/uwb/debug-cmd.h
index 1141f41bab5c..8da004e25628 100644
--- a/include/linux/uwb/debug-cmd.h
+++ b/include/linux/uwb/debug-cmd.h
@@ -32,6 +32,10 @@
 enum uwb_dbg_cmd_type {
        UWB_DBG_CMD_RSV_ESTABLISH = 1,
        UWB_DBG_CMD_RSV_TERMINATE = 2,
+        UWB_DBG_CMD_IE_ADD = 3,
+        UWB_DBG_CMD_IE_RM = 4,
+        UWB_DBG_CMD_RADIO_START = 5,
+        UWB_DBG_CMD_RADIO_STOP = 6,
 };
 struct uwb_dbg_cmd_rsv_establish {
@@ -39,18 +43,25 @@ struct uwb_dbg_cmd_rsv_establish {
        __u8  type;
        __u16 max_mas;
        __u16 min_mas;
-        __u8  sparsity;
+        __u8  max_interval;
 };
 struct uwb_dbg_cmd_rsv_terminate {
        int index;
 };
+struct uwb_dbg_cmd_ie {
+        __u8 data[128];
+        int len;
+};
 struct uwb_dbg_cmd {
        __u32 type;
        union {
                struct uwb_dbg_cmd_rsv_establish rsv_establish;
                struct uwb_dbg_cmd_rsv_terminate rsv_terminate;
+                struct uwb_dbg_cmd_ie ie_add;
+                struct uwb_dbg_cmd_ie ie_rm;
        };
 };
diff --git a/include/linux/uwb/debug.h b/include/linux/uwb/debug.h
deleted file mode 100644
index a86a73fe303f..000000000000
--- a/include/linux/uwb/debug.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Ultra Wide Band
- * Debug Support
- *
- * Copyright (C) 2005-2006 Intel Corporation
- * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.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 Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- *
- * FIXME: doc
- * Invoke like:
- *
- * #define D_LOCAL 4
- * #include <linux/uwb/debug.h>
- *
- * At the end of your include files.
- */
-#include <linux/types.h>
-struct device;
-extern void dump_bytes(struct device *dev, const void *_buf, size_t rsize);
-/* Master debug switch; !0 enables, 0 disables */
-#define D_MASTER (!0)
-/* Local (per-file) debug switch; #define before #including */
-#ifndef D_LOCAL
-#define D_LOCAL 0
-#endif
-#undef __d_printf
-#undef d_fnstart
-#undef d_fnend
-#undef d_printf
-#undef d_dump
-#define __d_printf(l, _tag, _dev, f, a...)                              \
-do {                                                                    \
-        struct device *__dev = (_dev);                                  \
-        if (D_MASTER && D_LOCAL >= (l)) {                               \
-                char __head[64] = "";                                   \
-                if (_dev != NULL) {                                     \
-                        if ((unsigned long)__dev < 4096)                \
-                                printk(KERN_ERR "E: Corrupt dev %p\n",  \
-                                        __dev);                         \
-                        else                                            \
-                                snprintf(__head, sizeof(__head),        \
-                                         "%s %s: ",                     \
-                                         dev_driver_string(__dev),      \
-                                         __dev->bus_id);                \
-                }                                                       \
-                printk(KERN_ERR "%s%s" _tag ": " f, __head,             \
-                        __func__, ## a);                                \
-        }                                                               \
-} while (0 && _dev)
-#define d_fnstart(l, _dev, f, a...)     \
-        __d_printf(l, " FNSTART", _dev, f, ## a)
-#define d_fnend(l, _dev, f, a...)       \
-        __d_printf(l, " FNEND", _dev, f, ## a)
-#define d_printf(l, _dev, f, a...)      \
-        __d_printf(l, "", _dev, f, ## a)
-#define d_dump(l, _dev, ptr, size)              \
-do {                                            \
-        struct device *__dev = _dev;            \
-        if (D_MASTER && D_LOCAL >= (l))         \
-                dump_bytes(__dev, ptr, size);   \
-} while (0 && _dev)
-#define d_test(l) (D_MASTER && D_LOCAL >= (l))
diff --git a/include/linux/uwb/spec.h b/include/linux/uwb/spec.h
index 198c15f8e251..b52e44f1bd33 100644
--- a/include/linux/uwb/spec.h
+++ b/include/linux/uwb/spec.h
@@ -59,6 +59,11 @@ enum { UWB_NUM_ZONES = 16 };
 #define UWB_MAS_PER_ZONE (UWB_NUM_MAS / UWB_NUM_ZONES)
 /*
+ * Number of MAS required before a row can be considered available.
+ */
+#define UWB_USABLE_MAS_PER_ROW (UWB_NUM_ZONES - 1)
+/*
 * Number of streams per DRP reservation between a pair of devices.
 *
 * [ECMA-368] section 16.8.6.
@@ -94,6 +99,26 @@ enum { UWB_BEACON_SLOT_LENGTH_US = 85 };
 enum { UWB_MAX_LOST_BEACONS = 3 };
 /*
+ * mDRPBackOffWinMin
+ *
+ * The minimum number of superframes to wait before trying to reserve
+ * extra MAS.
+ *
+ * [ECMA-368] section 17.16
+ */
+enum { UWB_DRP_BACKOFF_WIN_MIN = 2 };
+/*
+ * mDRPBackOffWinMax
+ *
+ * The maximum number of superframes to wait before trying to reserve
+ * extra MAS.
+ *
+ * [ECMA-368] section 17.16
+ */
+enum { UWB_DRP_BACKOFF_WIN_MAX = 16 };
+/*
 * Length of a superframe in microseconds.
 */
 #define UWB_SUPERFRAME_LENGTH_US (UWB_MAS_LENGTH_US * UWB_NUM_MAS)
@@ -200,6 +225,12 @@ enum uwb_drp_reason {
        UWB_DRP_REASON_MODIFIED,
 };
+/** Relinquish Request Reason Codes ([ECMA-368] table 113) */
+enum uwb_relinquish_req_reason {
+        UWB_RELINQUISH_REQ_REASON_NON_SPECIFIC = 0,
+        UWB_RELINQUISH_REQ_REASON_OVER_ALLOCATION,
+};
 /**
 *  DRP Notification Reason Codes (WHCI 0.95 [3.1.4.9])
 */
@@ -252,6 +283,7 @@ enum uwb_ie {
        UWB_APP_SPEC_PROBE_IE = 15,
        UWB_IDENTIFICATION_IE = 19,
        UWB_MASTER_KEY_ID_IE = 20,
+        UWB_RELINQUISH_REQUEST_IE = 21,
        UWB_IE_WLP = 250, /* WiMedia Logical Link Control Protocol WLP 0.99 */
        UWB_APP_SPEC_IE = 255,
 };
@@ -365,6 +397,27 @@ struct uwb_ie_drp_avail {
        DECLARE_BITMAP(bmp, UWB_NUM_MAS);
 } __attribute__((packed));
+/* Relinqish Request IE ([ECMA-368] section 16.8.19). */
+struct uwb_relinquish_request_ie {
+        struct uwb_ie_hdr       hdr;
+        __le16                  relinquish_req_control;
+        struct uwb_dev_addr     dev_addr;
+        struct uwb_drp_alloc    allocs[];
+} __attribute__((packed));
+static inline int uwb_ie_relinquish_req_reason_code(struct uwb_relinquish_request_ie *ie)
+{
+        return (le16_to_cpu(ie->relinquish_req_control) >> 0) & 0xf;
+}
+static inline void uwb_ie_relinquish_req_set_reason_code(struct uwb_relinquish_request_ie *ie,
+                                                         int reason_code)
+{
+        u16 ctrl = le16_to_cpu(ie->relinquish_req_control);
+        ctrl = (ctrl & ~(0xf << 0)) | (reason_code << 0);
+        ie->relinquish_req_control = cpu_to_le16(ctrl);
+}
 /**
 * The Vendor ID is set to an OUI that indicates the vendor of the device.
 * ECMA-368 [16.8.10]
diff --git a/include/linux/uwb/umc.h b/include/linux/uwb/umc.h
index 36a39e34f8d7..4b4fc0f43855 100644
--- a/include/linux/uwb/umc.h
+++ b/include/linux/uwb/umc.h
@@ -89,6 +89,8 @@ struct umc_driver {
        void (*remove)(struct umc_dev *);
        int  (*suspend)(struct umc_dev *, pm_message_t state);
        int  (*resume)(struct umc_dev *);
+        int  (*pre_reset)(struct umc_dev *);
+        int  (*post_reset)(struct umc_dev *);
        struct device_driver driver;
 };
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 4669d7e72e75..5571dbe1c0ad 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -293,6 +293,7 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
 #define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
 #define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
+#define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
 #define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
 #define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
 #define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
@@ -304,6 +305,8 @@ struct v4l2_pix_format {
 /* two planes -- one Y, one Cr + Cb interleaved  */
 #define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
 #define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
+#define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
+#define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
 /*  The following formats are not defined in the V4L2 specification */
 #define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
@@ -1050,7 +1053,7 @@ enum v4l2_mpeg_video_bitrate_mode {
 #define V4L2_CID_MPEG_VIDEO_MUTE                (V4L2_CID_MPEG_BASE+210)
 #define V4L2_CID_MPEG_VIDEO_MUTE_YUV            (V4L2_CID_MPEG_BASE+211)
-/*  MPEG-class control IDs specific to the CX2584x driver as defined by V4L2 */
+/*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
 #define V4L2_CID_MPEG_CX2341X_BASE                              (V4L2_CTRL_CLASS_MPEG | 0x1000)
 #define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE         (V4L2_CID_MPEG_CX2341X_BASE+0)
 enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
@@ -1117,6 +1120,12 @@ enum  v4l2_exposure_auto_type {
 #define V4L2_CID_FOCUS_RELATIVE                 (V4L2_CID_CAMERA_CLASS_BASE+11)
 #define V4L2_CID_FOCUS_AUTO                     (V4L2_CID_CAMERA_CLASS_BASE+12)
+#define V4L2_CID_ZOOM_ABSOLUTE                  (V4L2_CID_CAMERA_CLASS_BASE+13)
+#define V4L2_CID_ZOOM_RELATIVE                  (V4L2_CID_CAMERA_CLASS_BASE+14)
+#define V4L2_CID_ZOOM_CONTINUOUS                (V4L2_CID_CAMERA_CLASS_BASE+15)
+#define V4L2_CID_PRIVACY                        (V4L2_CID_CAMERA_CLASS_BASE+16)
 /*
 *      T U N I N G
 */
@@ -1361,24 +1370,41 @@ struct v4l2_streamparm {
 /*
 *      A D V A N C E D   D E B U G G I N G
 *
- *      NOTE: EXPERIMENTAL API
+ *      NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS!
+ *      FOR DEBUGGING, TESTING AND INTERNAL USE ONLY!
 */
 /* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
 #define V4L2_CHIP_MATCH_HOST       0  /* Match against chip ID on host (0 for the host) */
-#define V4L2_CHIP_MATCH_I2C_DRIVER 1  /* Match against I2C driver ID */
+#define V4L2_CHIP_MATCH_I2C_DRIVER 1  /* Match against I2C driver name */
 #define V4L2_CHIP_MATCH_I2C_ADDR   2  /* Match against I2C 7-bit address */
+#define V4L2_CHIP_MATCH_AC97       3  /* Match against anciliary AC97 chip */
+struct v4l2_dbg_match {
+        __u32 type; /* Match type */
+        union {     /* Match this chip, meaning determined by type */
+                __u32 addr;
+                char name[32];
+        };
+} __attribute__ ((packed));
-struct v4l2_register {
+struct v4l2_dbg_register {
-        __u32 match_type; /* Match type */
+        struct v4l2_dbg_match match;
-        __u32 match_chip; /* Match this chip, meaning determined by match_type */
+        __u32 size;     /* register size in bytes */
        __u64 reg;
        __u64 val;
-};
+} __attribute__ ((packed));
-/* VIDIOC_G_CHIP_IDENT */
+/* VIDIOC_DBG_G_CHIP_IDENT */
-struct v4l2_chip_ident {
+struct v4l2_dbg_chip_ident {
+        struct v4l2_dbg_match match;
+        __u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
+        __u32 revision;    /* chip revision, chip specific */
+} __attribute__ ((packed));
+/* VIDIOC_G_CHIP_IDENT_OLD: Deprecated, do not use */
+struct v4l2_chip_ident_old {
        __u32 match_type;  /* Match type */
        __u32 match_chip;  /* Match this chip, meaning determined by match_type */
        __u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
@@ -1450,14 +1476,25 @@ struct v4l2_chip_ident {
 #define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct v4l2_enc_idx)
 #define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct v4l2_encoder_cmd)
 #define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct v4l2_encoder_cmd)
+#endif
-/* Experimental, only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */
+#if 1
-#define VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_register)
+/* Experimental, meant for debugging, testing and internal use.
-#define VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_register)
+   Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
+   You must be root to use these ioctls. Never use these in applications! */
-#define VIDIOC_G_CHIP_IDENT     _IOWR('V', 81, struct v4l2_chip_ident)
+#define VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_dbg_register)
+#define VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_dbg_register)
+/* Experimental, meant for debugging, testing and internal use.
+   Never use this ioctl in applications! */
+#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
+/* This is deprecated and will go away in 2.6.30 */
+#define VIDIOC_G_CHIP_IDENT_OLD _IOWR('V', 81, struct v4l2_chip_ident_old)
 #endif
 #define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct v4l2_hw_freq_seek)
+/* Reminder: when adding new ioctls please add support for them to
+   drivers/media/video/v4l2-compat-ioctl32.c as well! */
 #ifdef __OLD_VIDIOC_
 /* for compatibility, will go away some day */
diff --git a/include/linux/virtio_balloon.h b/include/linux/virtio_balloon.h
index c30c7bfbf39b..8726ff77763e 100644
--- a/include/linux/virtio_balloon.h
+++ b/include/linux/virtio_balloon.h
@@ -10,6 +10,9 @@
 /* The feature bitmap for virtio balloon */
 #define VIRTIO_BALLOON_F_MUST_TELL_HOST 0 /* Tell before reclaiming pages */
+/* Size of a PFN in the balloon interface. */
+#define VIRTIO_BALLOON_PFN_SHIFT 12
 struct virtio_balloon_config
 {
        /* Number of pages host wants Guest to give up. */
diff --git a/include/linux/virtio_console.h b/include/linux/virtio_console.h
index 19a0da0dba41..7615ffcdd555 100644
--- a/include/linux/virtio_console.h
+++ b/include/linux/virtio_console.h
@@ -7,6 +7,17 @@
 /* The ID for virtio console */
 #define VIRTIO_ID_CONSOLE       3
+/* Feature bits */
+#define VIRTIO_CONSOLE_F_SIZE   0       /* Does host provide console size? */
+struct virtio_console_config {
+        /* colums of the screens */
+        __u16 cols;
+        /* rows of the screens */
+        __u16 rows;
+} __attribute__((packed));
 #ifdef __KERNEL__
 int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int));
 #endif /* __KERNEL__ */
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index 5e33761b9b8a..5cdd0aa8bde9 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -20,6 +20,7 @@
 #define VIRTIO_NET_F_HOST_TSO6  12      /* Host can handle TSOv6 in. */
 #define VIRTIO_NET_F_HOST_ECN   13      /* Host can handle TSO[6] w/ ECN in. */
 #define VIRTIO_NET_F_HOST_UFO   14      /* Host can handle UFO in. */
+#define VIRTIO_NET_F_MRG_RXBUF  15      /* Host can merge receive buffers. */
 struct virtio_net_config
 {
@@ -44,4 +45,12 @@ struct virtio_net_hdr
        __u16 csum_start;       /* Position to start checksumming from */
        __u16 csum_offset;      /* Offset after that to place checksum */
 };
+/* This is the version of the header to use when the MRG_RXBUF
+ * feature has been negotiated. */
+struct virtio_net_hdr_mrg_rxbuf {
+        struct virtio_net_hdr hdr;
+        __u16 num_buffers;      /* Number of merged rx buffers */
+};
 #endif /* _LINUX_VIRTIO_NET_H */
diff --git a/include/linux/virtio_pci.h b/include/linux/virtio_pci.h
index cdef35742932..cd0fd5d181a6 100644
--- a/include/linux/virtio_pci.h
+++ b/include/linux/virtio_pci.h
@@ -53,4 +53,12 @@
 /* Virtio ABI version, this must match exactly */
 #define VIRTIO_PCI_ABI_VERSION          0
+/* How many bits to shift physical queue address written to QUEUE_PFN.
+ * 12 is historical, and due to x86 page size. */
+#define VIRTIO_PCI_QUEUE_ADDR_SHIFT     12
+/* The alignment to use between consumer and producer parts of vring.
+ * x86 pagesize again. */
+#define VIRTIO_PCI_VRING_ALIGN          4096
 #endif
diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index c4a598fb3826..71e03722fb59 100644
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -83,7 +83,7 @@ struct vring {
 *      __u16 avail_idx;
 *      __u16 available[num];
 *
- *      // Padding to the next page boundary.
+ *      // Padding to the next align boundary.
 *      char pad[];
 *
 *      // A ring of used descriptor heads with free-running index.
@@ -93,19 +93,19 @@ struct vring {
 * };
 */
 static inline void vring_init(struct vring *vr, unsigned int num, void *p,
-                              unsigned long pagesize)
+                              unsigned long align)
 {
        vr->num = num;
        vr->desc = p;
        vr->avail = p + num*sizeof(struct vring_desc);
-        vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + pagesize-1)
+        vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + align-1)
-                            & ~(pagesize - 1));
+                            & ~(align - 1));
 }
-static inline unsigned vring_size(unsigned int num, unsigned long pagesize)
+static inline unsigned vring_size(unsigned int num, unsigned long align)
 {
        return ((sizeof(struct vring_desc) * num + sizeof(__u16) * (2 + num)
-                 + pagesize - 1) & ~(pagesize - 1))
+                 + align - 1) & ~(align - 1))
                + sizeof(__u16) * 2 + sizeof(struct vring_used_elem) * num;
 }
@@ -115,6 +115,7 @@ struct virtio_device;
 struct virtqueue;
 struct virtqueue *vring_new_virtqueue(unsigned int num,
+                                      unsigned int vring_align,
                                      struct virtio_device *vdev,
                                      void *pages,
                                      void (*notify)(struct virtqueue *vq),
diff --git a/include/linux/wlp.h b/include/linux/wlp.h
index 033545e145c7..ac95ce6606ac 100644
--- a/include/linux/wlp.h
+++ b/include/linux/wlp.h
@@ -646,6 +646,7 @@ struct wlp_wss {
 struct wlp {
        struct mutex mutex;
        struct uwb_rc *rc;              /* UWB radio controller */
+        struct net_device *ndev;
        struct uwb_pal pal;
        struct wlp_eda eda;
        struct wlp_uuid uuid;
@@ -675,7 +676,7 @@ struct wlp_wss_attribute {
 static struct wlp_wss_attribute wss_attr_##_name = __ATTR(_name, _mode, \
                                                          _show, _store)
-extern int wlp_setup(struct wlp *, struct uwb_rc *);
+extern int wlp_setup(struct wlp *, struct uwb_rc *, struct net_device *ndev);
 extern void wlp_remove(struct wlp *);
 extern ssize_t wlp_neighborhood_show(struct wlp *, char *);
 extern int wlp_wss_setup(struct net_device *, struct wlp_wss *);
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 4bc1e6b86cb2..52f3abd453a1 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -199,6 +199,9 @@ enum {
 #define XFRM_MSG_NEWSPDINFO XFRM_MSG_NEWSPDINFO
        XFRM_MSG_GETSPDINFO,
 #define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO
+        XFRM_MSG_MAPPING,
+#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING
        __XFRM_MSG_MAX
 };
 #define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1)
@@ -438,6 +441,15 @@ struct xfrm_user_migrate {
        __u16                           new_family;
 };
+struct xfrm_user_mapping {
+        struct xfrm_usersa_id           id;
+        __u32                           reqid;
+        xfrm_address_t                  old_saddr;
+        xfrm_address_t                  new_saddr;
+        __be16                          old_sport;
+        __be16                          new_sport;
+};
 #ifndef __KERNEL__
 /* backwards compatibility for userspace */
 #define XFRMGRP_ACQUIRE         1
@@ -464,6 +476,8 @@ enum xfrm_nlgroups {
 #define XFRMNLGRP_REPORT        XFRMNLGRP_REPORT
        XFRMNLGRP_MIGRATE,
 #define XFRMNLGRP_MIGRATE       XFRMNLGRP_MIGRATE
+        XFRMNLGRP_MAPPING,
+#define XFRMNLGRP_MAPPING       XFRMNLGRP_MAPPING
        __XFRMNLGRP_MAX
 };
 #define XFRMNLGRP_MAX   (__XFRMNLGRP_MAX - 1)
diff --git a/include/media/i2c-addr.h b/include/media/i2c-addr.h
index e7ff44a35ca0..5d0f56054d26 100644
--- a/include/media/i2c-addr.h
+++ b/include/media/i2c-addr.h
@@ -12,8 +12,6 @@
 /* bttv address list */
 #define I2C_ADDR_TSA5522        0xc2
 #define I2C_ADDR_TDA7432        0x8a
-#define I2C_ADDR_BT832_ALT1     0x88
-#define I2C_ADDR_BT832_ALT2     0x8a // alternate setting
 #define I2C_ADDR_TDA8425        0x82
 #define I2C_ADDR_TDA9840        0x84
 #define I2C_ADDR_TDA9850        0xb6 /* also used by 9855,9873 */
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 38f2d93c3957..5bf2ea00678c 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -157,6 +157,8 @@ extern IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_encore_enltv_fm53[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_real_audio_220_32_keys[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_msi_tvanywhere_plus[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_ati_tv_wonder_hd_600[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_kworld_plus_tv_analog[IR_KEYTAB_SIZE];
 #endif
 /*
diff --git a/include/media/ov772x.h b/include/media/ov772x.h
new file mode 100644
index 000000000000..e391d55edb95
--- /dev/null
+++ b/include/media/ov772x.h
@@ -0,0 +1,21 @@
+/* ov772x Camera
+ *
+ * Copyright (C) 2008 Renesas Solutions Corp.
+ * Kuninori Morimoto <morimoto.kuninori@renesas.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 __OV772X_H__
+#define __OV772X_H__
+#include <media/soc_camera.h>
+struct ov772x_camera_info {
+        unsigned long          buswidth;
+        struct soc_camera_link link;
+};
+#endif /* __OV772X_H__ */
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index 1d104096619c..c8d0b23fde29 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -177,9 +177,9 @@ struct saa7146_ext_vv
        int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
        struct saa7146_extension_ioctls *ioctls;
-        int (*ioctl)(struct saa7146_fh*, unsigned int cmd, void *arg);
+        long (*ioctl)(struct saa7146_fh *, unsigned int cmd, void *arg);
-        struct file_operations vbi_fops;
+        struct v4l2_file_operations vbi_fops;
 };
 struct saa7146_use_ops  {
@@ -216,8 +216,7 @@ void saa7146_set_gpio(struct saa7146_dev *saa, u8 pin, u8 data);
 extern struct saa7146_use_ops saa7146_video_uops;
 int saa7146_start_preview(struct saa7146_fh *fh);
 int saa7146_stop_preview(struct saa7146_fh *fh);
-int saa7146_video_do_ioctl(struct inode *inode, struct file *file,
+long saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg);
-                           unsigned int cmd, void *arg);
 /* from saa7146_vbi.c */
 extern struct saa7146_use_ops saa7146_vbi_uops;
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index c5de7bb19fda..7440d9250665 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -12,9 +12,10 @@
 #ifndef SOC_CAMERA_H
 #define SOC_CAMERA_H
+#include <linux/mutex.h>
+#include <linux/pm.h>
 #include <linux/videodev2.h>
 #include <media/videobuf-core.h>
-#include <linux/pm.h>
 struct soc_camera_device {
        struct list_head list;
@@ -36,14 +37,19 @@ struct soc_camera_device {
        unsigned char iface;            /* Host number */
        unsigned char devnum;           /* Device number per host */
        unsigned char buswidth;         /* See comment in .c */
+        struct soc_camera_sense *sense; /* See comment in struct definition */
        struct soc_camera_ops *ops;
        struct video_device *vdev;
        const struct soc_camera_data_format *current_fmt;
        const struct soc_camera_data_format *formats;
        int num_formats;
+        struct soc_camera_format_xlate *user_formats;
+        int num_user_formats;
        struct module *owner;
-        /* soc_camera.c private count. Only accessed with video_lock held */
+        void *host_priv;                /* Per-device host private data */
+        /* soc_camera.c private count. Only accessed with .video_lock held */
        int use_count;
+        struct mutex video_lock;        /* Protects device data */
 };
 struct soc_camera_file {
@@ -56,7 +62,7 @@ struct soc_camera_host {
        struct device dev;
        unsigned char nr;                               /* Host number */
        void *priv;
-        char *drv_name;
+        const char *drv_name;
        struct soc_camera_host_ops *ops;
 };
@@ -64,25 +70,33 @@ struct soc_camera_host_ops {
        struct module *owner;
        int (*add)(struct soc_camera_device *);
        void (*remove)(struct soc_camera_device *);
-        int (*suspend)(struct soc_camera_device *, pm_message_t state);
+        int (*suspend)(struct soc_camera_device *, pm_message_t);
        int (*resume)(struct soc_camera_device *);
-        int (*set_fmt_cap)(struct soc_camera_device *, __u32,
+        int (*get_formats)(struct soc_camera_device *, int,
-                           struct v4l2_rect *);
+                           struct soc_camera_format_xlate *);
-        int (*try_fmt_cap)(struct soc_camera_device *, struct v4l2_format *);
+        int (*set_fmt)(struct soc_camera_device *, __u32, struct v4l2_rect *);
+        int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
        void (*init_videobuf)(struct videobuf_queue *,
                              struct soc_camera_device *);
        int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *);
        int (*querycap)(struct soc_camera_host *, struct v4l2_capability *);
-        int (*try_bus_param)(struct soc_camera_device *, __u32);
        int (*set_bus_param)(struct soc_camera_device *, __u32);
        unsigned int (*poll)(struct file *, poll_table *);
 };
+#define SOCAM_SENSOR_INVERT_PCLK        (1 << 0)
+#define SOCAM_SENSOR_INVERT_MCLK        (1 << 1)
+#define SOCAM_SENSOR_INVERT_HSYNC       (1 << 2)
+#define SOCAM_SENSOR_INVERT_VSYNC       (1 << 3)
+#define SOCAM_SENSOR_INVERT_DATA        (1 << 4)
 struct soc_camera_link {
        /* Camera bus id, used to match a camera and a bus */
        int bus_id;
        /* GPIO number to switch between 8 and 10 bit modes */
        unsigned int gpio;
+        /* Per camera SOCAM_SENSOR_* bus flags */
+        unsigned long flags;
        /* Optional callbacks to power on or off and reset the sensor */
        int (*power)(struct device *, int);
        int (*reset)(struct device *);
@@ -106,13 +120,35 @@ extern void soc_camera_device_unregister(struct soc_camera_device *icd);
 extern int soc_camera_video_start(struct soc_camera_device *icd);
 extern void soc_camera_video_stop(struct soc_camera_device *icd);
+extern const struct soc_camera_data_format *soc_camera_format_by_fourcc(
+        struct soc_camera_device *icd, unsigned int fourcc);
+extern const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc(
+        struct soc_camera_device *icd, unsigned int fourcc);
 struct soc_camera_data_format {
-        char *name;
+        const char *name;
        unsigned int depth;
        __u32 fourcc;
        enum v4l2_colorspace colorspace;
 };
+/**
+ * struct soc_camera_format_xlate - match between host and sensor formats
+ * @cam_fmt: sensor format provided by the sensor
+ * @host_fmt: host format after host translation from cam_fmt
+ * @buswidth: bus width for this format
+ *
+ * Host and sensor translation structure. Used in table of host and sensor
+ * formats matchings in soc_camera_device. A host can override the generic list
+ * generation by implementing get_formats(), and use it for format checks and
+ * format setup.
+ */
+struct soc_camera_format_xlate {
+        const struct soc_camera_data_format *cam_fmt;
+        const struct soc_camera_data_format *host_fmt;
+        unsigned char buswidth;
+};
 struct soc_camera_ops {
        struct module *owner;
        int (*probe)(struct soc_camera_device *);
@@ -123,16 +159,17 @@ struct soc_camera_ops {
        int (*release)(struct soc_camera_device *);
        int (*start_capture)(struct soc_camera_device *);
        int (*stop_capture)(struct soc_camera_device *);
-        int (*set_fmt_cap)(struct soc_camera_device *, __u32,
+        int (*set_fmt)(struct soc_camera_device *, __u32, struct v4l2_rect *);
-                           struct v4l2_rect *);
+        int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
-        int (*try_fmt_cap)(struct soc_camera_device *, struct v4l2_format *);
        unsigned long (*query_bus_param)(struct soc_camera_device *);
        int (*set_bus_param)(struct soc_camera_device *, unsigned long);
        int (*get_chip_id)(struct soc_camera_device *,
-                           struct v4l2_chip_ident *);
+                           struct v4l2_dbg_chip_ident *);
+        int (*set_std)(struct soc_camera_device *, v4l2_std_id *);
+        int (*enum_input)(struct soc_camera_device *, struct v4l2_input *);
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-        int (*get_register)(struct soc_camera_device *, struct v4l2_register *);
+        int (*get_register)(struct soc_camera_device *, struct v4l2_dbg_register *);
-        int (*set_register)(struct soc_camera_device *, struct v4l2_register *);
+        int (*set_register)(struct soc_camera_device *, struct v4l2_dbg_register *);
 #endif
        int (*get_control)(struct soc_camera_device *, struct v4l2_control *);
        int (*set_control)(struct soc_camera_device *, struct v4l2_control *);
@@ -140,6 +177,32 @@ struct soc_camera_ops {
        int num_controls;
 };
+#define SOCAM_SENSE_PCLK_CHANGED        (1 << 0)
+/**
+ * This struct can be attached to struct soc_camera_device by the host driver
+ * to request sense from the camera, for example, when calling .set_fmt(). The
+ * host then can check which flags are set and verify respective values if any.
+ * For example, if SOCAM_SENSE_PCLK_CHANGED is set, it means, pixclock has
+ * changed during this operation. After completion the host should detach sense.
+ *
+ * @flags               ored SOCAM_SENSE_* flags
+ * @master_clock        if the host wants to be informed about pixel-clock
+ *                      change, it better set master_clock.
+ * @pixel_clock_max     maximum pixel clock frequency supported by the host,
+ *                      camera is not allowed to exceed this.
+ * @pixel_clock         if the camera driver changed pixel clock during this
+ *                      operation, it sets SOCAM_SENSE_PCLK_CHANGED, uses
+ *                      master_clock to calculate the new pixel-clock and
+ *                      sets this field.
+ */
+struct soc_camera_sense {
+        unsigned long flags;
+        unsigned long master_clock;
+        unsigned long pixel_clock_max;
+        unsigned long pixel_clock;
+};
 static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
        struct soc_camera_ops *ops, int id)
 {
@@ -158,15 +221,20 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
 #define SOCAM_HSYNC_ACTIVE_LOW          (1 << 3)
 #define SOCAM_VSYNC_ACTIVE_HIGH         (1 << 4)
 #define SOCAM_VSYNC_ACTIVE_LOW          (1 << 5)
-#define SOCAM_DATAWIDTH_8               (1 << 6)
+#define SOCAM_DATAWIDTH_4               (1 << 6)
-#define SOCAM_DATAWIDTH_9               (1 << 7)
+#define SOCAM_DATAWIDTH_8               (1 << 7)
-#define SOCAM_DATAWIDTH_10              (1 << 8)
+#define SOCAM_DATAWIDTH_9               (1 << 8)
-#define SOCAM_DATAWIDTH_16              (1 << 9)
+#define SOCAM_DATAWIDTH_10              (1 << 9)
-#define SOCAM_PCLK_SAMPLE_RISING        (1 << 10)
+#define SOCAM_DATAWIDTH_15              (1 << 10)
-#define SOCAM_PCLK_SAMPLE_FALLING       (1 << 11)
+#define SOCAM_DATAWIDTH_16              (1 << 11)
+#define SOCAM_PCLK_SAMPLE_RISING        (1 << 12)
+#define SOCAM_PCLK_SAMPLE_FALLING       (1 << 13)
+#define SOCAM_DATA_ACTIVE_HIGH          (1 << 14)
+#define SOCAM_DATA_ACTIVE_LOW           (1 << 15)
-#define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_9 | \
+#define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_4 | SOCAM_DATAWIDTH_8 | \
-                              SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_16)
+                              SOCAM_DATAWIDTH_9 | SOCAM_DATAWIDTH_10 | \
+                              SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_16)
 static inline unsigned long soc_camera_bus_param_compatible(
                        unsigned long camera_flags, unsigned long bus_flags)
@@ -182,4 +250,7 @@ static inline unsigned long soc_camera_bus_param_compatible(
        return (!hsync || !vsync || !pclk) ? 0 : common_flags;
 }
+extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
+                                                   unsigned long flags);
 #endif
diff --git a/include/media/tvp514x.h b/include/media/tvp514x.h
new file mode 100644
index 000000000000..5e7ee968c6dc
--- /dev/null
+++ b/include/media/tvp514x.h
@@ -0,0 +1,118 @@
+/*
+ * drivers/media/video/tvp514x.h
+ *
+ * Copyright (C) 2008 Texas Instruments Inc
+ * Author: Vaibhav Hiremath <hvaibhav@ti.com>
+ *
+ * Contributors:
+ *     Sivaraj R <sivaraj@ti.com>
+ *     Brijesh R Jadav <brijesh.j@ti.com>
+ *     Hardik Shah <hardik.shah@ti.com>
+ *     Manjunath Hadli <mrh@ti.com>
+ *     Karicheri Muralidharan <m-karicheri2@ti.com>
+ *
+ * This package 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#ifndef _TVP514X_H
+#define _TVP514X_H
+/*
+ * Other macros
+ */
+#define TVP514X_MODULE_NAME             "tvp514x"
+#define TVP514X_XCLK_BT656              (27000000)
+/* Number of pixels and number of lines per frame for different standards */
+#define NTSC_NUM_ACTIVE_PIXELS          (720)
+#define NTSC_NUM_ACTIVE_LINES           (480)
+#define PAL_NUM_ACTIVE_PIXELS           (720)
+#define PAL_NUM_ACTIVE_LINES            (576)
+/**
+ * enum tvp514x_input - enum for different decoder input pin
+ *              configuration.
+ */
+enum tvp514x_input {
+        /*
+         * CVBS input selection
+         */
+        INPUT_CVBS_VI1A = 0x0,
+        INPUT_CVBS_VI1B,
+        INPUT_CVBS_VI1C,
+        INPUT_CVBS_VI2A = 0x04,
+        INPUT_CVBS_VI2B,
+        INPUT_CVBS_VI2C,
+        INPUT_CVBS_VI3A = 0x08,
+        INPUT_CVBS_VI3B,
+        INPUT_CVBS_VI3C,
+        INPUT_CVBS_VI4A = 0x0C,
+        /*
+         * S-Video input selection
+         */
+        INPUT_SVIDEO_VI2A_VI1A = 0x44,
+        INPUT_SVIDEO_VI2B_VI1B,
+        INPUT_SVIDEO_VI2C_VI1C,
+        INPUT_SVIDEO_VI2A_VI3A = 0x54,
+        INPUT_SVIDEO_VI2B_VI3B,
+        INPUT_SVIDEO_VI2C_VI3C,
+        INPUT_SVIDEO_VI4A_VI1A = 0x4C,
+        INPUT_SVIDEO_VI4A_VI1B,
+        INPUT_SVIDEO_VI4A_VI1C,
+        INPUT_SVIDEO_VI4A_VI3A = 0x5C,
+        INPUT_SVIDEO_VI4A_VI3B,
+        INPUT_SVIDEO_VI4A_VI3C,
+        /* Need to add entries for
+         * RGB, YPbPr and SCART.
+         */
+        INPUT_INVALID
+};
+/**
+ * enum tvp514x_output - enum for output format
+ *                      supported.
+ *
+ */
+enum tvp514x_output {
+        OUTPUT_10BIT_422_EMBEDDED_SYNC = 0,
+        OUTPUT_20BIT_422_SEPERATE_SYNC,
+        OUTPUT_10BIT_422_SEPERATE_SYNC = 3,
+        OUTPUT_INVALID
+};
+/**
+ * struct tvp514x_platform_data - Platform data values and access functions.
+ * @power_set: Power state access function, zero is off, non-zero is on.
+ * @ifparm: Interface parameters access function.
+ * @priv_data_set: Device private data (pointer) access function.
+ * @clk_polarity: Clock polarity of the current interface.
+ * @ hs_polarity: HSYNC Polarity configuration for current interface.
+ * @ vs_polarity: VSYNC Polarity configuration for current interface.
+ */
+struct tvp514x_platform_data {
+        char *master;
+        int (*power_set) (enum v4l2_power on);
+        int (*ifparm) (struct v4l2_ifparm *p);
+        int (*priv_data_set) (void *);
+        /* Interface control params */
+        bool clk_polarity;
+        bool hs_polarity;
+        bool vs_polarity;
+};
+#endif                          /* ifndef _TVP514X_H */
diff --git a/include/media/tw9910.h b/include/media/tw9910.h
new file mode 100644
index 000000000000..73231e7880d8
--- /dev/null
+++ b/include/media/tw9910.h
@@ -0,0 +1,39 @@
+/*
+ * tw9910 Driver header
+ *
+ * Copyright (C) 2008 Renesas Solutions Corp.
+ * Kuninori Morimoto <morimoto.kuninori@renesas.com>
+ *
+ * Based on ov772x.h
+ *
+ * Copyright (C) Kuninori Morimoto <morimoto.kuninori@renesas.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 __TW9910_H__
+#define __TW9910_H__
+#include <media/soc_camera.h>
+enum tw9910_mpout_pin {
+        TW9910_MPO_VLOSS,
+        TW9910_MPO_HLOCK,
+        TW9910_MPO_SLOCK,
+        TW9910_MPO_VLOCK,
+        TW9910_MPO_MONO,
+        TW9910_MPO_DET50,
+        TW9910_MPO_FIELD,
+        TW9910_MPO_RTCO,
+};
+struct tw9910_video_info {
+        unsigned long          buswidth;
+        enum tw9910_mpout_pin  mpout;
+        struct soc_camera_link link;
+};
+#endif /* __TW9910_H__ */
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index d73a8e9028a5..9aaf652b20ef 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -2,7 +2,7 @@
    v4l2 chip identifiers header
    This header provides a list of chip identifiers that can be returned
-    through the VIDIOC_G_CHIP_IDENT ioctl.
+    through the VIDIOC_DBG_G_CHIP_IDENT ioctl.
    Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl>
@@ -24,7 +24,7 @@
 #ifndef V4L2_CHIP_IDENT_H_
 #define V4L2_CHIP_IDENT_H_
-/* VIDIOC_G_CHIP_IDENT: identifies the actual chip installed on the board */
+/* VIDIOC_DBG_G_CHIP_IDENT: identifies the actual chip installed on the board */
 enum {
        /* general idents: reserved range 0-49 */
        V4L2_IDENT_NONE      = 0,       /* No chip matched */
@@ -60,6 +60,8 @@ enum {
        /* OmniVision sensors: reserved range 250-299 */
        V4L2_IDENT_OV7670 = 250,
+        V4L2_IDENT_OV7720 = 251,
+        V4L2_IDENT_OV7725 = 252,
        /* Conexant MPEG encoder/decoders: reserved range 410-420 */
        V4L2_IDENT_CX23415 = 415,
@@ -69,6 +71,9 @@ enum {
        /* module vp27smpx: just ident 2700 */
        V4L2_IDENT_VP27SMPX = 2700,
+        /* module tvp5150 */
+        V4L2_IDENT_TVP5150 = 5150,
        /* module cs5345: just ident 5345 */
        V4L2_IDENT_CS5345 = 5345,
@@ -82,6 +87,9 @@ enum {
        /* module wm8775: just ident 8775 */
        V4L2_IDENT_WM8775 = 8775,
+        /* module tw9910: just ident 9910 */
+        V4L2_IDENT_TW9910 = 9910,
        /* module cs53132a: just ident 53132 */
        V4L2_IDENT_CS53l32A = 53132,
@@ -166,8 +174,10 @@ enum {
        V4L2_IDENT_MT9M001C12ST         = 45000,
        V4L2_IDENT_MT9M001C12STM        = 45005,
        V4L2_IDENT_MT9M111              = 45007,
+        V4L2_IDENT_MT9M112              = 45008,
        V4L2_IDENT_MT9V022IX7ATC        = 45010, /* No way to detect "normal" I77ATx */
        V4L2_IDENT_MT9V022IX7ATM        = 45015, /* and "lead free" IA7ATx chips */
+        V4L2_IDENT_MT9T031              = 45020,
 };
 #endif
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 2f8719abf5cb..95e74f1874e1 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -57,6 +57,29 @@
 /* ------------------------------------------------------------------------- */
+/* These printk constructs can be used with v4l2_device and v4l2_subdev */
+#define v4l2_printk(level, dev, fmt, arg...) \
+        printk(level "%s: " fmt, (dev)->name , ## arg)
+#define v4l2_err(dev, fmt, arg...) \
+        v4l2_printk(KERN_ERR, dev, fmt , ## arg)
+#define v4l2_warn(dev, fmt, arg...) \
+        v4l2_printk(KERN_WARNING, dev, fmt , ## arg)
+#define v4l2_info(dev, fmt, arg...) \
+        v4l2_printk(KERN_INFO, dev, fmt , ## arg)
+/* These three macros assume that the debug level is set with a module
+   parameter called 'debug'. */
+#define v4l2_dbg(level, debug, dev, fmt, arg...)                        \
+        do {                                                            \
+                if (debug >= (level))                                   \
+                        v4l2_printk(KERN_DEBUG, dev, fmt , ## arg);     \
+        } while (0)
+/* ------------------------------------------------------------------------- */
 /* Priority helper functions */
 struct v4l2_prio_state {
@@ -91,10 +114,10 @@ u32 v4l2_ctrl_next(const u32 * const *ctrl_classes, u32 id);
 /* Register/chip ident helper function */
 struct i2c_client; /* forward reference */
-int v4l2_chip_match_i2c_client(struct i2c_client *c, u32 id_type, u32 chip_id);
+int v4l2_chip_match_i2c_client(struct i2c_client *c, const struct v4l2_dbg_match *match);
-int v4l2_chip_ident_i2c_client(struct i2c_client *c, struct v4l2_chip_ident *chip,
+int v4l2_chip_ident_i2c_client(struct i2c_client *c, struct v4l2_dbg_chip_ident *chip,
                u32 ident, u32 revision);
-int v4l2_chip_match_host(u32 id_type, u32 chip_id);
+int v4l2_chip_match_host(const struct v4l2_dbg_match *match);
 /* ------------------------------------------------------------------------- */
@@ -104,11 +127,29 @@ struct i2c_driver;
 struct i2c_adapter;
 struct i2c_client;
 struct i2c_device_id;
+struct v4l2_device;
+struct v4l2_subdev;
+struct v4l2_subdev_ops;
 int v4l2_i2c_attach(struct i2c_adapter *adapter, int address, struct i2c_driver *driver,
                const char *name,
                int (*probe)(struct i2c_client *, const struct i2c_device_id *));
+/* Load an i2c module and return an initialized v4l2_subdev struct.
+   Only call request_module if module_name != NULL.
+   The client_type argument is the name of the chip that's on the adapter. */
+struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
+                const char *module_name, const char *client_type, u8 addr);
+/* Probe and load an i2c module and return an initialized v4l2_subdev struct.
+   Only call request_module if module_name != NULL.
+   The client_type argument is the name of the chip that's on the adapter. */
+struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
+                const char *module_name, const char *client_type,
+                const unsigned short *addrs);
+/* Initialize an v4l2_subdev with data from an i2c_client struct */
+void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
+                const struct v4l2_subdev_ops *ops);
 /* ------------------------------------------------------------------------- */
 /* Internal ioctls */
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index a0a6b41c5e09..e36faab8459b 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -25,6 +25,25 @@
 #define VFL_TYPE_MAX            4
 struct v4l2_ioctl_callbacks;
+struct video_device;
+struct v4l2_device;
+/* Flag to mark the video_device struct as unregistered.
+   Drivers can set this flag if they want to block all future
+   device access. It is set by video_unregister_device. */
+#define V4L2_FL_UNREGISTERED    (0)
+struct v4l2_file_operations {
+        struct module *owner;
+        ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
+        ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
+        unsigned int (*poll) (struct file *, struct poll_table_struct *);
+        long (*ioctl) (struct file *, unsigned int, unsigned long);
+        long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
+        int (*mmap) (struct file *, struct vm_area_struct *);
+        int (*open) (struct file *);
+        int (*release) (struct file *);
+};
 /*
 * Newer version of video_device, handled by videodev2.c
@@ -35,19 +54,24 @@ struct v4l2_ioctl_callbacks;
 struct video_device
 {
        /* device ops */
-        const struct file_operations *fops;
+        const struct v4l2_file_operations *fops;
        /* sysfs */
        struct device dev;              /* v4l device */
-        struct cdev cdev;               /* character device */
+        struct cdev *cdev;              /* character device */
-        void (*cdev_release)(struct kobject *kobj);
+        /* Set either parent or v4l2_dev if your driver uses v4l2_device */
        struct device *parent;          /* device parent */
+        struct v4l2_device *v4l2_dev;   /* v4l2_device parent */
        /* device info */
        char name[32];
        int vfl_type;
+        /* 'minor' is set to -1 if the registration failed */
        int minor;
        u16 num;
+        /* use bitops to set/clear/test flags */
+        unsigned long flags;
        /* attribute to differentiate multiple indices on one physical device */
        int index;
@@ -58,7 +82,7 @@ struct video_device
        v4l2_std_id current_norm;       /* Current tvnorm */
        /* callbacks */
-        void (*release)(struct video_device *vfd);
+        void (*release)(struct video_device *vdev);
        /* ioctl callbacks */
        const struct v4l2_ioctl_ops *ioctl_ops;
@@ -67,36 +91,41 @@ struct video_device
 /* dev to video-device */
 #define to_video_device(cd) container_of(cd, struct video_device, dev)
-/* Register and unregister devices. Note that if video_register_device fails,
+/* Register video devices. Note that if video_register_device fails,
   the release() callback of the video_device structure is *not* called, so
   the caller is responsible for freeing any data. Usually that means that
-   you call video_device_release() on failure. */
+   you call video_device_release() on failure.
-int __must_check video_register_device(struct video_device *vfd, int type, int nr);
-int __must_check video_register_device_index(struct video_device *vfd,
+   Also note that vdev->minor is set to -1 if the registration failed. */
+int __must_check video_register_device(struct video_device *vdev, int type, int nr);
+int __must_check video_register_device_index(struct video_device *vdev,
                                                int type, int nr, int index);
-void video_unregister_device(struct video_device *vfd);
+/* Unregister video devices. Will do nothing if vdev == NULL or
+   vdev->minor < 0. */
+void video_unregister_device(struct video_device *vdev);
 /* helper functions to alloc/release struct video_device, the
   latter can also be used for video_device->release(). */
 struct video_device * __must_check video_device_alloc(void);
-/* this release function frees the vfd pointer */
+/* this release function frees the vdev pointer */
-void video_device_release(struct video_device *vfd);
+void video_device_release(struct video_device *vdev);
 /* this release function does nothing, use when the video_device is a
   static global struct. Note that having a static video_device is
   a dubious construction at best. */
-void video_device_release_empty(struct video_device *vfd);
+void video_device_release_empty(struct video_device *vdev);
 /* helper functions to access driver private data. */
-static inline void *video_get_drvdata(struct video_device *dev)
+static inline void *video_get_drvdata(struct video_device *vdev)
 {
-        return dev_get_drvdata(&dev->dev);
+        return dev_get_drvdata(&vdev->dev);
 }
-static inline void video_set_drvdata(struct video_device *dev, void *data)
+static inline void video_set_drvdata(struct video_device *vdev, void *data)
 {
-        dev_set_drvdata(&dev->dev, data);
+        dev_set_drvdata(&vdev->dev, data);
 }
 struct video_device *video_devdata(struct file *file);
@@ -108,4 +137,9 @@ static inline void *video_drvdata(struct file *file)
        return video_get_drvdata(video_devdata(file));
 }
+static inline int video_is_unregistered(struct video_device *vdev)
+{
+        return test_bit(V4L2_FL_UNREGISTERED, &vdev->flags);
+}
 #endif /* _V4L2_DEV_H */
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
new file mode 100644
index 000000000000..9bf4ccc93dbf
--- /dev/null
+++ b/include/media/v4l2-device.h
@@ -0,0 +1,109 @@
+/*
+    V4L2 device support header.
+    Copyright (C) 2008  Hans Verkuil <hverkuil@xs4all.nl>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _V4L2_DEVICE_H
+#define _V4L2_DEVICE_H
+#include <media/v4l2-subdev.h>
+/* Each instance of a V4L2 device should create the v4l2_device struct,
+   either stand-alone or embedded in a larger struct.
+   It allows easy access to sub-devices (see v4l2-subdev.h) and provides
+   basic V4L2 device-level support.
+ */
+#define V4L2_DEVICE_NAME_SIZE (BUS_ID_SIZE + 16)
+struct v4l2_device {
+        /* dev->driver_data points to this struct */
+        struct device *dev;
+        /* used to keep track of the registered subdevs */
+        struct list_head subdevs;
+        /* lock this struct; can be used by the driver as well if this
+           struct is embedded into a larger struct. */
+        spinlock_t lock;
+        /* unique device name, by default the driver name + bus ID */
+        char name[V4L2_DEVICE_NAME_SIZE];
+};
+/* Initialize v4l2_dev and make dev->driver_data point to v4l2_dev */
+int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev);
+/* Set v4l2_dev->dev->driver_data to NULL and unregister all sub-devices */
+void v4l2_device_unregister(struct v4l2_device *v4l2_dev);
+/* Register a subdev with a v4l2 device. While registered the subdev module
+   is marked as in-use. An error is returned if the module is no longer
+   loaded when you attempt to register it. */
+int __must_check v4l2_device_register_subdev(struct v4l2_device *dev, struct v4l2_subdev *sd);
+/* Unregister a subdev with a v4l2 device. Can also be called if the subdev
+   wasn't registered. In that case it will do nothing. */
+void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
+/* Iterate over all subdevs. */
+#define v4l2_device_for_each_subdev(sd, dev)                            \
+        list_for_each_entry(sd, &(dev)->subdevs, list)
+/* Call the specified callback for all subdevs matching the condition.
+   Ignore any errors. Note that you cannot add or delete a subdev
+   while walking the subdevs list. */
+#define __v4l2_device_call_subdevs(dev, cond, o, f, args...)            \
+        do {                                                            \
+                struct v4l2_subdev *sd;                                 \
+                                                                        \
+                list_for_each_entry(sd, &(dev)->subdevs, list)          \
+                        if ((cond) && sd->ops->o && sd->ops->o->f)      \
+                                sd->ops->o->f(sd , ##args);             \
+        } while (0)
+/* Call the specified callback for all subdevs matching the condition.
+   If the callback returns an error other than 0 or -ENOIOCTLCMD, then
+   return with that error code. Note that you cannot add or delete a
+   subdev while walking the subdevs list. */
+#define __v4l2_device_call_subdevs_until_err(dev, cond, o, f, args...)  \
+({                                                                      \
+        struct v4l2_subdev *sd;                                         \
+        long err = 0;                                                   \
+                                                                        \
+        list_for_each_entry(sd, &(dev)->subdevs, list) {                \
+                if ((cond) && sd->ops->o && sd->ops->o->f)              \
+                        err = sd->ops->o->f(sd , ##args);               \
+                if (err && err != -ENOIOCTLCMD)                         \
+                        break;                                          \
+        }                                                               \
+        (err == -ENOIOCTLCMD) ? 0 : err;                                \
+})
+/* Call the specified callback for all subdevs matching grp_id (if 0, then
+   match them all). Ignore any errors. Note that you cannot add or delete
+   a subdev while walking the subdevs list. */
+#define v4l2_device_call_all(dev, grp_id, o, f, args...)                \
+        __v4l2_device_call_subdevs(dev,                                 \
+                        !(grp_id) || sd->grp_id == (grp_id), o, f , ##args)
+/* Call the specified callback for all subdevs matching grp_id (if 0, then
+   match them all). If the callback returns an error other than 0 or
+   -ENOIOCTLCMD, then return with that error code. Note that you cannot
+   add or delete a subdev while walking the subdevs list. */
+#define v4l2_device_call_until_err(dev, grp_id, o, f, args...)          \
+        __v4l2_device_call_subdevs_until_err(dev,                       \
+                       !(grp_id) || sd->grp_id == (grp_id), o, f , ##args)
+#endif
diff --git a/include/media/v4l2-int-device.h b/include/media/v4l2-int-device.h
index 9c2df41dbf92..fbf585561570 100644
--- a/include/media/v4l2-int-device.h
+++ b/include/media/v4l2-int-device.h
@@ -183,6 +183,9 @@ enum v4l2_int_ioctl_num {
        vidioc_int_s_crop_num,
        vidioc_int_g_parm_num,
        vidioc_int_s_parm_num,
+        vidioc_int_querystd_num,
+        vidioc_int_s_std_num,
+        vidioc_int_s_video_routing_num,
        /*
         *
@@ -216,7 +219,7 @@ enum v4l2_int_ioctl_num {
        vidioc_int_reset_num,
        /* VIDIOC_INT_INIT */
        vidioc_int_init_num,
-        /* VIDIOC_INT_G_CHIP_IDENT */
+        /* VIDIOC_DBG_G_CHIP_IDENT */
        vidioc_int_g_chip_ident_num,
        /*
@@ -284,6 +287,9 @@ V4L2_INT_WRAPPER_1(g_crop, struct v4l2_crop, *);
 V4L2_INT_WRAPPER_1(s_crop, struct v4l2_crop, *);
 V4L2_INT_WRAPPER_1(g_parm, struct v4l2_streamparm, *);
 V4L2_INT_WRAPPER_1(s_parm, struct v4l2_streamparm, *);
+V4L2_INT_WRAPPER_1(querystd, v4l2_std_id, *);
+V4L2_INT_WRAPPER_1(s_std, v4l2_std_id, *);
+V4L2_INT_WRAPPER_1(s_video_routing, struct v4l2_routing, *);
 V4L2_INT_WRAPPER_0(dev_init);
 V4L2_INT_WRAPPER_0(dev_exit);
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index e6ba25b3d7c8..b01c044868d0 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -225,15 +225,21 @@ struct v4l2_ioctl_ops {
        /* Debugging ioctls */
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        int (*vidioc_g_register)       (struct file *file, void *fh,
-                                        struct v4l2_register *reg);
+                                        struct v4l2_dbg_register *reg);
        int (*vidioc_s_register)       (struct file *file, void *fh,
-                                        struct v4l2_register *reg);
+                                        struct v4l2_dbg_register *reg);
 #endif
        int (*vidioc_g_chip_ident)     (struct file *file, void *fh,
-                                        struct v4l2_chip_ident *chip);
+                                        struct v4l2_dbg_chip_ident *chip);
+        int (*vidioc_enum_framesizes)   (struct file *file, void *fh,
+                                         struct v4l2_frmsizeenum *fsize);
+        int (*vidioc_enum_frameintervals) (struct file *file, void *fh,
+                                           struct v4l2_frmivalenum *fival);
        /* For other private ioctls */
-        int (*vidioc_default)          (struct file *file, void *fh,
+        long (*vidioc_default)         (struct file *file, void *fh,
                                        int cmd, void *arg);
 };
@@ -271,38 +277,27 @@ extern const char *v4l2_field_names[];
 extern const char *v4l2_type_names[];
 /*  Compatibility layer interface  --  v4l1-compat module */
-typedef int (*v4l2_kioctl)(struct file *file,
+typedef long (*v4l2_kioctl)(struct file *file,
                           unsigned int cmd, void *arg);
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
-int v4l_compat_translate_ioctl(struct file *file,
+long v4l_compat_translate_ioctl(struct file *file,
                               int cmd, void *arg, v4l2_kioctl driver_ioctl);
 #else
 #define v4l_compat_translate_ioctl(file, cmd, arg, ioctl) (-EINVAL)
 #endif
+#ifdef CONFIG_COMPAT
 /* 32 Bits compatibility layer for 64 bits processors */
-extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd,
+extern long v4l2_compat_ioctl32(struct file *file, unsigned int cmd,
                                unsigned long arg);
+#endif
 /* Include support for obsoleted stuff */
-extern int video_usercopy(struct inode *inode, struct file *file,
+extern long video_usercopy(struct file *file, unsigned int cmd,
-                          unsigned int cmd, unsigned long arg,
+                                unsigned long arg, v4l2_kioctl func);
-                          int (*func)(struct inode *inode, struct file *file,
-                                      unsigned int cmd, void *arg));
 /* Standard handlers for V4L ioctl's */
+extern long video_ioctl2(struct file *file,
-/* This prototype is used on fops.unlocked_ioctl */
-extern int __video_ioctl2(struct file *file,
-                        unsigned int cmd, unsigned long arg);
-/* This prototype is used on fops.ioctl
- * Since fops.ioctl enables Kernel Big Lock, it is preferred
- * to use __video_ioctl2 instead.
- * It should be noticed that there's no lock code inside
- * video_ioctl2().
- */
-extern int video_ioctl2(struct inode *inode, struct file *file,
                        unsigned int cmd, unsigned long arg);
 #endif /* _V4L2_IOCTL_H */
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
new file mode 100644
index 000000000000..37b09e56e943
--- /dev/null
+++ b/include/media/v4l2-subdev.h
@@ -0,0 +1,189 @@
+/*
+    V4L2 sub-device support header.
+    Copyright (C) 2008  Hans Verkuil <hverkuil@xs4all.nl>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _V4L2_SUBDEV_H
+#define _V4L2_SUBDEV_H
+#include <media/v4l2-common.h>
+struct v4l2_device;
+struct v4l2_subdev;
+struct tuner_setup;
+/* Sub-devices are devices that are connected somehow to the main bridge
+   device. These devices are usually audio/video muxers/encoders/decoders or
+   sensors and webcam controllers.
+   Usually these devices are controlled through an i2c bus, but other busses
+   may also be used.
+   The v4l2_subdev struct provides a way of accessing these devices in a
+   generic manner. Most operations that these sub-devices support fall in
+   a few categories: core ops, audio ops, video ops and tuner ops.
+   More categories can be added if needed, although this should remain a
+   limited set (no more than approx. 8 categories).
+   Each category has its own set of ops that subdev drivers can implement.
+   A subdev driver can leave the pointer to the category ops NULL if
+   it does not implement them (e.g. an audio subdev will generally not
+   implement the video category ops). The exception is the core category:
+   this must always be present.
+   These ops are all used internally so it is no problem to change, remove
+   or add ops or move ops from one to another category. Currently these
+   ops are based on the original ioctls, but since ops are not limited to
+   one argument there is room for improvement here once all i2c subdev
+   drivers are converted to use these ops.
+ */
+/* Core ops: it is highly recommended to implement at least these ops:
+   g_chip_ident
+   log_status
+   g_register
+   s_register
+   This provides basic debugging support.
+   The ioctl ops is meant for generic ioctl-like commands. Depending on
+   the use-case it might be better to use subdev-specific ops (currently
+   not yet implemented) since ops provide proper type-checking.
+ */
+struct v4l2_subdev_core_ops {
+        int (*g_chip_ident)(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip);
+        int (*log_status)(struct v4l2_subdev *sd);
+        int (*init)(struct v4l2_subdev *sd, u32 val);
+        int (*s_standby)(struct v4l2_subdev *sd, u32 standby);
+        int (*reset)(struct v4l2_subdev *sd, u32 val);
+        int (*s_gpio)(struct v4l2_subdev *sd, u32 val);
+        int (*queryctrl)(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc);
+        int (*g_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl);
+        int (*s_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl);
+        int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm);
+        long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg);
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        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
+};
+struct v4l2_subdev_tuner_ops {
+        int (*s_mode)(struct v4l2_subdev *sd, enum v4l2_tuner_type);
+        int (*s_radio)(struct v4l2_subdev *sd);
+        int (*s_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq);
+        int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq);
+        int (*g_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
+        int (*s_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
+        int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
+        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);
+};
+struct v4l2_subdev_audio_ops {
+        int (*s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
+        int (*s_i2s_clock_freq)(struct v4l2_subdev *sd, u32 freq);
+        int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
+};
+struct v4l2_subdev_video_ops {
+        int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
+        int (*s_crystal_freq)(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq);
+        int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line);
+        int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data);
+        int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);
+        int (*g_sliced_vbi_cap)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_cap *cap);
+        int (*s_std_output)(struct v4l2_subdev *sd, v4l2_std_id std);
+        int (*s_stream)(struct v4l2_subdev *sd, int enable);
+        int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+        int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+};
+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;
+};
+#define V4L2_SUBDEV_NAME_SIZE 32
+/* Each instance of a subdev driver should create this struct, either
+   stand-alone or embedded in a larger struct.
+ */
+struct v4l2_subdev {
+        struct list_head list;
+        struct module *owner;
+        struct v4l2_device *dev;
+        const struct v4l2_subdev_ops *ops;
+        /* name must be unique */
+        char name[V4L2_SUBDEV_NAME_SIZE];
+        /* can be used to group similar subdevs, value is driver-specific */
+        u32 grp_id;
+        /* pointer to private data */
+        void *priv;
+};
+static inline void v4l2_set_subdevdata(struct v4l2_subdev *sd, void *p)
+{
+        sd->priv = p;
+}
+static inline void *v4l2_get_subdevdata(const struct v4l2_subdev *sd)
+{
+        return sd->priv;
+}
+/* Convert an ioctl-type command to the proper v4l2_subdev_ops function call.
+   This is used by subdev modules that can be called by both old-style ioctl
+   commands and through the v4l2_subdev_ops.
+   The ioctl API of the subdev driver can call this function to call the
+   right ops based on the ioctl cmd and arg.
+   Once all subdev drivers have been converted and all drivers no longer
+   use the ioctl interface, then this function can be removed.
+ */
+int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg);
+static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
+                                        const struct v4l2_subdev_ops *ops)
+{
+        INIT_LIST_HEAD(&sd->list);
+        /* ops->core MUST be set */
+        BUG_ON(!ops || !ops->core);
+        sd->ops = ops;
+        sd->dev = NULL;
+        sd->name[0] = '\0';
+        sd->grp_id = 0;
+        sd->priv = NULL;
+}
+/* Call an ops of a v4l2_subdev, doing the right checks against
+   NULL pointers.
+   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)->ops->o->f((sd) , ##args) : -ENOIOCTLCMD))
+#endif
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 996d12df7594..a04f8463ac7e 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -54,8 +54,8 @@
 #define SOL_RFCOMM      18
 #define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg)
-#define BT_DBG(fmt, arg...)  printk(KERN_INFO "%s: " fmt "\n" , __func__ , ## arg)
+#define BT_ERR(fmt, arg...)  printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg)
-#define BT_ERR(fmt, arg...)  printk(KERN_ERR  "%s: " fmt "\n" , __func__ , ## arg)
+#define BT_DBG(fmt, arg...)  pr_debug("%s: " fmt "\n" , __func__ , ## arg)
 /* Connection and socket states */
 enum {
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 3cc294919312..3645139e68c7 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -54,7 +54,7 @@
 /* HCI device quirks */
 enum {
-        HCI_QUIRK_RESET_ON_INIT,
+        HCI_QUIRK_NO_RESET,
        HCI_QUIRK_RAW_DEVICE,
        HCI_QUIRK_FIXUP_BUFFER_SIZE
 };
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 0e85ec39b638..23c0ab74ded6 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -5,6 +5,8 @@
 #include <linux/skbuff.h>
 #include <linux/nl80211.h>
 #include <net/genetlink.h>
+/* remove once we remove the wext stuff */
+#include <net/iw_handler.h>
 /*
 * 802.11 configuration in-kernel interface
@@ -167,6 +169,9 @@ struct station_parameters {
 * @STATION_INFO_LLID: @llid filled
 * @STATION_INFO_PLID: @plid filled
 * @STATION_INFO_PLINK_STATE: @plink_state filled
+ * @STATION_INFO_SIGNAL: @signal filled
+ * @STATION_INFO_TX_BITRATE: @tx_bitrate fields are filled
+ *  (tx_bitrate, tx_bitrate_flags and tx_bitrate_mcs)
 */
 enum station_info_flags {
        STATION_INFO_INACTIVE_TIME      = 1<<0,
@@ -175,6 +180,39 @@ enum station_info_flags {
        STATION_INFO_LLID               = 1<<3,
        STATION_INFO_PLID               = 1<<4,
        STATION_INFO_PLINK_STATE        = 1<<5,
+        STATION_INFO_SIGNAL             = 1<<6,
+        STATION_INFO_TX_BITRATE         = 1<<7,
+};
+/**
+ * enum station_info_rate_flags - bitrate info flags
+ *
+ * Used by the driver to indicate the specific rate transmission
+ * type for 802.11n transmissions.
+ *
+ * @RATE_INFO_FLAGS_MCS: @tx_bitrate_mcs filled
+ * @RATE_INFO_FLAGS_40_MHZ_WIDTH: 40 Mhz width transmission
+ * @RATE_INFO_FLAGS_SHORT_GI: 400ns guard interval
+ */
+enum rate_info_flags {
+        RATE_INFO_FLAGS_MCS             = 1<<0,
+        RATE_INFO_FLAGS_40_MHZ_WIDTH    = 1<<1,
+        RATE_INFO_FLAGS_SHORT_GI        = 1<<2,
+};
+/**
+ * struct rate_info - bitrate information
+ *
+ * Information about a receiving or transmitting bitrate
+ *
+ * @flags: bitflag of flags from &enum rate_info_flags
+ * @mcs: mcs index if struct describes a 802.11n bitrate
+ * @legacy: bitrate in 100kbit/s for 802.11abg
+ */
+struct rate_info {
+        u8 flags;
+        u8 mcs;
+        u16 legacy;
 };
 /**
@@ -189,6 +227,8 @@ enum station_info_flags {
 * @llid: mesh local link id
 * @plid: mesh peer link id
 * @plink_state: mesh peer link state
+ * @signal: signal strength of last received packet in dBm
+ * @txrate: current unicast bitrate to this station
 */
 struct station_info {
        u32 filled;
@@ -198,6 +238,8 @@ struct station_info {
        u16 llid;
        u16 plid;
        u8 plink_state;
+        s8 signal;
+        struct rate_info txrate;
 };
 /**
@@ -280,11 +322,16 @@ struct mpath_info {
 *      (0 = no, 1 = yes, -1 = do not change)
 * @use_short_slot_time: Whether the use of short slot time is allowed
 *      (0 = no, 1 = yes, -1 = do not change)
+ * @basic_rates: basic rates in IEEE 802.11 format
+ *      (or NULL for no change)
+ * @basic_rates_len: number of basic rates
 */
 struct bss_parameters {
        int use_cts_prot;
        int use_short_preamble;
        int use_short_slot_time;
+        u8 *basic_rates;
+        u8 basic_rates_len;
 };
 /**
@@ -331,25 +378,65 @@ struct ieee80211_regdomain {
        struct ieee80211_reg_rule reg_rules[];
 };
-#define MHZ_TO_KHZ(freq) (freq * 1000)
+#define MHZ_TO_KHZ(freq) ((freq) * 1000)
-#define KHZ_TO_MHZ(freq) (freq / 1000)
+#define KHZ_TO_MHZ(freq) ((freq) / 1000)
-#define DBI_TO_MBI(gain) (gain * 100)
+#define DBI_TO_MBI(gain) ((gain) * 100)
-#define MBI_TO_DBI(gain) (gain / 100)
+#define MBI_TO_DBI(gain) ((gain) / 100)
-#define DBM_TO_MBM(gain) (gain * 100)
+#define DBM_TO_MBM(gain) ((gain) * 100)
-#define MBM_TO_DBM(gain) (gain / 100)
+#define MBM_TO_DBM(gain) ((gain) / 100)
 #define REG_RULE(start, end, bw, gain, eirp, reg_flags) { \
-        .freq_range.start_freq_khz = (start) * 1000, \
+        .freq_range.start_freq_khz = MHZ_TO_KHZ(start), \
-        .freq_range.end_freq_khz = (end) * 1000, \
+        .freq_range.end_freq_khz = MHZ_TO_KHZ(end), \
-        .freq_range.max_bandwidth_khz = (bw) * 1000, \
+        .freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw), \
-        .power_rule.max_antenna_gain = (gain) * 100, \
+        .power_rule.max_antenna_gain = DBI_TO_MBI(gain), \
-        .power_rule.max_eirp = (eirp) * 100, \
+        .power_rule.max_eirp = DBM_TO_MBM(eirp), \
        .flags = reg_flags, \
        }
+struct mesh_config {
+        /* Timeouts in ms */
+        /* Mesh plink management parameters */
+        u16 dot11MeshRetryTimeout;
+        u16 dot11MeshConfirmTimeout;
+        u16 dot11MeshHoldingTimeout;
+        u16 dot11MeshMaxPeerLinks;
+        u8  dot11MeshMaxRetries;
+        u8  dot11MeshTTL;
+        bool auto_open_plinks;
+        /* HWMP parameters */
+        u8  dot11MeshHWMPmaxPREQretries;
+        u32 path_refresh_time;
+        u16 min_discovery_timeout;
+        u32 dot11MeshHWMPactivePathTimeout;
+        u16 dot11MeshHWMPpreqMinInterval;
+        u16 dot11MeshHWMPnetDiameterTraversalTime;
+};
+/**
+ * struct ieee80211_txq_params - TX queue parameters
+ * @queue: TX queue identifier (NL80211_TXQ_Q_*)
+ * @txop: Maximum burst time in units of 32 usecs, 0 meaning disabled
+ * @cwmin: Minimum contention window [a value of the form 2^n-1 in the range
+ *      1..32767]
+ * @cwmax: Maximum contention window [a value of the form 2^n-1 in the range
+ *      1..32767]
+ * @aifs: Arbitration interframe space [0..255]
+ */
+struct ieee80211_txq_params {
+        enum nl80211_txq_q queue;
+        u16 txop;
+        u16 cwmin;
+        u16 cwmax;
+        u8 aifs;
+};
 /* from net/wireless.h */
 struct wiphy;
+/* from net/ieee80211.h */
+struct ieee80211_channel;
 /**
 * struct cfg80211_ops - backend description for wireless configuration
 *
@@ -397,9 +484,19 @@ struct wiphy;
 *
 * @change_station: Modify a given station.
 *
+ * @get_mesh_params: Put the current mesh parameters into *params
+ *
+ * @set_mesh_params: Set mesh parameters.
+ *      The mask is a bitfield which tells us which parameters to
+ *      set, and which to leave alone.
+ *
 * @set_mesh_cfg: set mesh parameters (by now, just mesh id)
 *
 * @change_bss: Modify parameters for a given BSS.
+ *
+ * @set_txq_params: Set TX queue parameters
+ *
+ * @set_channel: Set channel
 */
 struct cfg80211_ops {
        int     (*add_virtual_intf)(struct wiphy *wiphy, char *name,
@@ -452,9 +549,30 @@ struct cfg80211_ops {
        int     (*dump_mpath)(struct wiphy *wiphy, struct net_device *dev,
                               int idx, u8 *dst, u8 *next_hop,
                               struct mpath_info *pinfo);
+        int     (*get_mesh_params)(struct wiphy *wiphy,
+                                struct net_device *dev,
+                                struct mesh_config *conf);
+        int     (*set_mesh_params)(struct wiphy *wiphy,
+                                struct net_device *dev,
+                                const struct mesh_config *nconf, u32 mask);
        int     (*change_bss)(struct wiphy *wiphy, struct net_device *dev,
                              struct bss_parameters *params);
+        int     (*set_txq_params)(struct wiphy *wiphy,
+                                  struct ieee80211_txq_params *params);
+        int     (*set_channel)(struct wiphy *wiphy,
+                               struct ieee80211_channel *chan,
+                               enum nl80211_channel_type channel_type);
 };
+/* temporary wext handlers */
+int cfg80211_wext_giwname(struct net_device *dev,
+                          struct iw_request_info *info,
+                          char *name, char *extra);
+int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
+                          u32 *mode, char *extra);
+int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
+                          u32 *mode, char *extra);
 #endif /* __NET_CFG80211_H */
diff --git a/include/net/checksum.h b/include/net/checksum.h
index 07602b7fa218..ba55d8b8c87c 100644
--- a/include/net/checksum.h
+++ b/include/net/checksum.h
@@ -98,7 +98,7 @@ static inline void csum_replace4(__sum16 *sum, __be32 from, __be32 to)
 {
        __be32 diff[] = { ~from, to };
-        *sum = csum_fold(csum_partial((char *)diff, sizeof(diff), ~csum_unfold(*sum)));
+        *sum = csum_fold(csum_partial(diff, sizeof(diff), ~csum_unfold(*sum)));
 }
 static inline void csum_replace2(__sum16 *sum, __be16 from, __be16 to)
diff --git a/include/net/dcbnl.h b/include/net/dcbnl.h
new file mode 100644
index 000000000000..775cfc8055be
--- /dev/null
+++ b/include/net/dcbnl.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2008, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * Author: Lucy Liu <lucy.liu@intel.com>
+ */
+#ifndef __NET_DCBNL_H__
+#define __NET_DCBNL_H__
+/*
+ * Ops struct for the netlink callbacks.  Used by DCB-enabled drivers through
+ * the netdevice struct.
+ */
+struct dcbnl_rtnl_ops {
+        u8   (*getstate)(struct net_device *);
+        u8   (*setstate)(struct net_device *, u8);
+        void (*getpermhwaddr)(struct net_device *, u8 *);
+        void (*setpgtccfgtx)(struct net_device *, int, u8, u8, u8, u8);
+        void (*setpgbwgcfgtx)(struct net_device *, int, u8);
+        void (*setpgtccfgrx)(struct net_device *, int, u8, u8, u8, u8);
+        void (*setpgbwgcfgrx)(struct net_device *, int, u8);
+        void (*getpgtccfgtx)(struct net_device *, int, u8 *, u8 *, u8 *, u8 *);
+        void (*getpgbwgcfgtx)(struct net_device *, int, u8 *);
+        void (*getpgtccfgrx)(struct net_device *, int, u8 *, u8 *, u8 *, u8 *);
+        void (*getpgbwgcfgrx)(struct net_device *, int, u8 *);
+        void (*setpfccfg)(struct net_device *, int, u8);
+        void (*getpfccfg)(struct net_device *, int, u8 *);
+        u8   (*setall)(struct net_device *);
+        u8   (*getcap)(struct net_device *, int, u8 *);
+        u8   (*getnumtcs)(struct net_device *, int, u8 *);
+        u8   (*setnumtcs)(struct net_device *, int, u8);
+        u8   (*getpfcstate)(struct net_device *);
+        void (*setpfcstate)(struct net_device *, u8);
+        void (*getbcncfg)(struct net_device *, int, u32 *);
+        void (*setbcncfg)(struct net_device *, int, u32);
+        void (*getbcnrp)(struct net_device *, int, u8 *);
+        void (*setbcnrp)(struct net_device *, int, u8);
+};
+#endif /* __NET_DCBNL_H__ */
diff --git a/include/net/dn.h b/include/net/dn.h
index 627778384c84..e5469f7b67a3 100644
--- a/include/net/dn.h
+++ b/include/net/dn.h
@@ -4,9 +4,7 @@
 #include <linux/dn.h>
 #include <net/sock.h>
 #include <asm/byteorder.h>
+#include <asm/unaligned.h>
-#define dn_ntohs(x) le16_to_cpu(x)
-#define dn_htons(x) cpu_to_le16(x)
 struct dn_scp                                   /* Session Control Port */
 {
@@ -175,7 +173,7 @@ struct dn_skb_cb {
 static inline __le16 dn_eth2dn(unsigned char *ethaddr)
 {
-        return dn_htons(ethaddr[4] | (ethaddr[5] << 8));
+        return get_unaligned((__le16 *)(ethaddr + 4));
 }
 static inline __le16 dn_saddr2dn(struct sockaddr_dn *saddr)
@@ -185,7 +183,7 @@ static inline __le16 dn_saddr2dn(struct sockaddr_dn *saddr)
 static inline void dn_dn2eth(unsigned char *ethaddr, __le16 addr)
 {
-        __u16 a = dn_ntohs(addr);
+        __u16 a = le16_to_cpu(addr);
        ethaddr[0] = 0xAA;
        ethaddr[1] = 0x00;
        ethaddr[2] = 0x04;
diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h
index 30125119c950..c378be7bf960 100644
--- a/include/net/dn_fib.h
+++ b/include/net/dn_fib.h
@@ -181,9 +181,9 @@ static inline void dn_fib_res_put(struct dn_fib_res *res)
 static inline __le16 dnet_make_mask(int n)
 {
-        if (n)
+        if (n)
-                return dn_htons(~((1<<(16-n))-1));
+                return cpu_to_le16(~((1 << (16 - n)) - 1));
-        return 0;
+        return cpu_to_le16(0);
 }
 #endif /* _NET_DN_FIB_H */
diff --git a/include/net/dst.h b/include/net/dst.h
index 8a8b71e5f3f1..6be3b082a070 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -59,8 +59,11 @@ struct dst_entry
        struct neighbour        *neighbour;
        struct hh_cache         *hh;
+#ifdef CONFIG_XFRM
        struct xfrm_state       *xfrm;
+#else
+        void                    *__pad1;
+#endif
        int                     (*input)(struct sk_buff*);
        int                     (*output)(struct sk_buff*);
@@ -70,8 +73,20 @@ struct dst_entry
 #ifdef CONFIG_NET_CLS_ROUTE
        __u32                   tclassid;
+#else
+        __u32                   __pad2;
 #endif
+        /*
+         * Align __refcnt to a 64 bytes alignment
+         * (L1_CACHE_SIZE would be too much)
+         */
+#ifdef CONFIG_64BIT
+        long                    __pad_to_align_refcnt[2];
+#else
+        long                    __pad_to_align_refcnt[1];
+#endif
        /*
         * __refcnt wants to be on a different cache line from
         * input/output/ops or performance tanks badly
@@ -103,7 +118,6 @@ struct dst_ops
        void                    (*link_failure)(struct sk_buff *);
        void                    (*update_pmtu)(struct dst_entry *dst, u32 mtu);
        int                     (*local_out)(struct sk_buff *skb);
-        int                     entry_size;
        atomic_t                entries;
        struct kmem_cache               *kmem_cachep;
@@ -157,6 +171,11 @@ dst_metric_locked(struct dst_entry *dst, int metric)
 static inline void dst_hold(struct dst_entry * dst)
 {
+        /*
+         * If your kernel compilation stops here, please check
+         * __pad_to_align_refcnt declaration in struct dst_entry
+         */
+        BUILD_BUG_ON(offsetof(struct dst_entry, __refcnt) & 63);
        atomic_inc(&dst->__refcnt);
 }
@@ -272,21 +291,21 @@ enum {
 struct flowi;
 #ifndef CONFIG_XFRM
-static inline int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
+static inline int xfrm_lookup(struct net *net, struct dst_entry **dst_p,
-                       struct sock *sk, int flags)
+                              struct flowi *fl, struct sock *sk, int flags)
 {
        return 0;
 } 
-static inline int __xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
+static inline int __xfrm_lookup(struct net *net, struct dst_entry **dst_p,
-                                struct sock *sk, int flags)
+                                struct flowi *fl, struct sock *sk, int flags)
 {
        return 0;
 }
 #else
-extern int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
+extern int xfrm_lookup(struct net *net, struct dst_entry **dst_p,
-                       struct sock *sk, int flags);
+                       struct flowi *fl, struct sock *sk, int flags);
-extern int __xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
+extern int __xfrm_lookup(struct net *net, struct dst_entry **dst_p,
-                         struct sock *sk, int flags);
+                         struct flowi *fl, struct sock *sk, int flags);
 #endif
 #endif
diff --git a/include/net/flow.h b/include/net/flow.h
index b45a5e4fcadd..809970b7dfee 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -84,12 +84,13 @@ struct flowi {
 #define FLOW_DIR_OUT    1
 #define FLOW_DIR_FWD    2
+struct net;
 struct sock;
-typedef int (*flow_resolve_t)(struct flowi *key, u16 family, u8 dir,
+typedef int (*flow_resolve_t)(struct net *net, struct flowi *key, u16 family,
-                               void **objp, atomic_t **obj_refp);
+                              u8 dir, void **objp, atomic_t **obj_refp);
-extern void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir,
+extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family,
-                               flow_resolve_t resolver);
+                               u8 dir, flow_resolve_t resolver);
 extern void flow_cache_flush(void);
 extern atomic_t flow_cache_genid;
diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
index 8cd8185fa2ed..d136b5240ef2 100644
--- a/include/net/gen_stats.h
+++ b/include/net/gen_stats.h
@@ -45,5 +45,6 @@ extern void gen_kill_estimator(struct gnet_stats_basic *bstats,
 extern int gen_replace_estimator(struct gnet_stats_basic *bstats,
                                 struct gnet_stats_rate_est *rate_est,
                                 spinlock_t *stats_lock, struct nlattr *opt);
+extern bool gen_estimator_active(const struct gnet_stats_basic *bstats,
+                                 const struct gnet_stats_rate_est *rate_est);
 #endif
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 93a56de3594b..adb7cf31f781 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -28,6 +28,9 @@
 #include <linux/if_ether.h>     /* ETH_ALEN */
 #include <linux/kernel.h>       /* ARRAY_SIZE */
 #include <linux/wireless.h>
+#include <linux/ieee80211.h>
+#include <net/lib80211.h>
 #define IEEE80211_VERSION "git-1.1.13"
@@ -127,10 +130,6 @@ static inline bool ieee80211_ratelimit_debug(u32 level)
 }
 #endif                          /* CONFIG_IEEE80211_DEBUG */
-/* escape_essid() is intended to be used in debug (and possibly error)
- * messages. It should never be used for passing essid to user space. */
-const char *escape_essid(const char *essid, u8 essid_len);
 /*
 * To use the debug system:
 *
@@ -218,94 +217,6 @@ struct ieee80211_snap_hdr {
 #define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG)
 #define WLAN_GET_SEQ_SEQ(seq)  (((seq) & IEEE80211_SCTL_SEQ) >> 4)
-/* Authentication algorithms */
-#define WLAN_AUTH_OPEN 0
-#define WLAN_AUTH_SHARED_KEY 1
-#define WLAN_AUTH_LEAP 2
-#define WLAN_AUTH_CHALLENGE_LEN 128
-#define WLAN_CAPABILITY_ESS (1<<0)
-#define WLAN_CAPABILITY_IBSS (1<<1)
-#define WLAN_CAPABILITY_CF_POLLABLE (1<<2)
-#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3)
-#define WLAN_CAPABILITY_PRIVACY (1<<4)
-#define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
-#define WLAN_CAPABILITY_PBCC (1<<6)
-#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7)
-#define WLAN_CAPABILITY_SPECTRUM_MGMT (1<<8)
-#define WLAN_CAPABILITY_QOS (1<<9)
-#define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
-#define WLAN_CAPABILITY_DSSS_OFDM (1<<13)
-/* 802.11g ERP information element */
-#define WLAN_ERP_NON_ERP_PRESENT (1<<0)
-#define WLAN_ERP_USE_PROTECTION (1<<1)
-#define WLAN_ERP_BARKER_PREAMBLE (1<<2)
-/* Status codes */
-enum ieee80211_statuscode {
-        WLAN_STATUS_SUCCESS = 0,
-        WLAN_STATUS_UNSPECIFIED_FAILURE = 1,
-        WLAN_STATUS_CAPS_UNSUPPORTED = 10,
-        WLAN_STATUS_REASSOC_NO_ASSOC = 11,
-        WLAN_STATUS_ASSOC_DENIED_UNSPEC = 12,
-        WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG = 13,
-        WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION = 14,
-        WLAN_STATUS_CHALLENGE_FAIL = 15,
-        WLAN_STATUS_AUTH_TIMEOUT = 16,
-        WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA = 17,
-        WLAN_STATUS_ASSOC_DENIED_RATES = 18,
-        /* 802.11b */
-        WLAN_STATUS_ASSOC_DENIED_NOSHORTPREAMBLE = 19,
-        WLAN_STATUS_ASSOC_DENIED_NOPBCC = 20,
-        WLAN_STATUS_ASSOC_DENIED_NOAGILITY = 21,
-        /* 802.11h */
-        WLAN_STATUS_ASSOC_DENIED_NOSPECTRUM = 22,
-        WLAN_STATUS_ASSOC_REJECTED_BAD_POWER = 23,
-        WLAN_STATUS_ASSOC_REJECTED_BAD_SUPP_CHAN = 24,
-        /* 802.11g */
-        WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME = 25,
-        WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM = 26,
-        /* 802.11i */
-        WLAN_STATUS_INVALID_IE = 40,
-        WLAN_STATUS_INVALID_GROUP_CIPHER = 41,
-        WLAN_STATUS_INVALID_PAIRWISE_CIPHER = 42,
-        WLAN_STATUS_INVALID_AKMP = 43,
-        WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
-        WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
-        WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
-};
-/* Reason codes */
-enum ieee80211_reasoncode {
-        WLAN_REASON_UNSPECIFIED = 1,
-        WLAN_REASON_PREV_AUTH_NOT_VALID = 2,
-        WLAN_REASON_DEAUTH_LEAVING = 3,
-        WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY = 4,
-        WLAN_REASON_DISASSOC_AP_BUSY = 5,
-        WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA = 6,
-        WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA = 7,
-        WLAN_REASON_DISASSOC_STA_HAS_LEFT = 8,
-        WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH = 9,
-        /* 802.11h */
-        WLAN_REASON_DISASSOC_BAD_POWER = 10,
-        WLAN_REASON_DISASSOC_BAD_SUPP_CHAN = 11,
-        /* 802.11i */
-        WLAN_REASON_INVALID_IE = 13,
-        WLAN_REASON_MIC_FAILURE = 14,
-        WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT = 15,
-        WLAN_REASON_GROUP_KEY_HANDSHAKE_TIMEOUT = 16,
-        WLAN_REASON_IE_DIFFERENT = 17,
-        WLAN_REASON_INVALID_GROUP_CIPHER = 18,
-        WLAN_REASON_INVALID_PAIRWISE_CIPHER = 19,
-        WLAN_REASON_INVALID_AKMP = 20,
-        WLAN_REASON_UNSUPP_RSN_VERSION = 21,
-        WLAN_REASON_INVALID_RSN_IE_CAP = 22,
-        WLAN_REASON_IEEE8021X_FAILED = 23,
-        WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
-};
 /* Action categories - 802.11h */
 enum ieee80211_actioncategories {
        WLAN_ACTION_SPECTRUM_MGMT = 0,
@@ -446,8 +357,6 @@ struct ieee80211_stats {
 struct ieee80211_device;
-#include "ieee80211_crypt.h"
 #define SEC_KEY_1               (1<<0)
 #define SEC_KEY_2               (1<<1)
 #define SEC_KEY_3               (1<<2)
@@ -476,9 +385,8 @@ struct ieee80211_device;
 #define SCM_TEMPORAL_KEY_LENGTH 16
 struct ieee80211_security {
-        u16 active_key:2,
+        u16 active_key:2, enabled:1, unicast_uses_group:1, encrypt:1;
-            enabled:1,
+        u8 auth_mode;
-            auth_mode:2, auth_algo:4, unicast_uses_group:1, encrypt:1;
        u8 encode_alg[WEP_KEYS];
        u8 key_sizes[WEP_KEYS];
        u8 keys[WEP_KEYS][SCM_KEY_LEN];
@@ -534,15 +442,6 @@ enum ieee80211_mfie {
        MFIE_TYPE_QOS_PARAMETER = 222,
 };
-/* Minimal header; can be used for passing 802.11 frames with sufficient
- * information to determine what type of underlying data type is actually
- * stored in the data. */
-struct ieee80211_hdr {
-        __le16 frame_ctl;
-        __le16 duration_id;
-        u8 payload[0];
-} __attribute__ ((packed));
 struct ieee80211_hdr_1addr {
        __le16 frame_ctl;
        __le16 duration_id;
@@ -590,18 +489,6 @@ struct ieee80211_hdr_3addrqos {
        __le16 qos_ctl;
 } __attribute__ ((packed));
-struct ieee80211_hdr_4addrqos {
-        __le16 frame_ctl;
-        __le16 duration_id;
-        u8 addr1[ETH_ALEN];
-        u8 addr2[ETH_ALEN];
-        u8 addr3[ETH_ALEN];
-        __le16 seq_ctl;
-        u8 addr4[ETH_ALEN];
-        u8 payload[0];
-        __le16 qos_ctl;
-} __attribute__ ((packed));
 struct ieee80211_info_element {
        u8 id;
        u8 len;
@@ -733,7 +620,6 @@ struct ieee80211_txb {
 #define MAX_WPA_IE_LEN 64
-#define NETWORK_EMPTY_ESSID    (1<<0)
 #define NETWORK_HAS_OFDM       (1<<1)
 #define NETWORK_HAS_CCK        (1<<2)
@@ -1050,11 +936,7 @@ struct ieee80211_device {
        size_t wpa_ie_len;
        u8 *wpa_ie;
-        struct list_head crypt_deinit_list;
+        struct lib80211_crypt_info crypt_info;
-        struct ieee80211_crypt_data *crypt[WEP_KEYS];
-        int tx_keyidx;          /* default TX key index (crypt[tx_keyidx]) */
-        struct timer_list crypt_deinit_timer;
-        int crypt_quiesced;
        int bcrx_sta_key;       /* use individual keys to override default keys even
                                 * with RX of broad/multicast frames */
@@ -1135,22 +1017,6 @@ static inline void *ieee80211_priv(struct net_device *dev)
        return ((struct ieee80211_device *)netdev_priv(dev))->priv;
 }
-static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
-{
-        /* Single white space is for Linksys APs */
-        if (essid_len == 1 && essid[0] == ' ')
-                return 1;
-        /* Otherwise, if the entire essid is 0, we assume it is hidden */
-        while (essid_len) {
-                essid_len--;
-                if (essid[essid_len] != '\0')
-                        return 0;
-        }
-        return 1;
-}
 static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee,
                                          int mode)
 {
@@ -1208,7 +1074,7 @@ static inline int ieee80211_get_hdrlen(u16 fc)
 static inline u8 *ieee80211_get_payload(struct ieee80211_hdr *hdr)
 {
-        switch (ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl))) {
+        switch (ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control))) {
        case IEEE80211_1ADDR_LEN:
                return ((struct ieee80211_hdr_1addr *)hdr)->payload;
        case IEEE80211_2ADDR_LEN:
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index d364fd594ea4..384698cb773a 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -1,7 +1,4 @@
-/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
+/*
-/* $NetBSD: ieee80211_radiotap.h,v 1.11 2005/06/22 06:16:02 dyoung Exp $ */
-/*-
 * Copyright (c) 2003, 2004 David Young.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -42,8 +39,6 @@
 #include <linux/kernel.h>
 #include <asm/unaligned.h>
-/* Radiotap header version (from official NetBSD feed) */
-#define IEEE80211RADIOTAP_VERSION       "1.5"
 /* Base version of the radiotap packet header data */
 #define PKTHDR_RADIOTAP_VERSION         0
@@ -62,12 +57,8 @@
 * readers.
 */
-/* XXX tcpdump/libpcap do not tolerate variable-length headers,
+/*
- * yet, so we pad every radiotap header to 64 bytes. Ugh.
+ * The radio capture header precedes the 802.11 header.
- */
-#define IEEE80211_RADIOTAP_HDRLEN       64
-/* The radio capture header precedes the 802.11 header.
 * All data in the header is little endian on all platforms.
 */
 struct ieee80211_radiotap_header {
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 5cc182f9ecae..f44bb5c77a70 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -41,8 +41,8 @@
 * I'll experiment with dynamic table growth later.
 */
 struct inet_ehash_bucket {
-        struct hlist_head chain;
+        struct hlist_nulls_head chain;
-        struct hlist_head twchain;
+        struct hlist_nulls_head twchain;
 };
 /* There are a few simple rules, which allow for local port reuse by
@@ -77,13 +77,20 @@ struct inet_ehash_bucket {
 * ports are created in O(1) time?  I thought so. ;-)   -DaveM
 */
 struct inet_bind_bucket {
+#ifdef CONFIG_NET_NS
        struct net              *ib_net;
+#endif
        unsigned short          port;
        signed short            fastreuse;
        struct hlist_node       node;
        struct hlist_head       owners;
 };
+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)
@@ -92,6 +99,18 @@ struct inet_bind_hashbucket {
        struct hlist_head       chain;
 };
+/*
+ * Sockets can be hashed in established or listening table
+ * We must use different 'nulls' end-of-chain value for listening
+ * hash table, or we might find a socket that was closed and
+ * reallocated/inserted into established hash table
+ */
+#define LISTENING_NULLS_BASE (1U << 29)
+struct inet_listen_hashbucket {
+        spinlock_t              lock;
+        struct hlist_nulls_head head;
+};
 /* This is for listening sockets, thus all sockets which possess wildcards. */
 #define INET_LHTABLE_SIZE       32      /* Yes, really, this is all you need. */
@@ -104,7 +123,7 @@ struct inet_hashinfo {
         * TIME_WAIT sockets use a separate chain (twchain).
         */
        struct inet_ehash_bucket        *ehash;
-        rwlock_t                        *ehash_locks;
+        spinlock_t                      *ehash_locks;
        unsigned int                    ehash_size;
        unsigned int                    ehash_locks_mask;
@@ -116,22 +135,21 @@ struct inet_hashinfo {
        unsigned int                    bhash_size;
        /* Note : 4 bytes padding on 64 bit arches */
-        /* All sockets in TCP_LISTEN state will be in here.  This is the only
+        struct kmem_cache               *bind_bucket_cachep;
-         * table where wildcard'd TCP sockets can exist.  Hash function here
-         * is just local port number.
-         */
-        struct hlist_head               listening_hash[INET_LHTABLE_SIZE];
        /* All the above members are written once at bootup and
         * never written again _or_ are predominantly read-access.
         *
         * Now align to a new cache line as all the following members
-         * are often dirty.
+         * might be often dirty.
         */
-        rwlock_t                        lhash_lock ____cacheline_aligned;
+        /* All sockets in TCP_LISTEN state will be in here.  This is the only
-        atomic_t                        lhash_users;
+         * table where wildcard'd TCP sockets can exist.  Hash function here
-        wait_queue_head_t               lhash_wait;
+         * is just local port number.
-        struct kmem_cache                       *bind_bucket_cachep;
+         */
+        struct inet_listen_hashbucket   listening_hash[INET_LHTABLE_SIZE]
+                                        ____cacheline_aligned_in_smp;
 };
 static inline struct inet_ehash_bucket *inet_ehash_bucket(
@@ -141,7 +159,7 @@ static inline struct inet_ehash_bucket *inet_ehash_bucket(
        return &hashinfo->ehash[hash & (hashinfo->ehash_size - 1)];
 }
-static inline rwlock_t *inet_ehash_lockp(
+static inline spinlock_t *inet_ehash_lockp(
        struct inet_hashinfo *hashinfo,
        unsigned int hash)
 {
@@ -166,16 +184,16 @@ static inline int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo)
                size = 4096;
        if (sizeof(rwlock_t) != 0) {
 #ifdef CONFIG_NUMA
-                if (size * sizeof(rwlock_t) > PAGE_SIZE)
+                if (size * sizeof(spinlock_t) > PAGE_SIZE)
-                        hashinfo->ehash_locks = vmalloc(size * sizeof(rwlock_t));
+                        hashinfo->ehash_locks = vmalloc(size * sizeof(spinlock_t));
                else
 #endif
-                hashinfo->ehash_locks = kmalloc(size * sizeof(rwlock_t),
+                hashinfo->ehash_locks = kmalloc(size * sizeof(spinlock_t),
                                                GFP_KERNEL);
                if (!hashinfo->ehash_locks)
                        return ENOMEM;
                for (i = 0; i < size; i++)
-                        rwlock_init(&hashinfo->ehash_locks[i]);
+                        spin_lock_init(&hashinfo->ehash_locks[i]);
        }
        hashinfo->ehash_locks_mask = size - 1;
        return 0;
@@ -186,7 +204,7 @@ static inline void inet_ehash_locks_free(struct inet_hashinfo *hashinfo)
        if (hashinfo->ehash_locks) {
 #ifdef CONFIG_NUMA
                unsigned int size = (hashinfo->ehash_locks_mask + 1) *
-                                                        sizeof(rwlock_t);
+                                                        sizeof(spinlock_t);
                if (size > PAGE_SIZE)
                        vfree(hashinfo->ehash_locks);
                else
@@ -229,26 +247,7 @@ extern void __inet_inherit_port(struct sock *sk, struct sock *child);
 extern void inet_put_port(struct sock *sk);
-extern void inet_listen_wlock(struct inet_hashinfo *hashinfo);
+void inet_hashinfo_init(struct inet_hashinfo *h);
-/*
- * - We may sleep inside this lock.
- * - If sleeping is not required (or called from BH),
- *   use plain read_(un)lock(&inet_hashinfo.lhash_lock).
- */
-static inline void inet_listen_lock(struct inet_hashinfo *hashinfo)
-{
-        /* read_lock synchronizes to candidates to writers */
-        read_lock(&hashinfo->lhash_lock);
-        atomic_inc(&hashinfo->lhash_users);
-        read_unlock(&hashinfo->lhash_lock);
-}
-static inline void inet_listen_unlock(struct inet_hashinfo *hashinfo)
-{
-        if (atomic_dec_and_test(&hashinfo->lhash_users))
-                wake_up(&hashinfo->lhash_wait);
-}
 extern void __inet_hash_nolisten(struct sock *sk);
 extern void inet_hash(struct sock *sk);
@@ -299,25 +298,25 @@ typedef __u64 __bitwise __addrpair;
                                   ((__force __u64)(__be32)(__saddr)));
 #endif /* __BIG_ENDIAN */
 #define INET_MATCH(__sk, __net, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
-        (((__sk)->sk_hash == (__hash)) && sock_net((__sk)) == (__net)   &&      \
+        (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net)) &&    \
         ((*((__addrpair *)&(inet_sk(__sk)->daddr))) == (__cookie))     &&      \
         ((*((__portpair *)&(inet_sk(__sk)->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)) && sock_net((__sk)) == (__net)   &&      \
+        (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net)) &&    \
         ((*((__addrpair *)&(inet_twsk(__sk)->tw_daddr))) == (__cookie)) &&     \
         ((*((__portpair *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&      \
         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #else /* 32-bit arch */
 #define INET_ADDR_COOKIE(__name, __saddr, __daddr)
 #define INET_MATCH(__sk, __net, __hash, __cookie, __saddr, __daddr, __ports, __dif)     \
-        (((__sk)->sk_hash == (__hash)) && sock_net((__sk)) == (__net)   &&      \
+        (((__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))      &&      \
         (!((__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)) && sock_net((__sk)) == (__net)   &&      \
+        (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net))       &&      \
         (inet_twsk(__sk)->tw_daddr     == (__saddr))           &&      \
         (inet_twsk(__sk)->tw_rcv_saddr == (__daddr))           &&      \
         ((*((__portpair *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&      \
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 80e4977631b8..4b8ece22b8e9 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -110,7 +110,7 @@ struct inet_timewait_sock {
 #define tw_state                __tw_common.skc_state
 #define tw_reuse                __tw_common.skc_reuse
 #define tw_bound_dev_if         __tw_common.skc_bound_dev_if
-#define tw_node                 __tw_common.skc_node
+#define tw_node                 __tw_common.skc_nulls_node
 #define tw_bind_node            __tw_common.skc_bind_node
 #define tw_refcnt               __tw_common.skc_refcnt
 #define tw_hash                 __tw_common.skc_hash
@@ -137,10 +137,10 @@ struct inet_timewait_sock {
        struct hlist_node       tw_death_node;
 };
-static inline void inet_twsk_add_node(struct inet_timewait_sock *tw,
+static inline void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,
-                                      struct hlist_head *list)
+                                      struct hlist_nulls_head *list)
 {
-        hlist_add_head(&tw->tw_node, list);
+        hlist_nulls_add_head_rcu(&tw->tw_node, list);
 }
 static inline void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,
@@ -175,7 +175,7 @@ static inline int inet_twsk_del_dead_node(struct inet_timewait_sock *tw)
 }
 #define inet_twsk_for_each(tw, node, head) \
-        hlist_for_each_entry(tw, node, head, tw_node)
+        hlist_nulls_for_each_entry(tw, node, head, tw_node)
 #define inet_twsk_for_each_inmate(tw, node, jail) \
        hlist_for_each_entry(tw, node, jail, tw_death_node)
diff --git a/include/net/ip.h b/include/net/ip.h
index bc026ecb513f..10868139e656 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -110,7 +110,7 @@ extern int		ip_append_data(struct sock *sk,
                                                   int odd, struct sk_buff *skb),
                                void *from, int len, int protolen,
                                struct ipcm_cookie *ipc,
-                                struct rtable *rt,
+                                struct rtable **rt,
                                unsigned int flags);
 extern int              ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb);
 extern ssize_t          ip_append_page(struct sock *sk, struct page *page,
@@ -187,6 +187,7 @@ extern void inet_get_local_port_range(int *low, int *high);
 extern int sysctl_ip_default_ttl;
 extern int sysctl_ip_nonlocal_bind;
+extern struct ctl_path net_core_path[];
 extern struct ctl_path net_ipv4_ctl_path[];
 /* From inetpeer.c */
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index fe9fcf73c85e..ab9b003ab671 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -87,12 +87,12 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
        int len;
 #ifdef CONFIG_IP_VS_IPV6
        if (af == AF_INET6)
-                len = snprintf(&buf[*idx], buf_len - *idx, "[" NIP6_FMT "]",
+                len = snprintf(&buf[*idx], buf_len - *idx, "[%pI6]",
-                               NIP6(addr->in6)) + 1;
+                               &addr->in6) + 1;
        else
 #endif
-                len = snprintf(&buf[*idx], buf_len - *idx, NIPQUAD_FMT,
+                len = snprintf(&buf[*idx], buf_len - *idx, "%pI4",
-                               NIPQUAD(addr->ip)) + 1;
+                               &addr->ip) + 1;
        *idx += len;
        BUG_ON(*idx > buf_len + 1);
@@ -503,9 +503,6 @@ struct ip_vs_scheduler {
        char                    *name;          /* scheduler name */
        atomic_t                refcnt;         /* reference counter */
        struct module           *module;        /* THIS_MODULE/NULL */
-#ifdef CONFIG_IP_VS_IPV6
-        int                     supports_ipv6;  /* scheduler has IPv6 support */
-#endif
        /* scheduler initializing service */
        int (*init_service)(struct ip_vs_service *svc);
@@ -916,7 +913,7 @@ static inline __wsum ip_vs_check_diff4(__be32 old, __be32 new, __wsum oldsum)
 {
        __be32 diff[2] = { ~old, new };
-        return csum_partial((char *) diff, sizeof(diff), oldsum);
+        return csum_partial(diff, sizeof(diff), oldsum);
 }
 #ifdef CONFIG_IP_VS_IPV6
@@ -926,7 +923,7 @@ static inline __wsum ip_vs_check_diff16(const __be32 *old, const __be32 *new,
        __be32 diff[8] = { ~old[3], ~old[2], ~old[1], ~old[0],
                            new[3],  new[2],  new[1],  new[0] };
-        return csum_partial((char *) diff, sizeof(diff), oldsum);
+        return csum_partial(diff, sizeof(diff), oldsum);
 }
 #endif
@@ -934,7 +931,7 @@ static inline __wsum ip_vs_check_diff2(__be16 old, __be16 new, __wsum oldsum)
 {
        __be16 diff[2] = { ~old, new };
-        return csum_partial((char *) diff, sizeof(diff), oldsum);
+        return csum_partial(diff, sizeof(diff), oldsum);
 }
 #endif /* __KERNEL__ */
diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h
index 3025ae17ddbe..94c852d47d0f 100644
--- a/include/net/irda/irda_device.h
+++ b/include/net/irda/irda_device.h
@@ -135,9 +135,11 @@ struct dongle_reg {
 /* 
 * Per-packet information we need to hide inside sk_buff 
- * (must not exceed 48 bytes, check with struct sk_buff) 
+ * (must not exceed 48 bytes, check with struct sk_buff)
+ * The default_qdisc_pad field is a temporary hack.
 */
 struct irda_skb_cb {
+        unsigned int default_qdisc_pad;
        magic_t magic;       /* Be sure that we can trust the information */
        __u32   next_speed;  /* The Speed to be set *after* this frame */
        __u16   mtt;         /* Minimum turn around time */
diff --git a/include/net/iucv/iucv.h b/include/net/iucv/iucv.h
index fd70adbb3566..5e310c8d8e2f 100644
--- a/include/net/iucv/iucv.h
+++ b/include/net/iucv/iucv.h
@@ -337,12 +337,35 @@ int iucv_message_purge(struct iucv_path *path, struct iucv_message *msg,
 * established paths. This function will deal with RMDATA messages
 * embedded in struct iucv_message as well.
 *
+ * Locking:     local_bh_enable/local_bh_disable
+ *
 * Returns the result from the CP IUCV call.
 */
 int iucv_message_receive(struct iucv_path *path, struct iucv_message *msg,
                         u8 flags, void *buffer, size_t size, size_t *residual);
 /**
+ * __iucv_message_receive
+ * @path: address of iucv path structure
+ * @msg: address of iucv msg structure
+ * @flags: flags that affect how the message is received (IUCV_IPBUFLST)
+ * @buffer: address of data buffer or address of struct iucv_array
+ * @size: length of data buffer
+ * @residual:
+ *
+ * This function receives messages that are being sent to you over
+ * established paths. This function will deal with RMDATA messages
+ * embedded in struct iucv_message as well.
+ *
+ * Locking:     no locking.
+ *
+ * Returns the result from the CP IUCV call.
+ */
+int __iucv_message_receive(struct iucv_path *path, struct iucv_message *msg,
+                           u8 flags, void *buffer, size_t size,
+                           size_t *residual);
+/**
 * iucv_message_reject
 * @path: address of iucv path structure
 * @msg: address of iucv msg structure
@@ -386,12 +409,34 @@ int iucv_message_reply(struct iucv_path *path, struct iucv_message *msg,
 * transmitted is in a buffer and this is a one-way message and the
 * receiver will not reply to the message.
 *
+ * Locking:     local_bh_enable/local_bh_disable
+ *
 * Returns the result from the CP IUCV call.
 */
 int iucv_message_send(struct iucv_path *path, struct iucv_message *msg,
                      u8 flags, u32 srccls, void *buffer, size_t size);
 /**
+ * __iucv_message_send
+ * @path: address of iucv path structure
+ * @msg: address of iucv msg structure
+ * @flags: how the message is sent (IUCV_IPRMDATA, IUCV_IPPRTY, IUCV_IPBUFLST)
+ * @srccls: source class of message
+ * @buffer: address of data buffer or address of struct iucv_array
+ * @size: length of send buffer
+ *
+ * This function transmits data to another application. Data to be
+ * transmitted is in a buffer and this is a one-way message and the
+ * receiver will not reply to the message.
+ *
+ * Locking:     no locking.
+ *
+ * Returns the result from the CP IUCV call.
+ */
+int __iucv_message_send(struct iucv_path *path, struct iucv_message *msg,
+                        u8 flags, u32 srccls, void *buffer, size_t size);
+/**
 * iucv_message_send2way
 * @path: address of iucv path structure
 * @msg: address of iucv msg structure
diff --git a/include/net/ieee80211_crypt.h b/include/net/lib80211.h
index b3d65e0bedd3..fb4e2784857d 100644
--- a/include/net/ieee80211_crypt.h
+++ b/include/net/lib80211.h
@@ -1,4 +1,11 @@
 /*
+ * lib80211.h -- common bits for IEEE802.11 wireless drivers
+ *
+ * Copyright (c) 2008, John W. Linville <linville@tuxdriver.com>
+ *
+ * Some bits copied from old ieee80211 component, w/ original copyright
+ * notices below:
+ *
 * Original code based on Host AP (software wireless LAN access point) driver
 * for Intersil Prism2/2.5/3.
 *
@@ -11,31 +18,31 @@
 *
 * Copyright (c) 2004, Intel 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. See README and COPYING for
- * more details.
 */
-/*
+#ifndef LIB80211_H
- * This file defines the interface to the ieee80211 crypto module.
+#define LIB80211_H
- */
-#ifndef IEEE80211_CRYPT_H
-#define IEEE80211_CRYPT_H
 #include <linux/types.h>
 #include <linux/list.h>
-#include <net/ieee80211.h>
+#include <linux/module.h>
 #include <asm/atomic.h>
+#include <linux/if.h>
+#include <linux/skbuff.h>
+#include <linux/ieee80211.h>
+#include <linux/timer.h>
+/* print_ssid() is intended to be used in debug (and possibly error)
+ * messages. It should never be used for passing ssid to user space. */
+const char *print_ssid(char *buf, const char *ssid, u8 ssid_len);
+#define DECLARE_SSID_BUF(var) char var[IEEE80211_MAX_SSID_LEN * 4 + 1] __maybe_unused
+#define NUM_WEP_KEYS    4
 enum {
        IEEE80211_CRYPTO_TKIP_COUNTERMEASURES = (1 << 0),
 };
-struct sk_buff;
+struct lib80211_crypto_ops {
-struct module;
-struct ieee80211_crypto_ops {
        const char *name;
        struct list_head list;
@@ -87,22 +94,36 @@ struct ieee80211_crypto_ops {
        struct module *owner;
 };
-struct ieee80211_crypt_data {
+struct lib80211_crypt_data {
        struct list_head list;  /* delayed deletion list */
-        struct ieee80211_crypto_ops *ops;
+        struct lib80211_crypto_ops *ops;
        void *priv;
        atomic_t refcnt;
 };
-struct ieee80211_device;
+struct lib80211_crypt_info {
+        char *name;
-int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops);
+        /* Most clients will already have a lock,
-int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops);
+           so just point to that. */
-struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name);
+        spinlock_t *lock;
-void ieee80211_crypt_deinit_entries(struct ieee80211_device *, int);
-void ieee80211_crypt_deinit_handler(unsigned long);
+        struct lib80211_crypt_data *crypt[NUM_WEP_KEYS];
-void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
+        int tx_keyidx;          /* default TX key index (crypt[tx_keyidx]) */
-                                    struct ieee80211_crypt_data **crypt);
+        struct list_head crypt_deinit_list;
-void ieee80211_crypt_quiescing(struct ieee80211_device *ieee);
+        struct timer_list crypt_deinit_timer;
+        int crypt_quiesced;
+};
-#endif
+int lib80211_crypt_info_init(struct lib80211_crypt_info *info, char *name,
+                                spinlock_t *lock);
+void lib80211_crypt_info_free(struct lib80211_crypt_info *info);
+int lib80211_register_crypto_ops(struct lib80211_crypto_ops *ops);
+int lib80211_unregister_crypto_ops(struct lib80211_crypto_ops *ops);
+struct lib80211_crypto_ops *lib80211_get_crypto_ops(const char *name);
+void lib80211_crypt_deinit_entries(struct lib80211_crypt_info *, int);
+void lib80211_crypt_deinit_handler(unsigned long);
+void lib80211_crypt_delayed_deinit(struct lib80211_crypt_info *info,
+                                    struct lib80211_crypt_data **crypt);
+void lib80211_crypt_quiescing(struct lib80211_crypt_info *info);
+#endif /* LIB80211_H */
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 73d81bc6aa75..b3bd00a9d992 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -3,7 +3,7 @@
 *
 * Copyright 2002-2005, Devicescape Software, Inc.
 * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
- * Copyright 2007       Johannes Berg <johannes@sipsolutions.net>
+ * Copyright 2007-2008  Johannes Berg <johannes@sipsolutions.net>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
@@ -107,7 +107,7 @@ enum ieee80211_max_queues {
 * The information provided in this structure is required for QoS
 * transmit queue configuration. Cf. IEEE 802.11 7.3.2.29.
 *
- * @aifs: arbitration interface space [0..255]
+ * @aifs: arbitration interframe space [0..255]
 * @cw_min: minimum contention window [a value of the form
 *      2^n-1 in the range 1..32767]
 * @cw_max: maximum contention window [like @cw_min]
@@ -164,6 +164,14 @@ enum ieee80211_bss_change {
 };
 /**
+ * struct ieee80211_bss_ht_conf - BSS's changing HT configuration
+ * @operation_mode: HT operation mode (like in &struct ieee80211_ht_info)
+ */
+struct ieee80211_bss_ht_conf {
+        u16 operation_mode;
+};
+/**
 * struct ieee80211_bss_conf - holds the BSS's changing parameters
 *
 * This structure keeps information about a BSS (and an association
@@ -172,15 +180,17 @@ enum ieee80211_bss_change {
 * @assoc: association status
 * @aid: association ID number, valid only when @assoc is true
 * @use_cts_prot: use CTS protection
- * @use_short_preamble: use 802.11b short preamble
+ * @use_short_preamble: use 802.11b short preamble;
- * @use_short_slot: use short slot time (only relevant for ERP)
+ *      if the hardware cannot handle this it must set the
+ *      IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE hardware flag
+ * @use_short_slot: use short slot time (only relevant for ERP);
+ *      if the hardware cannot handle this it must set the
+ *      IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE hardware flag
 * @dtim_period: num of beacons before the next DTIM, for PSM
 * @timestamp: beacon timestamp
 * @beacon_int: beacon interval
 * @assoc_capability: capabilities taken from assoc resp
- * @assoc_ht: association in HT mode
+ * @ht: BSS's HT configuration
- * @ht_conf: ht capabilities
- * @ht_bss_conf: ht extended capabilities
 * @basic_rates: bitmap of basic rates, each bit stands for an
 *      index into the rate table configured by the driver in
 *      the current band.
@@ -198,10 +208,7 @@ struct ieee80211_bss_conf {
        u16 assoc_capability;
        u64 timestamp;
        u64 basic_rates;
-        /* ht related data */
+        struct ieee80211_bss_ht_conf ht;
-        bool assoc_ht;
-        struct ieee80211_ht_info *ht_conf;
-        struct ieee80211_ht_bss_info *ht_bss_conf;
 };
 /**
@@ -210,29 +217,24 @@ 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_USE_RTS_CTS: use RTS-CTS before sending frame
+ * @IEEE80211_TX_CTL_ASSIGN_SEQ: The driver has to assign a sequence
- * @IEEE80211_TX_CTL_USE_CTS_PROTECT: use CTS protection for the frame (e.g.,
+ *      number to this frame, taking care of not overwriting the fragment
- *      for combined 802.11g / 802.11b networks)
+ *      number and increasing the sequence number only when the
+ *      IEEE80211_TX_CTL_FIRST_FRAGMENT flag is set. mac80211 will properly
+ *      assign sequence numbers to QoS-data frames but cannot do so correctly
+ *      for non-QoS-data and management frames because beacons need them from
+ *      that counter as well and mac80211 cannot guarantee proper sequencing.
+ *      If this flag is set, the driver should instruct the hardware to
+ *      assign a sequence number to the frame or assign one itself. Cf. IEEE
+ *      802.11-2007 7.1.3.4.1 paragraph 3. This flag will always be set for
+ *      beacons and always be clear for frames without a sequence number field.
 * @IEEE80211_TX_CTL_NO_ACK: tell the low level not to wait for an ack
- * @IEEE80211_TX_CTL_RATE_CTRL_PROBE: TBD
 * @IEEE80211_TX_CTL_CLEAR_PS_FILT: clear powersave filter for destination
 *      station
- * @IEEE80211_TX_CTL_REQUEUE: TBD
 * @IEEE80211_TX_CTL_FIRST_FRAGMENT: this is a first fragment of the frame
- * @IEEE80211_TX_CTL_SHORT_PREAMBLE: TBD
- * @IEEE80211_TX_CTL_LONG_RETRY_LIMIT: this frame should be send using the
- *      through set_retry_limit configured long retry value
 * @IEEE80211_TX_CTL_SEND_AFTER_DTIM: send this frame after DTIM beacon
 * @IEEE80211_TX_CTL_AMPDU: this frame should be sent as part of an A-MPDU
- * @IEEE80211_TX_CTL_OFDM_HT: this frame can be sent in HT OFDM rates. number
+ * @IEEE80211_TX_CTL_INJECTED: Frame was injected, internal to mac80211.
- *      of streams when this flag is on can be extracted from antenna_sel_tx,
- *      so if 1 antenna is marked use SISO, 2 antennas marked use MIMO, n
- *      antennas marked use MIMO_n.
- * @IEEE80211_TX_CTL_GREEN_FIELD: use green field protection for this frame
- * @IEEE80211_TX_CTL_40_MHZ_WIDTH: send this frame using 40 Mhz channel width
- * @IEEE80211_TX_CTL_DUP_DATA: duplicate data frame on both 20 Mhz channels
- * @IEEE80211_TX_CTL_SHORT_GI: send this frame using short guard interval
- * @IEEE80211_TX_CTL_INJECTED: TBD
 * @IEEE80211_TX_STAT_TX_FILTERED: The frame was not transmitted
 *      because the destination STA was in powersave mode.
 * @IEEE80211_TX_STAT_ACK: Frame was acknowledged
@@ -240,63 +242,67 @@ struct ieee80211_bss_conf {
 *      is for the whole aggregation.
 * @IEEE80211_TX_STAT_AMPDU_NO_BACK: no block ack was returned,
 *      so consider using block ack request (BAR).
- * @IEEE80211_TX_CTL_ASSIGN_SEQ: The driver has to assign a sequence
+ * @IEEE80211_TX_CTL_RATE_CTRL_PROBE: internal to mac80211, can be
- *      number to this frame, taking care of not overwriting the fragment
+ *      set by rate control algorithms to indicate probe rate, will
- *      number and increasing the sequence number only when the
+ *      be cleared for fragmented frames (except on the last fragment)
- *      IEEE80211_TX_CTL_FIRST_FRAGMENT flags is set. mac80211 will properly
- *      assign sequence numbers to QoS-data frames but cannot do so correctly
- *      for non-QoS-data and management frames because beacons need them from
- *      that counter as well and mac80211 cannot guarantee proper sequencing.
- *      If this flag is set, the driver should instruct the hardware to
- *      assign a sequence number to the frame or assign one itself. Cf. IEEE
- *      802.11-2007 7.1.3.4.1 paragraph 3. This flag will always be set for
- *      beacons always be clear for frames without a sequence number field.
 */
 enum mac80211_tx_control_flags {
        IEEE80211_TX_CTL_REQ_TX_STATUS          = BIT(0),
-        IEEE80211_TX_CTL_USE_RTS_CTS            = BIT(2),
+        IEEE80211_TX_CTL_ASSIGN_SEQ             = BIT(1),
-        IEEE80211_TX_CTL_USE_CTS_PROTECT        = BIT(3),
+        IEEE80211_TX_CTL_NO_ACK                 = BIT(2),
-        IEEE80211_TX_CTL_NO_ACK                 = BIT(4),
+        IEEE80211_TX_CTL_CLEAR_PS_FILT          = BIT(3),
-        IEEE80211_TX_CTL_RATE_CTRL_PROBE        = BIT(5),
+        IEEE80211_TX_CTL_FIRST_FRAGMENT         = BIT(4),
-        IEEE80211_TX_CTL_CLEAR_PS_FILT          = BIT(6),
+        IEEE80211_TX_CTL_SEND_AFTER_DTIM        = BIT(5),
-        IEEE80211_TX_CTL_REQUEUE                = BIT(7),
+        IEEE80211_TX_CTL_AMPDU                  = BIT(6),
-        IEEE80211_TX_CTL_FIRST_FRAGMENT         = BIT(8),
+        IEEE80211_TX_CTL_INJECTED               = BIT(7),
-        IEEE80211_TX_CTL_SHORT_PREAMBLE         = BIT(9),
+        IEEE80211_TX_STAT_TX_FILTERED           = BIT(8),
-        IEEE80211_TX_CTL_LONG_RETRY_LIMIT       = BIT(10),
+        IEEE80211_TX_STAT_ACK                   = BIT(9),
-        IEEE80211_TX_CTL_SEND_AFTER_DTIM        = BIT(12),
+        IEEE80211_TX_STAT_AMPDU                 = BIT(10),
-        IEEE80211_TX_CTL_AMPDU                  = BIT(13),
+        IEEE80211_TX_STAT_AMPDU_NO_BACK         = BIT(11),
-        IEEE80211_TX_CTL_OFDM_HT                = BIT(14),
+        IEEE80211_TX_CTL_RATE_CTRL_PROBE        = BIT(12),
-        IEEE80211_TX_CTL_GREEN_FIELD            = BIT(15),
+};
-        IEEE80211_TX_CTL_40_MHZ_WIDTH           = BIT(16),
-        IEEE80211_TX_CTL_DUP_DATA               = BIT(17),
+enum mac80211_rate_control_flags {
-        IEEE80211_TX_CTL_SHORT_GI               = BIT(18),
+        IEEE80211_TX_RC_USE_RTS_CTS             = BIT(0),
-        IEEE80211_TX_CTL_INJECTED               = BIT(19),
+        IEEE80211_TX_RC_USE_CTS_PROTECT         = BIT(1),
-        IEEE80211_TX_STAT_TX_FILTERED           = BIT(20),
+        IEEE80211_TX_RC_USE_SHORT_PREAMBLE      = BIT(2),
-        IEEE80211_TX_STAT_ACK                   = BIT(21),
-        IEEE80211_TX_STAT_AMPDU                 = BIT(22),
+        /* rate index is an MCS rate number instead of an index */
-        IEEE80211_TX_STAT_AMPDU_NO_BACK         = BIT(23),
+        IEEE80211_TX_RC_MCS                     = BIT(3),
-        IEEE80211_TX_CTL_ASSIGN_SEQ             = BIT(24),
+        IEEE80211_TX_RC_GREEN_FIELD             = BIT(4),
+        IEEE80211_TX_RC_40_MHZ_WIDTH            = BIT(5),
+        IEEE80211_TX_RC_DUP_DATA                = BIT(6),
+        IEEE80211_TX_RC_SHORT_GI                = BIT(7),
 };
-#define IEEE80211_TX_INFO_DRIVER_DATA_SIZE \
+/* there are 40 bytes if you don't need the rateset to be kept */
-        (sizeof(((struct sk_buff *)0)->cb) - 8)
+#define IEEE80211_TX_INFO_DRIVER_DATA_SIZE 40
-#define IEEE80211_TX_INFO_DRIVER_DATA_PTRS \
-        (IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *))
-/* maximum number of alternate rate retry stages */
+/* if you do need the rateset, then you have less space */
-#define IEEE80211_TX_MAX_ALTRATE        3
+#define IEEE80211_TX_INFO_RATE_DRIVER_DATA_SIZE 24
+/* maximum number of rate stages */
+#define IEEE80211_TX_MAX_RATES  5
 /**
- * struct ieee80211_tx_altrate - alternate rate selection/status
+ * struct ieee80211_tx_rate - rate selection/status
+ *
+ * @idx: rate index to attempt to send with
+ * @flags: rate control flags (&enum mac80211_rate_control_flags)
+ * @count: number of tries in this rate before going to the next rate
 *
- * @rate_idx: rate index to attempt to send with
+ * A value of -1 for @idx indicates an invalid rate and, if used
- * @limit: number of retries before fallback
+ * in an array of retry rates, that no more rates should be tried.
+ *
+ * When used for transmit status reporting, the driver should
+ * always report the rate along with the flags it used.
 */
-struct ieee80211_tx_altrate {
+struct ieee80211_tx_rate {
-        s8 rate_idx;
+        s8 idx;
-        u8 limit;
+        u8 count;
-};
+        u8 flags;
+} __attribute__((packed));
 /**
 * struct ieee80211_tx_info - skb transmit information
@@ -310,15 +316,13 @@ struct ieee80211_tx_altrate {
 * it may be NULL.
 *
 * @flags: transmit info flags, defined above
- * @band: TBD
+ * @band: the band to transmit on (use for checking for races)
- * @tx_rate_idx: TBD
+ * @antenna_sel_tx: antenna to use, 0 for automatic diversity
- * @antenna_sel_tx: TBD
+ * @pad: padding, ignore
 * @control: union for control data
 * @status: union for status data
 * @driver_data: array of driver_data pointers
 * @retry_count: number of retries
- * @excessive_retries: set to 1 if the frame was retried many times
- *      but not acknowledged
 * @ampdu_ack_len: number of aggregated frames.
 *      relevant only if IEEE80211_TX_STATUS_AMPDU was set.
 * @ampdu_ack_map: block ack bit map for the aggregation.
@@ -329,31 +333,44 @@ struct ieee80211_tx_info {
        /* common information */
        u32 flags;
        u8 band;
-        s8 tx_rate_idx;
        u8 antenna_sel_tx;
-        /* 1 byte hole */
+        /* 2 byte hole */
+        u8 pad[2];
        union {
                struct {
+                        union {
+                                /* rate control */
+                                struct {
+                                        struct ieee80211_tx_rate rates[
+                                                IEEE80211_TX_MAX_RATES];
+                                        s8 rts_cts_rate_idx;
+                                };
+                                /* only needed before rate control */
+                                unsigned long jiffies;
+                        };
                        /* NB: vif can be NULL for injected frames */
                        struct ieee80211_vif *vif;
                        struct ieee80211_key_conf *hw_key;
                        struct ieee80211_sta *sta;
-                        unsigned long jiffies;
-                        s8 rts_cts_rate_idx;
-                        u8 retry_limit;
-                        struct ieee80211_tx_altrate retries[IEEE80211_TX_MAX_ALTRATE];
                } control;
                struct {
+                        struct ieee80211_tx_rate rates[IEEE80211_TX_MAX_RATES];
+                        u8 ampdu_ack_len;
                        u64 ampdu_ack_map;
                        int ack_signal;
-                        struct ieee80211_tx_altrate retries[IEEE80211_TX_MAX_ALTRATE + 1];
+                        /* 8 bytes free */
-                        u8 retry_count;
-                        bool excessive_retries;
-                        u8 ampdu_ack_len;
                } status;
-                void *driver_data[IEEE80211_TX_INFO_DRIVER_DATA_PTRS];
+                struct {
+                        struct ieee80211_tx_rate driver_rates[
+                                IEEE80211_TX_MAX_RATES];
+                        void *rate_driver_data[
+                                IEEE80211_TX_INFO_RATE_DRIVER_DATA_SIZE / sizeof(void *)];
+                };
+                void *driver_data[
+                        IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *)];
        };
 };
@@ -362,6 +379,41 @@ static inline struct ieee80211_tx_info *IEEE80211_SKB_CB(struct sk_buff *skb)
        return (struct ieee80211_tx_info *)skb->cb;
 }
+/**
+ * ieee80211_tx_info_clear_status - clear TX status
+ *
+ * @info: The &struct ieee80211_tx_info to be cleared.
+ *
+ * When the driver passes an skb back to mac80211, it must report
+ * a number of things in TX status. This function clears everything
+ * in the TX status but the rate control information (it does clear
+ * the count since you need to fill that in anyway).
+ *
+ * NOTE: You can only use this function if you do NOT use
+ *       info->driver_data! Use info->rate_driver_data
+ *       instead if you need only the less space that allows.
+ */
+static inline void
+ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
+{
+        int i;
+        BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates) !=
+                     offsetof(struct ieee80211_tx_info, control.rates));
+        BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates) !=
+                     offsetof(struct ieee80211_tx_info, driver_rates));
+        BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates) != 8);
+        /* clear the rate counts */
+        for (i = 0; i < IEEE80211_TX_MAX_RATES; i++)
+                info->status.rates[i].count = 0;
+        BUILD_BUG_ON(
+            offsetof(struct ieee80211_tx_info, status.ampdu_ack_len) != 23);
+        memset(&info->status.ampdu_ack_len, 0,
+               sizeof(struct ieee80211_tx_info) -
+               offsetof(struct ieee80211_tx_info, status.ampdu_ack_len));
+}
 /**
 * enum mac80211_rx_flags - receive flags
@@ -384,6 +436,9 @@ static inline struct ieee80211_tx_info *IEEE80211_SKB_CB(struct sk_buff *skb)
 *      is valid. This is useful in monitor mode and necessary for beacon frames
 *      to enable IBSS merging.
 * @RX_FLAG_SHORTPRE: Short preamble was used for this frame
+ * @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
 */
 enum mac80211_rx_flags {
        RX_FLAG_MMIC_ERROR      = 1<<0,
@@ -394,7 +449,10 @@ enum mac80211_rx_flags {
        RX_FLAG_FAILED_FCS_CRC  = 1<<5,
        RX_FLAG_FAILED_PLCP_CRC = 1<<6,
        RX_FLAG_TSFT            = 1<<7,
-        RX_FLAG_SHORTPRE        = 1<<8
+        RX_FLAG_SHORTPRE        = 1<<8,
+        RX_FLAG_HT              = 1<<9,
+        RX_FLAG_40MHZ           = 1<<10,
+        RX_FLAG_SHORT_GI        = 1<<11,
 };
 /**
@@ -414,7 +472,8 @@ enum mac80211_rx_flags {
 * @noise: noise when receiving this frame, in dBm.
 * @qual: overall signal quality indication, in percent (0-100).
 * @antenna: antenna used
- * @rate_idx: index of data rate into band's supported rates
+ * @rate_idx: index of data rate into band's supported rates or MCS index if
+ *      HT rates are use (RX_FLAG_HT)
 * @flag: %RX_FLAG_*
 */
 struct ieee80211_rx_status {
@@ -434,21 +493,49 @@ struct ieee80211_rx_status {
 *
 * Flags to define PHY configuration options
 *
- * @IEEE80211_CONF_SHORT_SLOT_TIME: use 802.11g short slot time
 * @IEEE80211_CONF_RADIOTAP: add radiotap header at receive time (if supported)
- * @IEEE80211_CONF_SUPPORT_HT_MODE: use 802.11n HT capabilities (if supported)
 * @IEEE80211_CONF_PS: Enable 802.11 power save mode
 */
 enum ieee80211_conf_flags {
-        /*
+        IEEE80211_CONF_RADIOTAP         = (1<<0),
-         * TODO: IEEE80211_CONF_SHORT_SLOT_TIME will be removed once drivers
+        IEEE80211_CONF_PS               = (1<<1),
-         * have been converted to use bss_info_changed() for slot time
+};
-         * configuration
-         */
+/* XXX: remove all this once drivers stop trying to use it */
-        IEEE80211_CONF_SHORT_SLOT_TIME  = (1<<0),
+static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void)
-        IEEE80211_CONF_RADIOTAP         = (1<<1),
+{
-        IEEE80211_CONF_SUPPORT_HT_MODE  = (1<<2),
+        return 0;
-        IEEE80211_CONF_PS               = (1<<3),
+}
+#define IEEE80211_CONF_SHORT_SLOT_TIME (__IEEE80211_CONF_SHORT_SLOT_TIME())
+struct ieee80211_ht_conf {
+        bool enabled;
+        enum nl80211_channel_type channel_type;
+};
+/**
+ * enum ieee80211_conf_changed - denotes which configuration changed
+ *
+ * @IEEE80211_CONF_CHANGE_RADIO_ENABLED: the value of radio_enabled changed
+ * @IEEE80211_CONF_CHANGE_BEACON_INTERVAL: the beacon interval changed
+ * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed
+ * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed
+ * @IEEE80211_CONF_CHANGE_PS: the PS flag changed
+ * @IEEE80211_CONF_CHANGE_POWER: the TX power changed
+ * @IEEE80211_CONF_CHANGE_CHANNEL: the channel changed
+ * @IEEE80211_CONF_CHANGE_RETRY_LIMITS: retry limits changed
+ * @IEEE80211_CONF_CHANGE_HT: HT configuration changed
+ */
+enum ieee80211_conf_changed {
+        IEEE80211_CONF_CHANGE_RADIO_ENABLED     = BIT(0),
+        IEEE80211_CONF_CHANGE_BEACON_INTERVAL   = BIT(1),
+        IEEE80211_CONF_CHANGE_LISTEN_INTERVAL   = BIT(2),
+        IEEE80211_CONF_CHANGE_RADIOTAP          = BIT(3),
+        IEEE80211_CONF_CHANGE_PS                = BIT(4),
+        IEEE80211_CONF_CHANGE_POWER             = BIT(5),
+        IEEE80211_CONF_CHANGE_CHANNEL           = BIT(6),
+        IEEE80211_CONF_CHANGE_RETRY_LIMITS      = BIT(7),
+        IEEE80211_CONF_CHANGE_HT                = BIT(8),
 };
 /**
@@ -457,34 +544,31 @@ enum ieee80211_conf_flags {
 * This struct indicates how the driver shall configure the hardware.
 *
 * @radio_enabled: when zero, driver is required to switch off the radio.
- *      TODO make a flag
 * @beacon_int: beacon interval (TODO make interface config)
 * @listen_interval: listen interval in units of beacon interval
 * @flags: configuration flags defined above
 * @power_level: requested transmit power (in dBm)
- * @max_antenna_gain: maximum antenna gain (in dBi)
- * @antenna_sel_tx: transmit antenna selection, 0: default/diversity,
- *      1/2: antenna 0/1
- * @antenna_sel_rx: receive antenna selection, like @antenna_sel_tx
- * @ht_conf: describes current self configuration of 802.11n HT capabilies
- * @ht_bss_conf: describes current BSS configuration of 802.11n HT parameters
 * @channel: the channel to tune to
+ * @ht: the HT configuration for the device
+ * @long_frame_max_tx_count: Maximum number of transmissions for a "long" frame
+ *    (a frame not RTS protected), called "dot11LongRetryLimit" in 802.11,
+ *    but actually means the number of transmissions not the number of retries
+ * @short_frame_max_tx_count: Maximum number of transmissions for a "short"
+ *    frame, called "dot11ShortRetryLimit" in 802.11, but actually means the
+ *    number of transmissions not the number of retries
 */
 struct ieee80211_conf {
-        int radio_enabled;
        int beacon_int;
-        u16 listen_interval;
        u32 flags;
        int power_level;
-        int max_antenna_gain;
-        u8 antenna_sel_tx;
-        u8 antenna_sel_rx;
-        struct ieee80211_channel *channel;
+        u16 listen_interval;
+        bool radio_enabled;
+        u8 long_frame_max_tx_count, short_frame_max_tx_count;
-        struct ieee80211_ht_info ht_conf;
+        struct ieee80211_channel *channel;
-        struct ieee80211_ht_bss_info ht_bss_conf;
+        struct ieee80211_ht_conf ht;
 };
 /**
@@ -494,11 +578,14 @@ struct ieee80211_conf {
 * use during the life of a virtual interface.
 *
 * @type: type of this virtual interface
+ * @bss_conf: BSS configuration for this interface, either our own
+ *      or the BSS we're associated to
 * @drv_priv: data area for driver use, will always be aligned to
 *      sizeof(void *).
 */
 struct ieee80211_vif {
        enum nl80211_iftype type;
+        struct ieee80211_bss_conf bss_conf;
        /* must be last */
        u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
 };
@@ -542,14 +629,12 @@ struct ieee80211_if_init_conf {
 * enum ieee80211_if_conf_change - interface config change flags
 *
 * @IEEE80211_IFCC_BSSID: The BSSID changed.
- * @IEEE80211_IFCC_SSID: The SSID changed.
 * @IEEE80211_IFCC_BEACON: The beacon for this interface changed
 *      (currently AP and MESH only), use ieee80211_beacon_get().
 */
 enum ieee80211_if_conf_change {
        IEEE80211_IFCC_BSSID    = BIT(0),
-        IEEE80211_IFCC_SSID     = BIT(1),
+        IEEE80211_IFCC_BEACON   = BIT(1),
-        IEEE80211_IFCC_BEACON   = BIT(2),
 };
 /**
@@ -557,11 +642,6 @@ enum ieee80211_if_conf_change {
 *
 * @changed: parameters that have changed, see &enum ieee80211_if_conf_change.
 * @bssid: BSSID of the network we are associated to/creating.
- * @ssid: used (together with @ssid_len) by drivers for hardware that
- *      generate beacons independently. The pointer is valid only during the
- *      config_interface() call, so copy the value somewhere if you need
- *      it.
- * @ssid_len: length of the @ssid field.
 *
 * This structure is passed to the config_interface() callback of
 * &struct ieee80211_hw.
@@ -569,8 +649,6 @@ enum ieee80211_if_conf_change {
 struct ieee80211_if_conf {
        u32 changed;
        u8 *bssid;
-        u8 *ssid;
-        size_t ssid_len;
 };
 /**
@@ -677,7 +755,7 @@ enum set_key_cmd {
 * @addr: MAC address
 * @aid: AID we assigned to the station if we're an AP
 * @supp_rates: Bitmap of supported rates (per band)
- * @ht_info: HT capabilities of this STA
+ * @ht_cap: HT capabilities of this STA; restricted to our own TX capabilities
 * @drv_priv: data area for driver use, will always be aligned to
 *      sizeof(void *), size is determined in hw information.
 */
@@ -685,7 +763,7 @@ struct ieee80211_sta {
        u64 supp_rates[IEEE80211_NUM_BANDS];
        u8 addr[ETH_ALEN];
        u16 aid;
-        struct ieee80211_ht_info ht_info;
+        struct ieee80211_sta_ht_cap ht_cap;
        /* must be last */
        u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
@@ -695,13 +773,17 @@ struct ieee80211_sta {
 * enum sta_notify_cmd - sta notify command
 *
 * Used with the sta_notify() callback in &struct ieee80211_ops, this
- * indicates addition and removal of a station to station table.
+ * indicates addition and removal of a station to station table,
+ * or if a associated station made a power state transition.
 *
 * @STA_NOTIFY_ADD: a station was added to the station table
 * @STA_NOTIFY_REMOVE: a station being removed from the station table
+ * @STA_NOTIFY_SLEEP: a station is now sleeping
+ * @STA_NOTIFY_AWAKE: a sleeping station woke up
 */
 enum sta_notify_cmd {
-        STA_NOTIFY_ADD, STA_NOTIFY_REMOVE
+        STA_NOTIFY_ADD, STA_NOTIFY_REMOVE,
+        STA_NOTIFY_SLEEP, STA_NOTIFY_AWAKE,
 };
 /**
@@ -769,6 +851,14 @@ enum ieee80211_tkip_key_type {
 * @IEEE80211_HW_SPECTRUM_MGMT:
 *      Hardware supports spectrum management defined in 802.11h
 *      Measurement, Channel Switch, Quieting, TPC
+ *
+ * @IEEE80211_HW_AMPDU_AGGREGATION:
+ *      Hardware supports 11n A-MPDU aggregation.
+ *
+ * @IEEE80211_HW_NO_STACK_DYNAMIC_PS:
+ *      Hardware which has dynamic power save support, meaning
+ *      that power save is enabled in idle periods, and don't need support
+ *      from stack.
 */
 enum ieee80211_hw_flags {
        IEEE80211_HW_RX_INCLUDES_FCS                    = 1<<1,
@@ -780,6 +870,8 @@ enum ieee80211_hw_flags {
        IEEE80211_HW_SIGNAL_DBM                         = 1<<7,
        IEEE80211_HW_NOISE_DBM                          = 1<<8,
        IEEE80211_HW_SPECTRUM_MGMT                      = 1<<9,
+        IEEE80211_HW_AMPDU_AGGREGATION                  = 1<<10,
+        IEEE80211_HW_NO_STACK_DYNAMIC_PS                = 1<<11,
 };
 /**
@@ -838,8 +930,8 @@ enum ieee80211_hw_flags {
 * @sta_data_size: size (in bytes) of the drv_priv data area
 *      within &struct ieee80211_sta.
 *
- * @max_altrates: maximum number of alternate rate retry stages
+ * @max_rates: maximum number of alternate rate retry stages
- * @max_altrate_tries: maximum number of tries for each stage
+ * @max_rate_tries: maximum number of tries for each stage
 */
 struct ieee80211_hw {
        struct ieee80211_conf conf;
@@ -856,12 +948,10 @@ struct ieee80211_hw {
        u16 ampdu_queues;
        u16 max_listen_interval;
        s8 max_signal;
-        u8 max_altrates;
+        u8 max_rates;
-        u8 max_altrate_tries;
+        u8 max_rate_tries;
 };
-struct ieee80211_hw *wiphy_to_hw(struct wiphy *wiphy);
 /**
 * SET_IEEE80211_DEV - set device for 802.11 hardware
 *
@@ -874,7 +964,7 @@ static inline void SET_IEEE80211_DEV(struct ieee80211_hw *hw, struct device *dev
 }
 /**
- * SET_IEEE80211_PERM_ADDR - set the permanenet MAC address for 802.11 hardware
+ * SET_IEEE80211_PERM_ADDR - set the permanent MAC address for 802.11 hardware
 *
 * @hw: the &struct ieee80211_hw to set the MAC address for
 * @addr: the address to set
@@ -898,9 +988,9 @@ static inline struct ieee80211_rate *
 ieee80211_get_tx_rate(const struct ieee80211_hw *hw,
                      const struct ieee80211_tx_info *c)
 {
-        if (WARN_ON(c->tx_rate_idx < 0))
+        if (WARN_ON(c->control.rates[0].idx < 0))
                return NULL;
-        return &hw->wiphy->bands[c->band]->bitrates[c->tx_rate_idx];
+        return &hw->wiphy->bands[c->band]->bitrates[c->control.rates[0].idx];
 }
 static inline struct ieee80211_rate *
@@ -916,9 +1006,9 @@ static inline struct ieee80211_rate *
 ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
                             const struct ieee80211_tx_info *c, int idx)
 {
-        if (c->control.retries[idx].rate_idx < 0)
+        if (c->control.rates[idx + 1].idx < 0)
                return NULL;
-        return &hw->wiphy->bands[c->band]->bitrates[c->control.retries[idx].rate_idx];
+        return &hw->wiphy->bands[c->band]->bitrates[c->control.rates[idx + 1].idx];
 }
 /**
@@ -967,7 +1057,7 @@ ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
 * This happens everytime the iv16 wraps around (every 65536 packets). The
 * set_key() call will happen only once for each key (unless the AP did
 * rekeying), it will not include a valid phase 1 key. The valid phase 1 key is
- * provided by udpate_tkip_key only. The trigger that makes mac80211 call this
+ * provided by update_tkip_key only. The trigger that makes mac80211 call this
 * handler is software decryption with wrap around of iv16.
 */
@@ -1060,12 +1150,14 @@ enum ieee80211_filter_flags {
 * @IEEE80211_AMPDU_RX_STOP: stop Rx aggregation
 * @IEEE80211_AMPDU_TX_START: start Tx aggregation
 * @IEEE80211_AMPDU_TX_STOP: stop Tx aggregation
+ * @IEEE80211_AMPDU_TX_RESUME: resume TX aggregation
 */
 enum ieee80211_ampdu_mlme_action {
        IEEE80211_AMPDU_RX_START,
        IEEE80211_AMPDU_RX_STOP,
        IEEE80211_AMPDU_TX_START,
        IEEE80211_AMPDU_TX_STOP,
+        IEEE80211_AMPDU_TX_RESUME,
 };
 /**
@@ -1101,7 +1193,7 @@ enum ieee80211_ampdu_mlme_action {
 *      Must be implemented.
 *
 * @add_interface: Called when a netdevice attached to the hardware is
- *      enabled. Because it is not called for monitor mode devices, @open
+ *      enabled. Because it is not called for monitor mode devices, @start
 *      and @stop must be implemented.
 *      The driver should perform any initialization it needs before
 *      the device can be enabled. The initial configuration for the
@@ -1163,14 +1255,9 @@ enum ieee80211_ampdu_mlme_action {
 *
 * @set_rts_threshold: Configuration of RTS threshold (if device needs it)
 *
- * @set_frag_threshold: Configuration of fragmentation threshold. Assign this if
+ * @sta_notify: Notifies low level driver about addition, removal or power
- *      the device does fragmentation by itself; if this method is assigned then
+ *      state transition of an associated station, AP,  IBSS/WDS/mesh peer etc.
- *      the stack will not do fragmentation.
+ *      Must be atomic.
- *
- * @set_retry_limit: Configuration of retry limits (if device needs it)
- *
- * @sta_notify: Notifies low level driver about addition or removal
- *      of assocaited station or AP.
 *
 * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
 *      bursting) for a hardware TX queue.
@@ -1194,8 +1281,6 @@ enum ieee80211_ampdu_mlme_action {
 *      This is needed only for IBSS mode and the result of this function is
 *      used to determine whether to reply to Probe Requests.
 *
- * @conf_ht: Configures low level driver with 802.11n HT data. Must be atomic.
- *
 * @ampdu_action: Perform a certain A-MPDU action
 *      The RA/TID combination determines the destination and TID we want
 *      the ampdu action to be performed for. The action is defined through
@@ -1211,7 +1296,7 @@ struct ieee80211_ops {
                             struct ieee80211_if_init_conf *conf);
        void (*remove_interface)(struct ieee80211_hw *hw,
                                 struct ieee80211_if_init_conf *conf);
-        int (*config)(struct ieee80211_hw *hw, struct ieee80211_conf *conf);
+        int (*config)(struct ieee80211_hw *hw, u32 changed);
        int (*config_interface)(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif,
                                struct ieee80211_if_conf *conf);
@@ -1237,9 +1322,6 @@ struct ieee80211_ops {
        void (*get_tkip_seq)(struct ieee80211_hw *hw, u8 hw_key_idx,
                             u32 *iv32, u16 *iv16);
        int (*set_rts_threshold)(struct ieee80211_hw *hw, u32 value);
-        int (*set_frag_threshold)(struct ieee80211_hw *hw, u32 value);
-        int (*set_retry_limit)(struct ieee80211_hw *hw,
-                               u32 short_retry, u32 long_retr);
        void (*sta_notify)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                        enum sta_notify_cmd, struct ieee80211_sta *sta);
        int (*conf_tx)(struct ieee80211_hw *hw, u16 queue,
@@ -1472,7 +1554,7 @@ void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
 * 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 of freeing it.
+ * is responsible for freeing it.
 */
 struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
                                     struct ieee80211_vif *vif);
@@ -1803,24 +1885,38 @@ struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_hw *hw,
 /* Rate control API */
 /**
- * struct rate_selection - rate information for/from rate control algorithms
+ * struct ieee80211_tx_rate_control - rate control information for/from RC algo
- *
+ *
- * @rate_idx: selected transmission rate index
+ * @hw: The hardware the algorithm is invoked for.
- * @nonerp_idx: Non-ERP rate to use instead if ERP cannot be used
+ * @sband: The band this frame is being transmitted on.
- * @probe_idx: rate for probing (or -1)
+ * @bss_conf: the current BSS configuration
- * @max_rate_idx: maximum rate index that can be used, this is
+ * @reported_rate: The rate control algorithm can fill this in to indicate
- *      input to the algorithm and will be enforced
+ *      which rate should be reported to userspace as the current rate and
- */
+ *      used for rate calculations in the mesh network.
-struct rate_selection {
+ * @rts: whether RTS will be used for this frame because it is longer than the
-        s8 rate_idx, nonerp_idx, probe_idx, max_rate_idx;
+ *      RTS threshold
+ * @short_preamble: whether mac80211 will request short-preamble transmission
+ *      if the selected rate supports it
+ * @max_rate_idx: user-requested maximum rate (not MCS for now)
+ * @skb: the skb that will be transmitted, the control information in it needs
+ *      to be filled in
+ */
+struct ieee80211_tx_rate_control {
+        struct ieee80211_hw *hw;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_bss_conf *bss_conf;
+        struct sk_buff *skb;
+        struct ieee80211_tx_rate reported_rate;
+        bool rts, short_preamble;
+        u8 max_rate_idx;
 };
 struct rate_control_ops {
        struct module *module;
        const char *name;
        void *(*alloc)(struct ieee80211_hw *hw, struct dentry *debugfsdir);
-        void (*clear)(void *priv);
        void (*free)(void *priv);
        void *(*alloc_sta)(void *priv, struct ieee80211_sta *sta, gfp_t gfp);
@@ -1832,10 +1928,8 @@ struct rate_control_ops {
        void (*tx_status)(void *priv, struct ieee80211_supported_band *sband,
                          struct ieee80211_sta *sta, void *priv_sta,
                          struct sk_buff *skb);
-        void (*get_rate)(void *priv, struct ieee80211_supported_band *sband,
+        void (*get_rate)(void *priv, struct ieee80211_sta *sta, void *priv_sta,
-                         struct ieee80211_sta *sta, void *priv_sta,
+                         struct ieee80211_tx_rate_control *txrc);
-                         struct sk_buff *skb,
-                         struct rate_selection *sel);
        void (*add_sta_debugfs)(void *priv, void *priv_sta,
                                struct dentry *dir);
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 11dd0137c6a5..ce532f2222ce 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -108,6 +108,20 @@ extern void			ndisc_send_redirect(struct sk_buff *skb,
 extern int                      ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *dev, int dir);
+extern struct sk_buff           *ndisc_build_skb(struct net_device *dev,
+                                                 const struct in6_addr *daddr,
+                                                 const struct in6_addr *saddr,
+                                                 struct icmp6hdr *icmp6h,
+                                                 const struct in6_addr *target,
+                                                 int llinfo);
+extern void                     ndisc_send_skb(struct sk_buff *skb,
+                                               struct net_device *dev,
+                                               struct neighbour *neigh,
+                                               const struct in6_addr *daddr,
+                                               const struct in6_addr *saddr,
+                                               struct icmp6hdr *icmp6h);
 /*
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index aa4b708654a4..d8d790e56d3d 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -180,9 +180,6 @@ struct neigh_table
        __u32                   hash_rnd;
        unsigned int            hash_chain_gc;
        struct pneigh_entry     **phash_buckets;
-#ifdef CONFIG_PROC_FS
-        struct proc_dir_entry   *pde;
-#endif
 };
 /* flags for neigh_update() */
@@ -223,11 +220,7 @@ extern void			neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *p
 static inline
 struct net                      *neigh_parms_net(const struct neigh_parms *parms)
 {
-#ifdef CONFIG_NET_NS
+        return read_pnet(&parms->net);
-        return parms->net;
-#else
-        return &init_net;
-#endif
 }
 extern unsigned long            neigh_rand_reach_time(unsigned long base);
@@ -244,11 +237,7 @@ extern int			pneigh_delete(struct neigh_table *tbl, struct net *net, const void
 static inline
 struct net                      *pneigh_net(const struct pneigh_entry *pneigh)
 {
-#ifdef CONFIG_NET_NS
+        return read_pnet(&pneigh->net);
-        return pneigh->net;
-#else
-        return &init_net;
-#endif
 }
 extern void neigh_app_ns(struct neighbour *n);
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 700c53a3c6fa..6fc13d905c5f 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -19,6 +19,7 @@
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 #include <net/netns/conntrack.h>
 #endif
+#include <net/netns/xfrm.h>
 struct proc_dir_entry;
 struct net_device;
@@ -74,6 +75,9 @@ struct net {
        struct netns_ct         ct;
 #endif
 #endif
+#ifdef CONFIG_XFRM
+        struct netns_xfrm       xfrm;
+#endif
        struct net_generic      *gen;
 };
@@ -192,6 +196,24 @@ static inline void release_net(struct net *net)
 }
 #endif
+#ifdef CONFIG_NET_NS
+static inline void write_pnet(struct net **pnet, struct net *net)
+{
+        *pnet = net;
+}
+static inline struct net *read_pnet(struct net * const *pnet)
+{
+        return *pnet;
+}
+#else
+#define write_pnet(pnet, net)   do { (void)(net);} while (0)
+#define read_pnet(pnet)         (&init_net)
+#endif
 #define for_each_net(VAR)                               \
        list_for_each_entry(VAR, &net_namespace_list, list)
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index b76a8685b5b5..2e0c53641cbe 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -199,7 +199,7 @@ __nf_conntrack_find(struct net *net, const struct nf_conntrack_tuple *tuple);
 extern void nf_conntrack_hash_insert(struct nf_conn *ct);
-extern void nf_conntrack_flush(struct net *net);
+extern void nf_conntrack_flush(struct net *net, u32 pid, int report);
 extern bool nf_ct_get_tuplepr(const struct sk_buff *skb,
                              unsigned int nhoff, u_int16_t l3num,
@@ -298,5 +298,8 @@ do {							\
        local_bh_enable();                              \
 } while (0)
+#define MODULE_ALIAS_NFCT_HELPER(helper) \
+        MODULE_ALIAS("nfct-helper-" helper)
 #endif /* __KERNEL__ */
 #endif /* _NF_CONNTRACK_H */
diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h
index 1285ff26a014..0ff0dc69ca4a 100644
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/include/net/netfilter/nf_conntrack_ecache.h
@@ -17,6 +17,13 @@ struct nf_conntrack_ecache {
        unsigned int events;
 };
+/* This structure is passed to event handler */
+struct nf_ct_event {
+        struct nf_conn *ct;
+        u32 pid;
+        int report;
+};
 extern struct atomic_notifier_head nf_conntrack_chain;
 extern int nf_conntrack_register_notifier(struct notifier_block *nb);
 extern int nf_conntrack_unregister_notifier(struct notifier_block *nb);
@@ -39,22 +46,56 @@ nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)
        local_bh_enable();
 }
-static inline void nf_conntrack_event(enum ip_conntrack_events event,
+static inline void
-                                      struct nf_conn *ct)
+nf_conntrack_event_report(enum ip_conntrack_events event,
+                          struct nf_conn *ct,
+                          u32 pid,
+                          int report)
 {
+        struct nf_ct_event item = {
+                .ct     = ct,
+                .pid    = pid,
+                .report = report
+        };
        if (nf_ct_is_confirmed(ct) && !nf_ct_is_dying(ct))
-                atomic_notifier_call_chain(&nf_conntrack_chain, event, ct);
+                atomic_notifier_call_chain(&nf_conntrack_chain, event, &item);
 }
+static inline void
+nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct)
+{
+        nf_conntrack_event_report(event, ct, 0, 0);
+}
+struct nf_exp_event {
+        struct nf_conntrack_expect *exp;
+        u32 pid;
+        int report;
+};
 extern struct atomic_notifier_head nf_ct_expect_chain;
 extern int nf_ct_expect_register_notifier(struct notifier_block *nb);
 extern int nf_ct_expect_unregister_notifier(struct notifier_block *nb);
 static inline void
+nf_ct_expect_event_report(enum ip_conntrack_expect_events event,
+                          struct nf_conntrack_expect *exp,
+                          u32 pid,
+                          int report)
+{
+        struct nf_exp_event item = {
+                .exp    = exp,
+                .pid    = pid,
+                .report = report
+        };
+        atomic_notifier_call_chain(&nf_ct_expect_chain, event, &item);
+}
+static inline void
 nf_ct_expect_event(enum ip_conntrack_expect_events event,
                   struct nf_conntrack_expect *exp)
 {
-        atomic_notifier_call_chain(&nf_ct_expect_chain, event, exp);
+        nf_ct_expect_event_report(event, exp, 0, 0);
 }
 extern int nf_conntrack_ecache_init(struct net *net);
@@ -66,9 +107,17 @@ static inline void nf_conntrack_event_cache(enum ip_conntrack_events event,
                                            struct nf_conn *ct) {}
 static inline void nf_conntrack_event(enum ip_conntrack_events event,
                                      struct nf_conn *ct) {}
+static inline void nf_conntrack_event_report(enum ip_conntrack_events event,
+                                             struct nf_conn *ct,
+                                             u32 pid,
+                                             int report) {}
 static inline void nf_ct_deliver_cached_events(const struct nf_conn *ct) {}
 static inline void nf_ct_expect_event(enum ip_conntrack_expect_events event,
                                      struct nf_conntrack_expect *exp) {}
+static inline void nf_ct_expect_event_report(enum ip_conntrack_expect_events e,
+                                             struct nf_conntrack_expect *exp,
+                                             u32 pid,
+                                             int report) {}
 static inline void nf_ct_event_cache_flush(struct net *net) {}
 static inline int nf_conntrack_ecache_init(struct net *net)
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index 37a7fc1164b0..ab17a159ac66 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -100,6 +100,8 @@ void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, u_int8_t,
                       u_int8_t, const __be16 *, const __be16 *);
 void nf_ct_expect_put(struct nf_conntrack_expect *exp);
 int nf_ct_expect_related(struct nf_conntrack_expect *expect);
+int nf_ct_expect_related_report(struct nf_conntrack_expect *expect, 
+                                u32 pid, int report);
 #endif /*_NF_CONNTRACK_EXPECT_H*/
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index f8060ab5a083..66d65a7caa39 100644
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -39,9 +39,6 @@ struct nf_conntrack_helper
 };
 extern struct nf_conntrack_helper *
-__nf_ct_helper_find(const struct nf_conntrack_tuple *tuple);
-extern struct nf_conntrack_helper *
 __nf_conntrack_helper_find_byname(const char *name);
 extern int nf_conntrack_helper_register(struct nf_conntrack_helper *);
@@ -49,6 +46,8 @@ extern void nf_conntrack_helper_unregister(struct nf_conntrack_helper *);
 extern struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, gfp_t gfp);
+extern int __nf_ct_try_assign_helper(struct nf_conn *ct, gfp_t flags);
 static inline struct nf_conn_help *nfct_help(const struct nf_conn *ct)
 {
        return nf_ct_ext_find(ct, NF_CT_EXT_HELPER);
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 7f2f43c77284..debdaf75cecf 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -129,7 +129,7 @@ extern const struct nla_policy nf_ct_port_nla_policy[];
         && net_ratelimit())
 #endif
 #else
-#define LOG_INVALID(net, proto) 0
+static inline int LOG_INVALID(struct net *net, int proto) { return 0; }
 #endif /* CONFIG_SYSCTL */
 #endif /*_NF_CONNTRACK_PROTOCOL_H*/
diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h
index a6874ba22d54..f2f6aa73dc10 100644
--- a/include/net/netfilter/nf_conntrack_tuple.h
+++ b/include/net/netfilter/nf_conntrack_tuple.h
@@ -112,20 +112,20 @@ struct nf_conntrack_tuple_mask
 static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t)
 {
 #ifdef DEBUG
-        printk("tuple %p: %u " NIPQUAD_FMT ":%hu -> " NIPQUAD_FMT ":%hu\n",
+        printk("tuple %p: %u %pI4:%hu -> %pI4:%hu\n",
               t, t->dst.protonum,
-               NIPQUAD(t->src.u3.ip), ntohs(t->src.u.all),
+               &t->src.u3.ip, ntohs(t->src.u.all),
-               NIPQUAD(t->dst.u3.ip), ntohs(t->dst.u.all));
+               &t->dst.u3.ip, ntohs(t->dst.u.all));
 #endif
 }
 static inline void nf_ct_dump_tuple_ipv6(const struct nf_conntrack_tuple *t)
 {
 #ifdef DEBUG
-        printk("tuple %p: %u " NIP6_FMT " %hu -> " NIP6_FMT " %hu\n",
+        printk("tuple %p: %u %pI6 %hu -> %pI6 %hu\n",
               t, t->dst.protonum,
-               NIP6(*(struct in6_addr *)t->src.u3.all), ntohs(t->src.u.all),
+               t->src.u3.all, ntohs(t->src.u.all),
-               NIP6(*(struct in6_addr *)t->dst.u3.all), ntohs(t->dst.u.all));
+               t->dst.u3.all, ntohs(t->dst.u.all));
 #endif
 }
diff --git a/include/net/netfilter/nfnetlink_log.h b/include/net/netfilter/nfnetlink_log.h
new file mode 100644
index 000000000000..b0569ff0775e
--- /dev/null
+++ b/include/net/netfilter/nfnetlink_log.h
@@ -0,0 +1,14 @@
+#ifndef _KER_NFNETLINK_LOG_H
+#define _KER_NFNETLINK_LOG_H
+void
+nfulnl_log_packet(u_int8_t pf,
+                  unsigned int hooknum,
+                  const struct sk_buff *skb,
+                  const struct net_device *in,
+                  const struct net_device *out,
+                  const struct nf_loginfo *li_user,
+                  const char *prefix);
+#endif /* _KER_NFNETLINK_LOG_H */
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 3643bbb8e585..8a6150a3f4c7 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -233,7 +233,7 @@ extern int		nla_parse(struct nlattr *tb[], int maxtype,
 extern struct nlattr *  nla_find(struct nlattr *head, int len, int attrtype);
 extern size_t           nla_strlcpy(char *dst, const struct nlattr *nla,
                                    size_t dstsize);
-extern int              nla_memcpy(void *dest, struct nlattr *src, int count);
+extern int              nla_memcpy(void *dest, const struct nlattr *src, int count);
 extern int              nla_memcmp(const struct nlattr *nla, const void *data,
                                   size_t size);
 extern int              nla_strcmp(const struct nlattr *nla, const char *str);
@@ -332,7 +332,7 @@ static inline int nlmsg_attrlen(const struct nlmsghdr *nlh, int hdrlen)
 */
 static inline int nlmsg_ok(const struct nlmsghdr *nlh, int remaining)
 {
-        return (remaining >= sizeof(struct nlmsghdr) &&
+        return (remaining >= (int) sizeof(struct nlmsghdr) &&
                nlh->nlmsg_len >= sizeof(struct nlmsghdr) &&
                nlh->nlmsg_len <= remaining);
 }
@@ -741,7 +741,7 @@ static inline struct nlattr *nla_find_nested(struct nlattr *nla, int attrtype)
 * See nla_parse()
 */
 static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
-                                   struct nlattr *nla,
+                                   const struct nlattr *nla,
                                   const struct nla_policy *policy)
 {
        return nla_parse(tb, maxtype, nla_data(nla), nla_len(nla), policy);
@@ -875,7 +875,7 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
 * nla_get_u32 - return payload of u32 attribute
 * @nla: u32 netlink attribute
 */
-static inline u32 nla_get_u32(struct nlattr *nla)
+static inline u32 nla_get_u32(const struct nlattr *nla)
 {
        return *(u32 *) nla_data(nla);
 }
@@ -884,7 +884,7 @@ static inline u32 nla_get_u32(struct nlattr *nla)
 * nla_get_be32 - return payload of __be32 attribute
 * @nla: __be32 netlink attribute
 */
-static inline __be32 nla_get_be32(struct nlattr *nla)
+static inline __be32 nla_get_be32(const struct nlattr *nla)
 {
        return *(__be32 *) nla_data(nla);
 }
@@ -893,7 +893,7 @@ static inline __be32 nla_get_be32(struct nlattr *nla)
 * nla_get_u16 - return payload of u16 attribute
 * @nla: u16 netlink attribute
 */
-static inline u16 nla_get_u16(struct nlattr *nla)
+static inline u16 nla_get_u16(const struct nlattr *nla)
 {
        return *(u16 *) nla_data(nla);
 }
@@ -902,7 +902,7 @@ static inline u16 nla_get_u16(struct nlattr *nla)
 * nla_get_be16 - return payload of __be16 attribute
 * @nla: __be16 netlink attribute
 */
-static inline __be16 nla_get_be16(struct nlattr *nla)
+static inline __be16 nla_get_be16(const struct nlattr *nla)
 {
        return *(__be16 *) nla_data(nla);
 }
@@ -911,7 +911,7 @@ static inline __be16 nla_get_be16(struct nlattr *nla)
 * nla_get_le16 - return payload of __le16 attribute
 * @nla: __le16 netlink attribute
 */
-static inline __le16 nla_get_le16(struct nlattr *nla)
+static inline __le16 nla_get_le16(const struct nlattr *nla)
 {
        return *(__le16 *) nla_data(nla);
 }
@@ -920,7 +920,7 @@ static inline __le16 nla_get_le16(struct nlattr *nla)
 * nla_get_u8 - return payload of u8 attribute
 * @nla: u8 netlink attribute
 */
-static inline u8 nla_get_u8(struct nlattr *nla)
+static inline u8 nla_get_u8(const struct nlattr *nla)
 {
        return *(u8 *) nla_data(nla);
 }
@@ -929,7 +929,7 @@ static inline u8 nla_get_u8(struct nlattr *nla)
 * nla_get_u64 - return payload of u64 attribute
 * @nla: u64 netlink attribute
 */
-static inline u64 nla_get_u64(struct nlattr *nla)
+static inline u64 nla_get_u64(const struct nlattr *nla)
 {
        u64 tmp;
@@ -942,7 +942,7 @@ static inline u64 nla_get_u64(struct nlattr *nla)
 * nla_get_flag - return payload of flag attribute
 * @nla: flag netlink attribute
 */
-static inline int nla_get_flag(struct nlattr *nla)
+static inline int nla_get_flag(const struct nlattr *nla)
 {
        return !!nla;
 }
@@ -953,7 +953,7 @@ static inline int nla_get_flag(struct nlattr *nla)
 *
 * Returns the number of milliseconds in jiffies.
 */
-static inline unsigned long nla_get_msecs(struct nlattr *nla)
+static inline unsigned long nla_get_msecs(const struct nlattr *nla)
 {
        u64 msecs = nla_get_u64(nla);
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index ece1c926b5d1..977f482d97a9 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -49,6 +49,8 @@ struct netns_ipv4 {
        int sysctl_icmp_ratelimit;
        int sysctl_icmp_ratemask;
        int sysctl_icmp_errors_use_inbound_ifaddr;
+        int sysctl_rt_cache_rebuild_count;
+        int current_rt_cache_rebuild_count;
        struct timer_list rt_secret_timer;
        atomic_t rt_genid;
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 2932721180c0..afab4e4cbac7 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -55,5 +55,17 @@ struct netns_ipv6 {
        struct sock             *ndisc_sk;
        struct sock             *tcp_sk;
        struct sock             *igmp_sk;
+#ifdef CONFIG_IPV6_MROUTE
+        struct sock             *mroute6_sk;
+        struct mfc6_cache       **mfc6_cache_array;
+        struct mif_device       *vif6_table;
+        int                     maxvif;
+        atomic_t                cache_resolve_queue_len;
+        int                     mroute_do_assert;
+        int                     mroute_do_pim;
+#ifdef CONFIG_IPV6_PIMSM_V2
+        int                     mroute_reg_vif_num;
+#endif
+#endif
 };
 #endif
diff --git a/include/net/netns/mib.h b/include/net/netns/mib.h
index 10cb7c336de5..0b44112e2366 100644
--- a/include/net/netns/mib.h
+++ b/include/net/netns/mib.h
@@ -20,6 +20,9 @@ struct netns_mib {
        DEFINE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics);
        DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);
 #endif
+#ifdef CONFIG_XFRM_STATISTICS
+        DEFINE_SNMP_STAT(struct linux_xfrm_mib, xfrm_statistics);
+#endif
 };
 #endif
diff --git a/include/net/netns/x_tables.h b/include/net/netns/x_tables.h
index b8093971ccb4..9554a644a8f8 100644
--- a/include/net/netns/x_tables.h
+++ b/include/net/netns/x_tables.h
@@ -4,7 +4,12 @@
 #include <linux/list.h>
 #include <linux/netfilter.h>
+struct ebt_table;
 struct netns_xt {
        struct list_head tables[NFPROTO_NUMPROTO];
+        struct ebt_table *broute_table;
+        struct ebt_table *frame_filter;
+        struct ebt_table *frame_nat;
 };
 #endif
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
new file mode 100644
index 000000000000..1ba912749caa
--- /dev/null
+++ b/include/net/netns/xfrm.h
@@ -0,0 +1,56 @@
+#ifndef __NETNS_XFRM_H
+#define __NETNS_XFRM_H
+#include <linux/list.h>
+#include <linux/wait.h>
+#include <linux/workqueue.h>
+#include <linux/xfrm.h>
+struct ctl_table_header;
+struct xfrm_policy_hash {
+        struct hlist_head       *table;
+        unsigned int            hmask;
+};
+struct netns_xfrm {
+        struct list_head        state_all;
+        /*
+         * Hash table to find appropriate SA towards given target (endpoint of
+         * tunnel or destination of transport mode) allowed by selector.
+         *
+         * Main use is finding SA after policy selected tunnel or transport
+         * mode. Also, it can be used by ah/esp icmp error handler to find
+         * offending SA.
+         */
+        struct hlist_head       *state_bydst;
+        struct hlist_head       *state_bysrc;
+        struct hlist_head       *state_byspi;
+        unsigned int            state_hmask;
+        unsigned int            state_num;
+        struct work_struct      state_hash_work;
+        struct hlist_head       state_gc_list;
+        struct work_struct      state_gc_work;
+        wait_queue_head_t       km_waitq;
+        struct list_head        policy_all;
+        struct hlist_head       *policy_byidx;
+        unsigned int            policy_idx_hmask;
+        struct hlist_head       policy_inexact[XFRM_POLICY_MAX * 2];
+        struct xfrm_policy_hash policy_bydst[XFRM_POLICY_MAX * 2];
+        unsigned int            policy_count[XFRM_POLICY_MAX * 2];
+        struct work_struct      policy_hash_work;
+        struct sock             *nlsk;
+        u32                     sysctl_aevent_etime;
+        u32                     sysctl_aevent_rseqth;
+        int                     sysctl_larval_drop;
+        u32                     sysctl_acq_expires;
+#ifdef CONFIG_SYSCTL
+        struct ctl_table_header *sysctl_hdr;
+#endif
+};
+#endif
diff --git a/include/net/phonet/pep.h b/include/net/phonet/pep.h
index fcd793030e4d..4c61cdce4e5f 100644
--- a/include/net/phonet/pep.h
+++ b/include/net/phonet/pep.h
@@ -35,12 +35,12 @@ struct pep_sock {
        struct sock             *listener;
        struct sk_buff_head     ctrlreq_queue;
 #define PNPIPE_CTRLREQ_MAX      10
+        atomic_t                tx_credits;
        int                     ifindex;
        u16                     peer_type;      /* peer type/subtype */
        u8                      pipe_handle;
        u8                      rx_credits;
-        u8                      tx_credits;
        u8                      rx_fc;  /* RX flow control */
        u8                      tx_fc;  /* TX flow control */
        u8                      init_enable;    /* auto-enable at creation */
diff --git a/include/net/phonet/phonet.h b/include/net/phonet/phonet.h
index c6a245184460..057b0a8a2885 100644
--- a/include/net/phonet/phonet.h
+++ b/include/net/phonet/phonet.h
@@ -46,7 +46,7 @@ static inline struct pn_sock *pn_sk(struct sock *sk)
 extern const struct proto_ops phonet_dgram_ops;
-struct sock *pn_find_sock_by_sa(const struct sockaddr_pn *sa);
+struct sock *pn_find_sock_by_sa(struct net *net, const struct sockaddr_pn *sa);
 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 bbd2a836e04c..aa1c59a1d33f 100644
--- a/include/net/phonet/pn_dev.h
+++ b/include/net/phonet/pn_dev.h
@@ -43,7 +43,7 @@ struct net_device *phonet_device_get(struct net *net);
 int phonet_address_add(struct net_device *dev, u8 addr);
 int phonet_address_del(struct net_device *dev, u8 addr);
 u8 phonet_address_get(struct net_device *dev, u8 addr);
-int phonet_address_lookup(u8 addr);
+int phonet_address_lookup(struct net *net, u8 addr);
 #define PN_NO_ADDR      0xff
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index aa9e282db485..d1ca31444644 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -246,7 +246,7 @@ struct tcf_ematch_ops
 };
 extern int tcf_em_register(struct tcf_ematch_ops *);
-extern int tcf_em_unregister(struct tcf_ematch_ops *);
+extern void tcf_em_unregister(struct tcf_ematch_ops *);
 extern int tcf_em_tree_validate(struct tcf_proto *, struct nlattr *,
                                struct tcf_ematch_tree *);
 extern void tcf_em_tree_destroy(struct tcf_proto *, struct tcf_ematch_tree *);
diff --git a/include/net/protocol.h b/include/net/protocol.h
index 8d024d7cb741..cb2965aa1b62 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -39,6 +39,9 @@ struct net_protocol {
        int                     (*gso_send_check)(struct sk_buff *skb);
        struct sk_buff         *(*gso_segment)(struct sk_buff *skb,
                                               int features);
+        struct sk_buff        **(*gro_receive)(struct sk_buff **head,
+                                               struct sk_buff *skb);
+        int                     (*gro_complete)(struct sk_buff *skb);
        unsigned int            no_policy:1,
                                netns_ok:1;
 };
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 3fe49d808957..f8c47429044a 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -53,7 +53,6 @@ struct Qdisc
        atomic_t                refcnt;
        unsigned long           state;
        struct sk_buff          *gso_skb;
-        struct sk_buff_head     requeue;
        struct sk_buff_head     q;
        struct netdev_queue     *dev_queue;
        struct Qdisc            *next_sched;
@@ -111,7 +110,7 @@ struct Qdisc_ops
        int                     (*enqueue)(struct sk_buff *, struct Qdisc *);
        struct sk_buff *        (*dequeue)(struct Qdisc *);
-        int                     (*requeue)(struct sk_buff *, struct Qdisc *);
+        struct sk_buff *        (*peek)(struct Qdisc *);
        unsigned int            (*drop)(struct Qdisc *);
        int                     (*init)(struct Qdisc *, struct nlattr *arg);
@@ -432,19 +431,38 @@ static inline struct sk_buff *qdisc_dequeue_tail(struct Qdisc *sch)
        return __qdisc_dequeue_tail(sch, &sch->q);
 }
-static inline int __qdisc_requeue(struct sk_buff *skb, struct Qdisc *sch,
+static inline struct sk_buff *qdisc_peek_head(struct Qdisc *sch)
-                                  struct sk_buff_head *list)
 {
-        __skb_queue_head(list, skb);
+        return skb_peek(&sch->q);
-        sch->qstats.backlog += qdisc_pkt_len(skb);
+}
-        sch->qstats.requeues++;
-        return NET_XMIT_SUCCESS;
+/* generic pseudo peek method for non-work-conserving qdisc */
+static inline struct sk_buff *qdisc_peek_dequeued(struct Qdisc *sch)
+{
+        /* we can reuse ->gso_skb because peek isn't called for root qdiscs */
+        if (!sch->gso_skb) {
+                sch->gso_skb = sch->dequeue(sch);
+                if (sch->gso_skb)
+                        /* it's still part of the queue */
+                        sch->q.qlen++;
+        }
+        return sch->gso_skb;
 }
-static inline int qdisc_requeue(struct sk_buff *skb, struct Qdisc *sch)
+/* use instead of qdisc->dequeue() for all qdiscs queried with ->peek() */
+static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch)
 {
-        return __qdisc_requeue(skb, sch, &sch->q);
+        struct sk_buff *skb = sch->gso_skb;
+        if (skb) {
+                sch->gso_skb = NULL;
+                sch->q.qlen--;
+        } else {
+                skb = sch->dequeue(sch);
+        }
+        return skb;
 }
 static inline void __qdisc_reset_queue(struct Qdisc *sch,
diff --git a/include/net/scm.h b/include/net/scm.h
index 33e9986beb86..f45bb6eca7d4 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -55,8 +55,8 @@ static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
                               struct scm_cookie *scm)
 {
        struct task_struct *p = current;
-        scm->creds.uid = p->uid;
+        scm->creds.uid = current_uid();
-        scm->creds.gid = p->gid;
+        scm->creds.gid = current_gid();
        scm->creds.pid = task_tgid_vnr(p);
        scm->fp = NULL;
        scm->seq = 0;
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index ed71b110edf7..bbb7742195b0 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -138,6 +138,7 @@ void sctp_write_space(struct sock *sk);
 unsigned int sctp_poll(struct file *file, struct socket *sock,
                poll_table *wait);
 void sctp_sock_rfree(struct sk_buff *skb);
+extern struct percpu_counter sctp_sockets_allocated;
 /*
 * sctp/primitive.c
@@ -285,15 +286,15 @@ extern int sctp_debug_flag;
        if (sctp_debug_flag) { \
                if (saddr->sa.sa_family == AF_INET6) { \
                        printk(KERN_DEBUG \
-                               lead NIP6_FMT trail, \
+                               lead "%pI6" trail, \
                               leadparm, \
-                               NIP6(saddr->v6.sin6_addr), \
+                               &saddr->v6.sin6_addr, \
                               otherparms); \
                } else { \
                        printk(KERN_DEBUG \
-                               lead NIPQUAD_FMT trail, \
+                               lead "%pI4" trail, \
                               leadparm, \
-                               NIPQUAD(saddr->v4.sin_addr.s_addr), \
+                               &saddr->v4.sin_addr.s_addr, \
                               otherparms); \
                } \
        }
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index f205b10f0ab9..b259fc5798fb 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -118,6 +118,8 @@ enum sctp_optname {
 #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 
diff --git a/include/net/sock.h b/include/net/sock.h
index 2f47107f6d0f..5a3a151bd730 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -42,6 +42,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/list_nulls.h>
 #include <linux/timer.h>
 #include <linux/cache.h>
 #include <linux/module.h>
@@ -52,6 +53,7 @@
 #include <linux/security.h>
 #include <linux/filter.h>
+#include <linux/rculist_nulls.h>
 #include <asm/atomic.h>
 #include <net/dst.h>
@@ -106,6 +108,7 @@ struct net;
 *      @skc_reuse: %SO_REUSEADDR setting
 *      @skc_bound_dev_if: bound device index if != 0
 *      @skc_node: main hash linkage for various protocol lookup tables
+ *      @skc_nulls_node: main hash linkage for UDP/UDP-Lite protocol
 *      @skc_bind_node: bind hash linkage for various protocol lookup tables
 *      @skc_refcnt: reference count
 *      @skc_hash: hash value used with various protocol lookup tables
@@ -120,7 +123,10 @@ struct sock_common {
        volatile unsigned char  skc_state;
        unsigned char           skc_reuse;
        int                     skc_bound_dev_if;
-        struct hlist_node       skc_node;
+        union {
+                struct hlist_node       skc_node;
+                struct hlist_nulls_node skc_nulls_node;
+        };
        struct hlist_node       skc_bind_node;
        atomic_t                skc_refcnt;
        unsigned int            skc_hash;
@@ -206,6 +212,7 @@ struct sock {
 #define sk_reuse                __sk_common.skc_reuse
 #define sk_bound_dev_if         __sk_common.skc_bound_dev_if
 #define sk_node                 __sk_common.skc_node
+#define sk_nulls_node           __sk_common.skc_nulls_node
 #define sk_bind_node            __sk_common.skc_bind_node
 #define sk_refcnt               __sk_common.skc_refcnt
 #define sk_hash                 __sk_common.skc_hash
@@ -229,7 +236,9 @@ struct sock {
        } sk_backlog;
        wait_queue_head_t       *sk_sleep;
        struct dst_entry        *sk_dst_cache;
+#ifdef CONFIG_XFRM
        struct xfrm_policy      *sk_policy[2];
+#endif
        rwlock_t                sk_dst_lock;
        atomic_t                sk_rmem_alloc;
        atomic_t                sk_wmem_alloc;
@@ -237,7 +246,9 @@ struct sock {
        int                     sk_sndbuf;
        struct sk_buff_head     sk_receive_queue;
        struct sk_buff_head     sk_write_queue;
+#ifdef CONFIG_NET_DMA
        struct sk_buff_head     sk_async_wait_queue;
+#endif
        int                     sk_wmem_queued;
        int                     sk_forward_alloc;
        gfp_t                   sk_allocation;
@@ -269,7 +280,9 @@ struct sock {
        struct sk_buff          *sk_send_head;
        __u32                   sk_sndmsg_off;
        int                     sk_write_pending;
+#ifdef CONFIG_SECURITY
        void                    *sk_security;
+#endif
        __u32                   sk_mark;
        /* XXX 4 bytes hole on 64 bit */
        void                    (*sk_state_change)(struct sock *sk);
@@ -294,12 +307,30 @@ static inline struct sock *sk_head(const struct hlist_head *head)
        return hlist_empty(head) ? NULL : __sk_head(head);
 }
+static inline struct sock *__sk_nulls_head(const struct hlist_nulls_head *head)
+{
+        return hlist_nulls_entry(head->first, struct sock, sk_nulls_node);
+}
+static inline struct sock *sk_nulls_head(const struct hlist_nulls_head *head)
+{
+        return hlist_nulls_empty(head) ? NULL : __sk_nulls_head(head);
+}
 static inline struct sock *sk_next(const struct sock *sk)
 {
        return sk->sk_node.next ?
                hlist_entry(sk->sk_node.next, struct sock, sk_node) : NULL;
 }
+static inline struct sock *sk_nulls_next(const struct sock *sk)
+{
+        return (!is_a_nulls(sk->sk_nulls_node.next)) ?
+                hlist_nulls_entry(sk->sk_nulls_node.next,
+                                  struct sock, sk_nulls_node) :
+                NULL;
+}
 static inline int sk_unhashed(const struct sock *sk)
 {
        return hlist_unhashed(&sk->sk_node);
@@ -315,6 +346,11 @@ static __inline__ void sk_node_init(struct hlist_node *node)
        node->pprev = NULL;
 }
+static __inline__ void sk_nulls_node_init(struct hlist_nulls_node *node)
+{
+        node->pprev = NULL;
+}
 static __inline__ void __sk_del_node(struct sock *sk)
 {
        __hlist_del(&sk->sk_node);
@@ -361,6 +397,27 @@ static __inline__ int sk_del_node_init(struct sock *sk)
        return rc;
 }
+static __inline__ int __sk_nulls_del_node_init_rcu(struct sock *sk)
+{
+        if (sk_hashed(sk)) {
+                hlist_nulls_del_init_rcu(&sk->sk_nulls_node);
+                return 1;
+        }
+        return 0;
+}
+static __inline__ int sk_nulls_del_node_init_rcu(struct sock *sk)
+{
+        int rc = __sk_nulls_del_node_init_rcu(sk);
+        if (rc) {
+                /* paranoid for a while -acme */
+                WARN_ON(atomic_read(&sk->sk_refcnt) == 1);
+                __sock_put(sk);
+        }
+        return rc;
+}
 static __inline__ void __sk_add_node(struct sock *sk, struct hlist_head *list)
 {
        hlist_add_head(&sk->sk_node, list);
@@ -372,6 +429,17 @@ static __inline__ void sk_add_node(struct sock *sk, struct hlist_head *list)
        __sk_add_node(sk, list);
 }
+static __inline__ void __sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_head *list)
+{
+        hlist_nulls_add_head_rcu(&sk->sk_nulls_node, list);
+}
+static __inline__ void sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_head *list)
+{
+        sock_hold(sk);
+        __sk_nulls_add_node_rcu(sk, list);
+}
 static __inline__ void __sk_del_bind_node(struct sock *sk)
 {
        __hlist_del(&sk->sk_bind_node);
@@ -385,9 +453,16 @@ static __inline__ void sk_add_bind_node(struct sock *sk,
 #define sk_for_each(__sk, node, list) \
        hlist_for_each_entry(__sk, node, list, sk_node)
+#define sk_nulls_for_each(__sk, node, list) \
+        hlist_nulls_for_each_entry(__sk, node, list, sk_nulls_node)
+#define sk_nulls_for_each_rcu(__sk, node, list) \
+        hlist_nulls_for_each_entry_rcu(__sk, node, list, sk_nulls_node)
 #define sk_for_each_from(__sk, node) \
        if (__sk && ({ node = &(__sk)->sk_node; 1; })) \
                hlist_for_each_entry_from(__sk, node, sk_node)
+#define sk_nulls_for_each_from(__sk, node) \
+        if (__sk && ({ node = &(__sk)->sk_nulls_node; 1; })) \
+                hlist_nulls_for_each_entry_from(__sk, node, sk_nulls_node)
 #define sk_for_each_continue(__sk, node) \
        if (__sk && ({ node = &(__sk)->sk_node; 1; })) \
                hlist_for_each_entry_continue(__sk, node, sk_node)
@@ -574,7 +649,7 @@ struct proto {
        /* Memory pressure */
        void                    (*enter_memory_pressure)(struct sock *sk);
        atomic_t                *memory_allocated;      /* Current allocated memory. */
-        atomic_t                *sockets_allocated;     /* Current number of sockets. */
+        struct percpu_counter   *sockets_allocated;     /* Current number of sockets. */
        /*
         * Pressure flag: try to collapse.
         * Technical note: it is used by multiple contexts non atomically.
@@ -587,17 +662,18 @@ struct proto {
        int                     *sysctl_rmem;
        int                     max_header;
-        struct kmem_cache               *slab;
+        struct kmem_cache       *slab;
        unsigned int            obj_size;
+        int                     slab_flags;
-        atomic_t                *orphan_count;
+        struct percpu_counter   *orphan_count;
        struct request_sock_ops *rsk_prot;
        struct timewait_sock_ops *twsk_prot;
        union {
                struct inet_hashinfo    *hashinfo;
-                struct hlist_head       *udp_hash;
+                struct udp_table        *udp_table;
                struct raw_hashinfo     *raw_hash;
        } h;
diff --git a/include/net/syncppp.h b/include/net/syncppp.h
deleted file mode 100644
index 9e306f7f579a..000000000000
--- a/include/net/syncppp.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Defines for synchronous PPP/Cisco link level subroutines.
- *
- * Copyright (C) 1994 Cronyx Ltd.
- * Author: Serge Vakulenko, <vak@zebub.msk.su>
- *
- * This software is distributed with NO WARRANTIES, not even the implied
- * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Authors grant any other persons or organizations permission to use
- * or modify this software as long as this message is kept with the software,
- * all derivative works or modified versions.
- *
- * Version 1.7, Wed Jun  7 22:12:02 MSD 1995
- *
- *
- *
- */
-#ifndef _SYNCPPP_H_
-#define _SYNCPPP_H_ 1
-#ifdef __KERNEL__
-struct slcp {
-        u16     state;          /* state machine */
-        u32     magic;          /* local magic number */
-        u_char  echoid;         /* id of last keepalive echo request */
-        u_char  confid;         /* id of last configuration request */
-};
-struct sipcp {
-        u16     state;          /* state machine */
-        u_char  confid;         /* id of last configuration request */
-};
-struct sppp 
-{
-        struct sppp *   pp_next;        /* next interface in keepalive list */
-        u32             pp_flags;       /* use Cisco protocol instead of PPP */
-        u16             pp_alivecnt;    /* keepalive packets counter */
-        u16             pp_loopcnt;     /* loopback detection counter */
-        u32             pp_seq;         /* local sequence number */
-        u32             pp_rseq;        /* remote sequence number */
-        struct slcp     lcp;            /* LCP params */
-        struct sipcp    ipcp;           /* IPCP params */
-        struct timer_list       pp_timer;
-        struct net_device       *pp_if;
-        char            pp_link_state;  /* Link status */
-        spinlock_t      lock;
-};
-struct ppp_device
-{       
-        struct net_device *dev; /* Network device pointer */
-        struct sppp sppp;       /* Synchronous PPP */
-};
-static inline struct sppp *sppp_of(struct net_device *dev) 
-{
-        struct ppp_device **ppp = dev->ml_priv;
-        BUG_ON((*ppp)->dev != dev);
-        return &(*ppp)->sppp;
-}
-#define PP_KEEPALIVE    0x01    /* use keepalive protocol */
-#define PP_CISCO        0x02    /* use Cisco protocol instead of PPP */
-#define PP_TIMO         0x04    /* cp_timeout routine active */
-#define PP_DEBUG        0x08
-#define PPP_MTU          1500    /* max. transmit unit */
-#define LCP_STATE_CLOSED        0       /* LCP state: closed (conf-req sent) */
-#define LCP_STATE_ACK_RCVD      1       /* LCP state: conf-ack received */
-#define LCP_STATE_ACK_SENT      2       /* LCP state: conf-ack sent */
-#define LCP_STATE_OPENED        3       /* LCP state: opened */
-#define IPCP_STATE_CLOSED       0       /* IPCP state: closed (conf-req sent) */
-#define IPCP_STATE_ACK_RCVD     1       /* IPCP state: conf-ack received */
-#define IPCP_STATE_ACK_SENT     2       /* IPCP state: conf-ack sent */
-#define IPCP_STATE_OPENED       3       /* IPCP state: opened */
-#define SPPP_LINK_DOWN          0       /* link down - no keepalive */
-#define SPPP_LINK_UP            1       /* link is up - keepalive ok */
-void sppp_attach (struct ppp_device *pd);
-void sppp_detach (struct net_device *dev);
-int sppp_do_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd);
-struct sk_buff *sppp_dequeue (struct net_device *dev);
-int sppp_isempty (struct net_device *dev);
-void sppp_flush (struct net_device *dev);
-int sppp_open (struct net_device *dev);
-int sppp_reopen (struct net_device *dev);
-int sppp_close (struct net_device *dev);
-#endif
-#define SPPPIOCCISCO    (SIOCDEVPRIVATE)
-#define SPPPIOCPPP      (SIOCDEVPRIVATE+1)
-#define SPPPIOCDEBUG    (SIOCDEVPRIVATE+2)
-#define SPPPIOCSFLAGS   (SIOCDEVPRIVATE+3)
-#define SPPPIOCGFLAGS   (SIOCDEVPRIVATE+4)
-#endif /* _SYNCPPP_H_ */
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 438014d57610..218235de8963 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -46,7 +46,7 @@
 extern struct inet_hashinfo tcp_hashinfo;
-extern atomic_t tcp_orphan_count;
+extern struct percpu_counter tcp_orphan_count;
 extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define MAX_TCP_HEADER  (128 + MAX_HEADER)
@@ -238,7 +238,7 @@ extern int sysctl_tcp_slow_start_after_idle;
 extern int sysctl_tcp_max_ssthresh;
 extern atomic_t tcp_memory_allocated;
-extern atomic_t tcp_sockets_allocated;
+extern struct percpu_counter tcp_sockets_allocated;
 extern int tcp_memory_pressure;
 /*
@@ -472,8 +472,6 @@ extern void tcp_send_delayed_ack(struct sock *sk);
 /* tcp_input.c */
 extern void tcp_cwnd_application_limited(struct sock *sk);
-extern void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp,
-                                            struct sk_buff *skb);
 /* tcp_timer.c */
 extern void tcp_init_xmit_timers(struct sock *);
@@ -590,7 +588,6 @@ struct tcp_skb_cb {
 #define TCPCB_EVER_RETRANS      0x80    /* Ever retransmitted frame     */
 #define TCPCB_RETRANS           (TCPCB_SACKED_RETRANS|TCPCB_EVER_RETRANS)
-        __u16           urg_ptr;        /* Valid w/URG flags is set.    */
        __u32           ack_seq;        /* Sequence number ACK'd        */
 };
@@ -764,8 +761,6 @@ static inline unsigned int tcp_packets_in_flight(const struct tcp_sock *tp)
        return tp->packets_out - tcp_left_out(tp) + tp->retrans_out;
 }
-extern int tcp_limit_reno_sacked(struct tcp_sock *tp);
 /* If cwnd > ssthresh, we may raise ssthresh to be half-way to cwnd.
 * The exception is rate halving phase, when cwnd is decreasing towards
 * ssthresh.
@@ -1195,6 +1190,11 @@ static inline struct sk_buff *tcp_write_queue_next(struct sock *sk, struct sk_bu
        return skb_queue_next(&sk->sk_write_queue, skb);
 }
+static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_buff *skb)
+{
+        return skb_queue_prev(&sk->sk_write_queue, skb);
+}
 #define tcp_for_write_queue(skb, sk)                                    \
        skb_queue_walk(&(sk)->sk_write_queue, skb)
@@ -1358,6 +1358,12 @@ extern void tcp_v4_destroy_sock(struct sock *sk);
 extern int tcp_v4_gso_send_check(struct sk_buff *skb);
 extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features);
+extern struct sk_buff **tcp_gro_receive(struct sk_buff **head,
+                                        struct sk_buff *skb);
+extern struct sk_buff **tcp4_gro_receive(struct sk_buff **head,
+                                         struct sk_buff *skb);
+extern int tcp_gro_complete(struct sk_buff *skb);
+extern int tcp4_gro_complete(struct sk_buff *skb);
 #ifdef CONFIG_PROC_FS
 extern int  tcp4_proc_init(void);
diff --git a/include/net/udp.h b/include/net/udp.h
index 1e205095ea68..90e6ce56be65 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -50,8 +50,15 @@ struct udp_skb_cb {
 };
 #define UDP_SKB_CB(__skb)       ((struct udp_skb_cb *)((__skb)->cb))
-extern struct hlist_head udp_hash[UDP_HTABLE_SIZE];
+struct udp_hslot {
-extern rwlock_t udp_hash_lock;
+        struct hlist_nulls_head head;
+        spinlock_t              lock;
+} __attribute__((aligned(2 * sizeof(long))));
+struct udp_table {
+        struct udp_hslot        hash[UDP_HTABLE_SIZE];
+};
+extern struct udp_table udp_table;
+extern void udp_table_init(struct udp_table *);
 /* Note: this must match 'valbool' in sock_setsockopt */
@@ -110,15 +117,7 @@ static inline void udp_lib_hash(struct sock *sk)
        BUG();
 }
-static inline void udp_lib_unhash(struct sock *sk)
+extern void udp_lib_unhash(struct sock *sk);
-{
-        write_lock_bh(&udp_hash_lock);
-        if (sk_del_node_init(sk)) {
-                inet_sk(sk)->num = 0;
-                sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
-        }
-        write_unlock_bh(&udp_hash_lock);
-}
 static inline void udp_lib_close(struct sock *sk, long timeout)
 {
@@ -187,7 +186,7 @@ extern struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
 struct udp_seq_afinfo {
        char                    *name;
        sa_family_t             family;
-        struct hlist_head       *hashtable;
+        struct udp_table        *udp_table;
        struct file_operations  seq_fops;
        struct seq_operations   seq_ops;
 };
@@ -196,7 +195,7 @@ struct udp_iter_state {
        struct seq_net_private  p;
        sa_family_t             family;
        int                     bucket;
-        struct hlist_head       *hashtable;
+        struct udp_table        *udp_table;
 };
 #ifdef CONFIG_PROC_FS
diff --git a/include/net/udplite.h b/include/net/udplite.h
index b76b2e377af4..afdffe607b24 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -11,7 +11,7 @@
 #define UDPLITE_RECV_CSCOV   11 /* receiver partial coverage (threshold ) */
 extern struct proto             udplite_prot;
-extern struct hlist_head        udplite_hash[UDP_HTABLE_SIZE];
+extern struct udp_table         udplite_table;
 /*
 *      Checksum computation is all in software, hence simpler getfrag.
diff --git a/include/net/wireless.h b/include/net/wireless.h
index 721efb363db7..21c5d966142d 100644
--- a/include/net/wireless.h
+++ b/include/net/wireless.h
@@ -10,6 +10,7 @@
 #include <linux/netdevice.h>
 #include <linux/debugfs.h>
 #include <linux/list.h>
+#include <linux/ieee80211.h>
 #include <net/cfg80211.h>
 /**
@@ -133,23 +134,23 @@ struct ieee80211_rate {
 };
 /**
- * struct ieee80211_ht_info - describing STA's HT capabilities
+ * struct ieee80211_sta_ht_cap - STA's HT capabilities
 *
 * This structure describes most essential parameters needed
 * to describe 802.11n HT capabilities for an STA.
 *
- * @ht_supported: is HT supported by STA, 0: no, 1: yes
+ * @ht_supported: is HT supported by the STA
 * @cap: HT capabilities map as described in 802.11n spec
 * @ampdu_factor: Maximum A-MPDU length factor
 * @ampdu_density: Minimum A-MPDU spacing
- * @supp_mcs_set: Supported MCS set as described in 802.11n spec
+ * @mcs: Supported MCS rates
 */
-struct ieee80211_ht_info {
+struct ieee80211_sta_ht_cap {
        u16 cap; /* use IEEE80211_HT_CAP_ */
-        u8 ht_supported;
+        bool ht_supported;
        u8 ampdu_factor;
        u8 ampdu_density;
-        u8 supp_mcs_set[16];
+        struct ieee80211_mcs_info mcs;
 };
 /**
@@ -173,13 +174,18 @@ struct ieee80211_supported_band {
        enum ieee80211_band band;
        int n_channels;
        int n_bitrates;
-        struct ieee80211_ht_info ht_info;
+        struct ieee80211_sta_ht_cap ht_cap;
 };
 /**
 * struct wiphy - wireless hardware description
 * @idx: the wiphy index assigned to this item
 * @class_dev: the class device representing /sys/class/ieee80211/<wiphy-name>
+ * @fw_handles_regulatory: tells us the firmware for this device
+ *      has its own regulatory solution 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).
 * @reg_notifier: the driver's regulatory notification callback
 */
 struct wiphy {
@@ -191,6 +197,8 @@ struct wiphy {
        /* Supported interface modes, OR together BIT(NL80211_IFTYPE_...) */
        u16 interface_modes;
+        bool fw_handles_regulatory;
        /* 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
@@ -262,9 +270,9 @@ static inline struct device *wiphy_dev(struct wiphy *wiphy)
 /**
 * wiphy_name - get wiphy name
 */
-static inline char *wiphy_name(struct wiphy *wiphy)
+static inline const char *wiphy_name(struct wiphy *wiphy)
 {
-        return wiphy->dev.bus_id;
+        return dev_name(&wiphy->dev);
 }
 /**
@@ -340,55 +348,51 @@ ieee80211_get_channel(struct wiphy *wiphy, int freq)
 }
 /**
- * __regulatory_hint - hint to the wireless core a regulatory domain
+ * ieee80211_get_response_rate - get basic rate for a given rate
- * @wiphy: if a driver is providing the hint this is the driver's very
- *      own &struct wiphy
- * @alpha2: the ISO/IEC 3166 alpha2 being claimed the regulatory domain
- *      should be in. If @rd is set this should be NULL
- * @rd: a complete regulatory domain, if passed the caller need not worry
- *      about freeing it
- *
- * The Wireless subsystem can use this function to hint to the wireless core
- * what it believes should be the current regulatory domain by
- * giving it an ISO/IEC 3166 alpha2 country code it knows its regulatory
- * domain should be in or by providing a completely build regulatory domain.
 *
- * Returns -EALREADY if *a regulatory domain* has already been set. Note that
+ * @sband: the band to look for rates in
- * this could be by another driver. It is safe for drivers to continue if
+ * @basic_rates: bitmap of basic rates
- * -EALREADY is returned, if drivers are not capable of world roaming they
+ * @bitrate: the bitrate for which to find the basic rate
- * should not register more channels than they support. Right now we only
- * support listening to the first driver hint. If the driver is capable
- * of world roaming but wants to respect its own EEPROM mappings for
- * specific regulatory domains it should register the @reg_notifier callback
- * on the &struct wiphy. Returns 0 if the hint went through fine or through an
- * intersection operation. Otherwise a standard error code is returned.
 *
+ * This function returns the basic rate corresponding to a given
+ * bitrate, that is the next lower bitrate contained in the basic
+ * rate map, which is, for this function, given as a bitmap of
+ * indices of rates in the band's bitrate table.
 */
-extern int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
+struct ieee80211_rate *
-                const char *alpha2, struct ieee80211_regdomain *rd);
+ieee80211_get_response_rate(struct ieee80211_supported_band *sband,
+                            u64 basic_rates, int bitrate);
 /**
 * regulatory_hint - driver hint to the wireless core a regulatory domain
- * @wiphy: the driver's very own &struct wiphy
+ * @wiphy: the wireless device giving the hint (used only for reporting
+ *      conflicts)
 * @alpha2: the ISO/IEC 3166 alpha2 the driver claims its regulatory domain
 *      should be in. If @rd is set this should be NULL. Note that if you
 *      set this to NULL you should still set rd->alpha2 to some accepted
 *      alpha2.
- * @rd: a complete regulatory domain provided by the driver. If passed
- *      the driver does not need to worry about freeing it.
 *
 * Wireless drivers can use this function to hint to the wireless core
 * what it believes should be the current regulatory domain by
 * giving it an ISO/IEC 3166 alpha2 country code it knows its regulatory
 * domain should be in or by providing a completely build regulatory domain.
 * If the driver provides an ISO/IEC 3166 alpha2 userspace will be queried
- * for a regulatory domain structure for the respective country. If
+ * for a regulatory domain structure for the respective country.
- * a regulatory domain is build and passed you should set the alpha2
+ */
- * if possible, otherwise set it to the special value of "99" which tells
+extern void regulatory_hint(struct wiphy *wiphy, const char *alpha2);
- * the wireless core it is unknown. If you pass a built regulatory domain
- * and we return non zero you are in charge of kfree()'ing the structure.
+/**
+ * regulatory_hint_11d - hints a country IE as a regulatory domain
+ * @wiphy: the wireless device giving the hint (used only for reporting
+ *      conflicts)
+ * @country_ie: pointer to the country IE
+ * @country_ie_len: length of the country IE
 *
- * See __regulatory_hint() documentation for possible return values.
+ * We will intersect the rd with the what CRDA tells us should apply
+ * for the alpha2 this country IE belongs to, this prevents APs from
+ * sending us incorrect or outdated information against a country.
 */
-extern int regulatory_hint(struct wiphy *wiphy,
+extern void regulatory_hint_11d(struct wiphy *wiphy,
-                const char *alpha2, struct ieee80211_regdomain *rd);
+                                u8 *country_ie,
+                                u8 country_ie_len);
 #endif /* __NET_WIRELESS_H */
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 11c890ad8ebb..2e9f5c0018ae 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -38,22 +38,15 @@
        MODULE_ALIAS("xfrm-type-" __stringify(family) "-" __stringify(proto))
 #ifdef CONFIG_XFRM_STATISTICS
-DECLARE_SNMP_STAT(struct linux_xfrm_mib, xfrm_statistics);
+#define XFRM_INC_STATS(net, field)      SNMP_INC_STATS((net)->mib.xfrm_statistics, field)
-#define XFRM_INC_STATS(field)           SNMP_INC_STATS(xfrm_statistics, field)
+#define XFRM_INC_STATS_BH(net, field)   SNMP_INC_STATS_BH((net)->mib.xfrm_statistics, field)
-#define XFRM_INC_STATS_BH(field)        SNMP_INC_STATS_BH(xfrm_statistics, field)
+#define XFRM_INC_STATS_USER(net, field) SNMP_INC_STATS_USER((net)-mib.xfrm_statistics, field)
-#define XFRM_INC_STATS_USER(field)      SNMP_INC_STATS_USER(xfrm_statistics, field)
 #else
-#define XFRM_INC_STATS(field)
+#define XFRM_INC_STATS(net, field)      ((void)(net))
-#define XFRM_INC_STATS_BH(field)
+#define XFRM_INC_STATS_BH(net, field)   ((void)(net))
-#define XFRM_INC_STATS_USER(field)
+#define XFRM_INC_STATS_USER(net, field) ((void)(net))
 #endif
-extern struct sock *xfrm_nl;
-extern u32 sysctl_xfrm_aevent_etime;
-extern u32 sysctl_xfrm_aevent_rseqth;
-extern int sysctl_xfrm_larval_drop;
-extern u32 sysctl_xfrm_acq_expires;
 extern struct mutex xfrm_cfg_mutex;
 /* Organization of SPD aka "XFRM rules"
@@ -130,6 +123,9 @@ struct xfrm_state_walk {
 /* Full description of state of transformer. */
 struct xfrm_state
 {
+#ifdef CONFIG_NET_NS
+        struct net              *xs_net;
+#endif
        union {
                struct hlist_node       gclist;
                struct hlist_node       bydst;
@@ -223,6 +219,11 @@ struct xfrm_state
        void                    *data;
 };
+static inline struct net *xs_net(struct xfrm_state *x)
+{
+        return read_pnet(&x->xs_net);
+}
 /* xflags - make enum if more show up */
 #define XFRM_TIME_DEFER 1
@@ -249,6 +250,7 @@ struct km_event
        u32     seq;
        u32     pid;
        u32     event;
+        struct net *net;
 };
 struct net_device;
@@ -257,10 +259,11 @@ struct xfrm_dst;
 struct xfrm_policy_afinfo {
        unsigned short          family;
        struct dst_ops          *dst_ops;
-        void                    (*garbage_collect)(void);
+        void                    (*garbage_collect)(struct net *net);
-        struct dst_entry        *(*dst_lookup)(int tos, xfrm_address_t *saddr,
+        struct dst_entry        *(*dst_lookup)(struct net *net, int tos,
+                                               xfrm_address_t *saddr,
                                               xfrm_address_t *daddr);
-        int                     (*get_saddr)(xfrm_address_t *saddr, xfrm_address_t *daddr);
+        int                     (*get_saddr)(struct net *net, xfrm_address_t *saddr, xfrm_address_t *daddr);
        struct dst_entry        *(*find_bundle)(struct flowi *fl, struct xfrm_policy *policy);
        void                    (*decode_session)(struct sk_buff *skb,
                                                  struct flowi *fl,
@@ -467,7 +470,9 @@ struct xfrm_policy_walk {
 struct xfrm_policy
 {
-        struct xfrm_policy      *next;
+#ifdef CONFIG_NET_NS
+        struct net              *xp_net;
+#endif
        struct hlist_node       bydst;
        struct hlist_node       byidx;
@@ -492,6 +497,11 @@ struct xfrm_policy
        struct xfrm_tmpl        xfrm_vec[XFRM_MAX_DEPTH];
 };
+static inline struct net *xp_net(struct xfrm_policy *xp)
+{
+        return read_pnet(&xp->xp_net);
+}
 struct xfrm_kmaddress {
        xfrm_address_t          local;
        xfrm_address_t          remote;
@@ -537,15 +547,13 @@ struct xfrm_mgr
        struct xfrm_policy      *(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);
        int                     (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
        int                     (*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c);
-        int                     (*report)(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
+        int                     (*report)(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
        int                     (*migrate)(struct xfrm_selector *sel, u8 dir, u8 type, struct xfrm_migrate *m, int num_bundles, struct xfrm_kmaddress *k);
 };
 extern int xfrm_register_km(struct xfrm_mgr *km);
 extern int xfrm_unregister_km(struct xfrm_mgr *km);
-extern unsigned int xfrm_policy_count[XFRM_POLICY_MAX*2];
 /*
 * This structure is used for the duration where packets are being
 * transformed by IPsec.  As soon as the packet leaves IPsec the
@@ -882,6 +890,7 @@ struct xfrm_dst
        u32 path_cookie;
 };
+#ifdef CONFIG_XFRM
 static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)
 {
        dst_release(xdst->route);
@@ -894,6 +903,7 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)
        xdst->partner = NULL;
 #endif
 }
+#endif
 extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev);
@@ -977,12 +987,13 @@ static inline int __xfrm_policy_check2(struct sock *sk, int dir,
                                       struct sk_buff *skb,
                                       unsigned int family, int reverse)
 {
+        struct net *net = dev_net(skb->dev);
        int ndir = dir | (reverse ? XFRM_POLICY_MASK + 1 : 0);
        if (sk && sk->sk_policy[XFRM_POLICY_IN])
                return __xfrm_policy_check(sk, ndir, skb, family);
-        return  (!xfrm_policy_count[dir] && !skb->sp) ||
+        return  (!net->xfrm.policy_count[dir] && !skb->sp) ||
                (skb->dst->flags & DST_NOPOLICY) ||
                __xfrm_policy_check(sk, ndir, skb, family);
 }
@@ -1034,7 +1045,9 @@ extern int __xfrm_route_forward(struct sk_buff *skb, unsigned short family);
 static inline int xfrm_route_forward(struct sk_buff *skb, unsigned short family)
 {
-        return  !xfrm_policy_count[XFRM_POLICY_OUT] ||
+        struct net *net = dev_net(skb->dev);
+        return  !net->xfrm.policy_count[XFRM_POLICY_OUT] ||
                (skb->dst->flags & DST_NOXFRM) ||
                __xfrm_route_forward(skb, family);
 }
@@ -1268,7 +1281,8 @@ struct xfrm6_tunnel {
 extern void xfrm_init(void);
 extern void xfrm4_init(void);
-extern void xfrm_state_init(void);
+extern int xfrm_state_init(struct net *net);
+extern void xfrm_state_fini(struct net *net);
 extern void xfrm4_state_init(void);
 #ifdef CONFIG_XFRM
 extern int xfrm6_init(void);
@@ -1287,19 +1301,30 @@ static inline void xfrm6_fini(void)
 #endif
 #ifdef CONFIG_XFRM_STATISTICS
-extern int xfrm_proc_init(void);
+extern int xfrm_proc_init(struct net *net);
+extern void xfrm_proc_fini(struct net *net);
+#endif
+extern int xfrm_sysctl_init(struct net *net);
+#ifdef CONFIG_SYSCTL
+extern void xfrm_sysctl_fini(struct net *net);
+#else
+static inline void xfrm_sysctl_fini(struct net *net)
+{
+}
 #endif
 extern void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto);
-extern int xfrm_state_walk(struct xfrm_state_walk *walk,
+extern int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk,
                           int (*func)(struct xfrm_state *, int, void*), void *);
 extern void xfrm_state_walk_done(struct xfrm_state_walk *walk);
-extern struct xfrm_state *xfrm_state_alloc(void);
+extern struct xfrm_state *xfrm_state_alloc(struct net *net);
 extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, 
                                          struct flowi *fl, struct xfrm_tmpl *tmpl,
                                          struct xfrm_policy *pol, int *err,
                                          unsigned short family);
-extern struct xfrm_state * xfrm_stateonly_find(xfrm_address_t *daddr,
+extern struct xfrm_state * xfrm_stateonly_find(struct net *net,
+                                               xfrm_address_t *daddr,
                                               xfrm_address_t *saddr,
                                               unsigned short family,
                                               u8 mode, u8 proto, u32 reqid);
@@ -1307,8 +1332,8 @@ extern int xfrm_state_check_expire(struct xfrm_state *x);
 extern void xfrm_state_insert(struct xfrm_state *x);
 extern int xfrm_state_add(struct xfrm_state *x);
 extern int xfrm_state_update(struct xfrm_state *x);
-extern struct xfrm_state *xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family);
+extern struct xfrm_state *xfrm_state_lookup(struct net *net, xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family);
-extern struct xfrm_state *xfrm_state_lookup_byaddr(xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto, unsigned short family);
+extern struct xfrm_state *xfrm_state_lookup_byaddr(struct net *net, xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto, unsigned short family);
 #ifdef CONFIG_XFRM_SUB_POLICY
 extern int xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src,
                          int n, unsigned short family);
@@ -1345,9 +1370,9 @@ struct xfrmk_spdinfo {
        u32 spdhmcnt;
 };
-extern struct xfrm_state *xfrm_find_acq_byseq(u32 seq);
+extern struct xfrm_state *xfrm_find_acq_byseq(struct net *net, u32 seq);
 extern int xfrm_state_delete(struct xfrm_state *x);
-extern int xfrm_state_flush(u8 proto, struct xfrm_audit *audit_info);
+extern int xfrm_state_flush(struct net *net, u8 proto, struct xfrm_audit *audit_info);
 extern void xfrm_sad_getinfo(struct xfrmk_sadinfo *si);
 extern void xfrm_spd_getinfo(struct xfrmk_spdinfo *si);
 extern int xfrm_replay_check(struct xfrm_state *x,
@@ -1415,22 +1440,22 @@ static inline int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)
 }
 #endif
-struct xfrm_policy *xfrm_policy_alloc(gfp_t gfp);
+struct xfrm_policy *xfrm_policy_alloc(struct net *net, gfp_t gfp);
 extern void xfrm_policy_walk_init(struct xfrm_policy_walk *walk, u8 type);
-extern int xfrm_policy_walk(struct xfrm_policy_walk *walk,
+extern int xfrm_policy_walk(struct net *net, struct xfrm_policy_walk *walk,
        int (*func)(struct xfrm_policy *, int, int, void*), void *);
 extern void xfrm_policy_walk_done(struct xfrm_policy_walk *walk);
 int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl);
-struct xfrm_policy *xfrm_policy_bysel_ctx(u8 type, int dir,
+struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u8 type, int dir,
                                          struct xfrm_selector *sel,
                                          struct xfrm_sec_ctx *ctx, int delete,
                                          int *err);
-struct xfrm_policy *xfrm_policy_byid(u8, int dir, u32 id, int delete, int *err);
+struct xfrm_policy *xfrm_policy_byid(struct net *net, u8, int dir, u32 id, int delete, int *err);
-int xfrm_policy_flush(u8 type, struct xfrm_audit *audit_info);
+int xfrm_policy_flush(struct net *net, u8 type, struct xfrm_audit *audit_info);
 u32 xfrm_get_acqseq(void);
 extern int xfrm_alloc_spi(struct xfrm_state *x, u32 minspi, u32 maxspi);
-struct xfrm_state * xfrm_find_acq(u8 mode, u32 reqid, u8 proto,
+struct xfrm_state * xfrm_find_acq(struct net *net, u8 mode, u32 reqid, u8 proto,
                                  xfrm_address_t *daddr, xfrm_address_t *saddr,
                                  int create, unsigned short family);
 extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
@@ -1449,10 +1474,9 @@ extern int xfrm_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
                        struct xfrm_kmaddress *k);
 #endif
-extern wait_queue_head_t km_waitq;
 extern int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
 extern void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid);
-extern int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
+extern int km_report(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
 extern void xfrm_input_init(void);
 extern int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq);
@@ -1497,18 +1521,20 @@ static inline int xfrm_policy_id2dir(u32 index)
        return index & 7;
 }
-static inline int xfrm_aevent_is_on(void)
+#ifdef CONFIG_XFRM
+static inline int xfrm_aevent_is_on(struct net *net)
 {
        struct sock *nlsk;
        int ret = 0;
        rcu_read_lock();
-        nlsk = rcu_dereference(xfrm_nl);
+        nlsk = rcu_dereference(net->xfrm.nlsk);
        if (nlsk)
                ret = netlink_has_listeners(nlsk, XFRMNLGRP_AEVENTS);
        rcu_read_unlock();
        return ret;
 }
+#endif
 static inline int xfrm_alg_len(struct xfrm_algo *alg)
 {
@@ -1536,9 +1562,11 @@ static inline void xfrm_states_delete(struct xfrm_state **states, int n)
 }
 #endif
+#ifdef CONFIG_XFRM
 static inline struct xfrm_state *xfrm_input_state(struct sk_buff *skb)
 {
        return skb->sp->xvec[skb->sp->len - 1];
 }
+#endif
 #endif  /* _NET_XFRM_H */
diff --git a/include/scsi/fc/fc_els.h b/include/scsi/fc/fc_els.h
new file mode 100644
index 000000000000..195ca014d3ce
--- /dev/null
+++ b/include/scsi/fc/fc_els.h
@@ -0,0 +1,816 @@
+/*
+ * Copyright(c) 2007 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _FC_ELS_H_
+#define _FC_ELS_H_
+/*
+ * Fibre Channel Switch - Enhanced Link Services definitions.
+ * From T11 FC-LS Rev 1.2 June 7, 2005.
+ */
+/*
+ * ELS Command codes - byte 0 of the frame payload
+ */
+enum fc_els_cmd {
+        ELS_LS_RJT =    0x01,   /* ESL reject */
+        ELS_LS_ACC =    0x02,   /* ESL Accept */
+        ELS_PLOGI =     0x03,   /* N_Port login */
+        ELS_FLOGI =     0x04,   /* F_Port login */
+        ELS_LOGO =      0x05,   /* Logout */
+        ELS_ABTX =      0x06,   /* Abort exchange - obsolete */
+        ELS_RCS =       0x07,   /* read connection status */
+        ELS_RES =       0x08,   /* read exchange status block */
+        ELS_RSS =       0x09,   /* read sequence status block */
+        ELS_RSI =       0x0a,   /* read sequence initiative */
+        ELS_ESTS =      0x0b,   /* establish streaming */
+        ELS_ESTC =      0x0c,   /* estimate credit */
+        ELS_ADVC =      0x0d,   /* advise credit */
+        ELS_RTV =       0x0e,   /* read timeout value */
+        ELS_RLS =       0x0f,   /* read link error status block */
+        ELS_ECHO =      0x10,   /* echo */
+        ELS_TEST =      0x11,   /* test */
+        ELS_RRQ =       0x12,   /* reinstate recovery qualifier */
+        ELS_REC =       0x13,   /* read exchange concise */
+        ELS_SRR =       0x14,   /* sequence retransmission request */
+        ELS_PRLI =      0x20,   /* process login */
+        ELS_PRLO =      0x21,   /* process logout */
+        ELS_SCN =       0x22,   /* state change notification */
+        ELS_TPLS =      0x23,   /* test process login state */
+        ELS_TPRLO =     0x24,   /* third party process logout */
+        ELS_LCLM =      0x25,   /* login control list mgmt (obs) */
+        ELS_GAID =      0x30,   /* get alias_ID */
+        ELS_FACT =      0x31,   /* fabric activate alias_id */
+        ELS_FDACDT =    0x32,   /* fabric deactivate alias_id */
+        ELS_NACT =      0x33,   /* N-port activate alias_id */
+        ELS_NDACT =     0x34,   /* N-port deactivate alias_id */
+        ELS_QOSR =      0x40,   /* quality of service request */
+        ELS_RVCS =      0x41,   /* read virtual circuit status */
+        ELS_PDISC =     0x50,   /* discover N_port service params */
+        ELS_FDISC =     0x51,   /* discover F_port service params */
+        ELS_ADISC =     0x52,   /* discover address */
+        ELS_RNC =       0x53,   /* report node cap (obs) */
+        ELS_FARP_REQ =  0x54,   /* FC ARP request */
+        ELS_FARP_REPL = 0x55,   /* FC ARP reply */
+        ELS_RPS =       0x56,   /* read port status block */
+        ELS_RPL =       0x57,   /* read port list */
+        ELS_RPBC =      0x58,   /* read port buffer condition */
+        ELS_FAN =       0x60,   /* fabric address notification */
+        ELS_RSCN =      0x61,   /* registered state change notification */
+        ELS_SCR =       0x62,   /* state change registration */
+        ELS_RNFT =      0x63,   /* report node FC-4 types */
+        ELS_CSR =       0x68,   /* clock synch. request */
+        ELS_CSU =       0x69,   /* clock synch. update */
+        ELS_LINIT =     0x70,   /* loop initialize */
+        ELS_LSTS =      0x72,   /* loop status */
+        ELS_RNID =      0x78,   /* request node ID data */
+        ELS_RLIR =      0x79,   /* registered link incident report */
+        ELS_LIRR =      0x7a,   /* link incident record registration */
+        ELS_SRL =       0x7b,   /* scan remote loop */
+        ELS_SBRP =      0x7c,   /* set bit-error reporting params */
+        ELS_RPSC =      0x7d,   /* report speed capabilities */
+        ELS_QSA =       0x7e,   /* query security attributes */
+        ELS_EVFP =      0x7f,   /* exchange virt. fabrics params */
+        ELS_LKA =       0x80,   /* link keep-alive */
+        ELS_AUTH_ELS =  0x90,   /* authentication ELS */
+};
+/*
+ * Initializer useful for decoding table.
+ * Please keep this in sync with the above definitions.
+ */
+#define FC_ELS_CMDS_INIT {                      \
+        [ELS_LS_RJT] =  "LS_RJT",               \
+        [ELS_LS_ACC] =  "LS_ACC",               \
+        [ELS_PLOGI] =   "PLOGI",                \
+        [ELS_FLOGI] =   "FLOGI",                \
+        [ELS_LOGO] =    "LOGO",                 \
+        [ELS_ABTX] =    "ABTX",                 \
+        [ELS_RCS] =     "RCS",                  \
+        [ELS_RES] =     "RES",                  \
+        [ELS_RSS] =     "RSS",                  \
+        [ELS_RSI] =     "RSI",                  \
+        [ELS_ESTS] =    "ESTS",                 \
+        [ELS_ESTC] =    "ESTC",                 \
+        [ELS_ADVC] =    "ADVC",                 \
+        [ELS_RTV] =     "RTV",                  \
+        [ELS_RLS] =     "RLS",                  \
+        [ELS_ECHO] =    "ECHO",                 \
+        [ELS_TEST] =    "TEST",                 \
+        [ELS_RRQ] =     "RRQ",                  \
+        [ELS_REC] =     "REC",                  \
+        [ELS_SRR] =     "SRR",                  \
+        [ELS_PRLI] =    "PRLI",                 \
+        [ELS_PRLO] =    "PRLO",                 \
+        [ELS_SCN] =     "SCN",                  \
+        [ELS_TPLS] =    "TPLS",                 \
+        [ELS_TPRLO] =   "TPRLO",                \
+        [ELS_LCLM] =    "LCLM",                 \
+        [ELS_GAID] =    "GAID",                 \
+        [ELS_FACT] =    "FACT",                 \
+        [ELS_FDACDT] =  "FDACDT",               \
+        [ELS_NACT] =    "NACT",                 \
+        [ELS_NDACT] =   "NDACT",                \
+        [ELS_QOSR] =    "QOSR",                 \
+        [ELS_RVCS] =    "RVCS",                 \
+        [ELS_PDISC] =   "PDISC",                \
+        [ELS_FDISC] =   "FDISC",                \
+        [ELS_ADISC] =   "ADISC",                \
+        [ELS_RNC] =     "RNC",                  \
+        [ELS_FARP_REQ] = "FARP_REQ",            \
+        [ELS_FARP_REPL] =  "FARP_REPL",         \
+        [ELS_RPS] =     "RPS",                  \
+        [ELS_RPL] =     "RPL",                  \
+        [ELS_RPBC] =    "RPBC",                 \
+        [ELS_FAN] =     "FAN",                  \
+        [ELS_RSCN] =    "RSCN",                 \
+        [ELS_SCR] =     "SCR",                  \
+        [ELS_RNFT] =    "RNFT",                 \
+        [ELS_CSR] =     "CSR",                  \
+        [ELS_CSU] =     "CSU",                  \
+        [ELS_LINIT] =   "LINIT",                \
+        [ELS_LSTS] =    "LSTS",                 \
+        [ELS_RNID] =    "RNID",                 \
+        [ELS_RLIR] =    "RLIR",                 \
+        [ELS_LIRR] =    "LIRR",                 \
+        [ELS_SRL] =     "SRL",                  \
+        [ELS_SBRP] =    "SBRP",                 \
+        [ELS_RPSC] =    "RPSC",                 \
+        [ELS_QSA] =     "QSA",                  \
+        [ELS_EVFP] =    "EVFP",                 \
+        [ELS_LKA] =     "LKA",                  \
+        [ELS_AUTH_ELS] = "AUTH_ELS",            \
+}
+/*
+ * LS_ACC payload.
+ */
+struct fc_els_ls_acc {
+        __u8          la_cmd;           /* command code ELS_LS_ACC */
+        __u8          la_resv[3];       /* reserved */
+};
+/*
+ * ELS reject payload.
+ */
+struct fc_els_ls_rjt {
+        __u8    er_cmd;         /* command code ELS_LS_RJT */
+        __u8    er_resv[4];     /* reserved must be zero */
+        __u8    er_reason;      /* reason (enum fc_els_rjt_reason below) */
+        __u8    er_explan;      /* explanation (enum fc_els_rjt_explan below) */
+        __u8    er_vendor;      /* vendor specific code */
+};
+/*
+ * ELS reject reason codes (er_reason).
+ */
+enum fc_els_rjt_reason {
+        ELS_RJT_NONE =          0,      /* no reject - not to be sent */
+        ELS_RJT_INVAL =         0x01,   /* invalid ELS command code */
+        ELS_RJT_LOGIC =         0x03,   /* logical error */
+        ELS_RJT_BUSY =          0x05,   /* logical busy */
+        ELS_RJT_PROT =          0x07,   /* protocol error */
+        ELS_RJT_UNAB =          0x09,   /* unable to perform command request */
+        ELS_RJT_UNSUP =         0x0b,   /* command not supported */
+        ELS_RJT_INPROG =        0x0e,   /* command already in progress */
+        ELS_RJT_VENDOR =        0xff,   /* vendor specific error */
+};
+/*
+ * reason code explanation (er_explan).
+ */
+enum fc_els_rjt_explan {
+        ELS_EXPL_NONE =         0x00,   /* No additional explanation */
+        ELS_EXPL_SPP_OPT_ERR =  0x01,   /* service parameter error - options */
+        ELS_EXPL_SPP_ICTL_ERR = 0x03,   /* service parm error - initiator ctl */
+        ELS_EXPL_AH =           0x11,   /* invalid association header */
+        ELS_EXPL_AH_REQ =       0x13,   /* association_header required */
+        ELS_EXPL_SID =          0x15,   /* invalid originator S_ID */
+        ELS_EXPL_OXID_RXID =    0x17,   /* invalid OX_ID-RX_ID combination */
+        ELS_EXPL_INPROG =       0x19,   /* Request already in progress */
+        ELS_EXPL_PLOGI_REQD =   0x1e,   /* N_Port login required */
+        ELS_EXPL_INSUF_RES =    0x29,   /* insufficient resources */
+        ELS_EXPL_UNAB_DATA =    0x2a,   /* unable to supply requested data */
+        ELS_EXPL_UNSUPR =       0x2c,   /* Request not supported */
+        ELS_EXPL_INV_LEN =      0x2d,   /* Invalid payload length */
+        /* TBD - above definitions incomplete */
+};
+/*
+ * Common service parameters (N ports).
+ */
+struct fc_els_csp {
+        __u8            sp_hi_ver;      /* highest version supported (obs.) */
+        __u8            sp_lo_ver;      /* highest version supported (obs.) */
+        __be16          sp_bb_cred;     /* buffer-to-buffer credits */
+        __be16          sp_features;    /* common feature flags */
+        __be16          sp_bb_data;     /* b-b state number and data field sz */
+        union {
+                struct {
+                        __be16  _sp_tot_seq; /* total concurrent sequences */
+                        __be16  _sp_rel_off; /* rel. offset by info cat */
+                } sp_plogi;
+                struct {
+                        __be32  _sp_r_a_tov; /* resource alloc. timeout msec */
+                } sp_flogi_acc;
+        } sp_u;
+        __be32          sp_e_d_tov;     /* error detect timeout value */
+};
+#define sp_tot_seq      sp_u.sp_plogi._sp_tot_seq
+#define sp_rel_off      sp_u.sp_plogi._sp_rel_off
+#define sp_r_a_tov      sp_u.sp_flogi_acc._sp_r_a_tov
+#define FC_SP_BB_DATA_MASK 0xfff /* mask for data field size in sp_bb_data */
+/*
+ * Minimum and maximum values for max data field size in service parameters.
+ */
+#define FC_SP_MIN_MAX_PAYLOAD   FC_MIN_MAX_PAYLOAD
+#define FC_SP_MAX_MAX_PAYLOAD   FC_MAX_PAYLOAD
+/*
+ * sp_features
+ */
+#define FC_SP_FT_CIRO   0x8000  /* continuously increasing rel. off. */
+#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_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 */
+#define FC_SP_FT_MCAST  0x0200  /* multicast */
+#define FC_SP_FT_BCAST  0x0100  /* broadcast */
+#define FC_SP_FT_HUNT   0x0080  /* hunt group */
+#define FC_SP_FT_SIMP   0x0040  /* dedicated simplex */
+#define FC_SP_FT_SEC    0x0020  /* reserved for security */
+#define FC_SP_FT_CSYN   0x0010  /* clock synch. supported */
+#define FC_SP_FT_RTTOV  0x0008  /* R_T_TOV value 100 uS, else 100 mS */
+#define FC_SP_FT_HALF   0x0004  /* dynamic half duplex */
+#define FC_SP_FT_SEQC   0x0002  /* SEQ_CNT */
+#define FC_SP_FT_PAYL   0x0001  /* FLOGI payload length 256, else 116 */
+/*
+ * Class-specific service parameters.
+ */
+struct fc_els_cssp {
+        __be16          cp_class;       /* class flags */
+        __be16          cp_init;        /* initiator flags */
+        __be16          cp_recip;       /* recipient flags */
+        __be16          cp_rdfs;        /* receive data field size */
+        __be16          cp_con_seq;     /* concurrent sequences */
+        __be16          cp_ee_cred;     /* N-port end-to-end credit */
+        __u8            cp_resv1;       /* reserved */
+        __u8            cp_open_seq;    /* open sequences per exchange */
+        __u8            _cp_resv2[2];   /* reserved */
+};
+/*
+ * cp_class flags.
+ */
+#define FC_CPC_VALID    0x8000          /* class valid */
+#define FC_CPC_IMIX     0x4000          /* intermix mode */
+#define FC_CPC_SEQ      0x0800          /* sequential delivery */
+#define FC_CPC_CAMP     0x0200          /* camp-on */
+#define FC_CPC_PRI      0x0080          /* priority */
+/*
+ * cp_init flags.
+ * (TBD: not all flags defined here).
+ */
+#define FC_CPI_CSYN     0x0010          /* clock synch. capable */
+/*
+ * cp_recip flags.
+ */
+#define FC_CPR_CSYN     0x0008          /* clock synch. capable */
+/*
+ * NFC_ELS_FLOGI: Fabric login request.
+ * NFC_ELS_PLOGI: Port login request (same format).
+ */
+struct fc_els_flogi {
+        __u8            fl_cmd;         /* command */
+        __u8            _fl_resvd[3];   /* must be zero */
+        struct fc_els_csp fl_csp;       /* common service parameters */
+        __be64          fl_wwpn;        /* port name */
+        __be64          fl_wwnn;        /* node name */
+        struct fc_els_cssp fl_cssp[4];  /* class 1-4 service parameters */
+        __u8            fl_vend[16];    /* vendor version level */
+} __attribute__((__packed__));
+/*
+ * Process login service parameter page.
+ */
+struct fc_els_spp {
+        __u8            spp_type;       /* type code or common service params */
+        __u8            spp_type_ext;   /* type code extension */
+        __u8            spp_flags;
+        __u8            _spp_resvd;
+        __be32          spp_orig_pa;    /* originator process associator */
+        __be32          spp_resp_pa;    /* responder process associator */
+        __be32          spp_params;     /* service parameters */
+};
+/*
+ * spp_flags.
+ */
+#define FC_SPP_OPA_VAL      0x80        /* originator proc. assoc. valid */
+#define FC_SPP_RPA_VAL      0x40        /* responder proc. assoc. valid */
+#define FC_SPP_EST_IMG_PAIR 0x20        /* establish image pair */
+#define FC_SPP_RESP_MASK    0x0f        /* mask for response code (below) */
+/*
+ * SPP response code in spp_flags - lower 4 bits.
+ */
+enum fc_els_spp_resp {
+        FC_SPP_RESP_ACK =       1,      /* request executed */
+        FC_SPP_RESP_RES =       2,      /* unable due to lack of resources */
+        FC_SPP_RESP_INIT =      3,      /* initialization not complete */
+        FC_SPP_RESP_NO_PA =     4,      /* unknown process associator */
+        FC_SPP_RESP_CONF =      5,      /* configuration precludes image pair */
+        FC_SPP_RESP_COND =      6,      /* request completed conditionally */
+        FC_SPP_RESP_MULT =      7,      /* unable to handle multiple SPPs */
+        FC_SPP_RESP_INVL =      8,      /* SPP is invalid */
+};
+/*
+ * ELS_RRQ - Reinstate Recovery Qualifier
+ */
+struct fc_els_rrq {
+        __u8            rrq_cmd;        /* command (0x12) */
+        __u8            rrq_zero[3];    /* specified as zero - part of cmd */
+        __u8            rrq_resvd;      /* reserved */
+        __u8            rrq_s_id[3];    /* originator FID */
+        __be16          rrq_ox_id;      /* originator exchange ID */
+        __be16          rrq_rx_id;      /* responders exchange ID */
+};
+/*
+ * ELS_REC - Read exchange concise.
+ */
+struct fc_els_rec {
+        __u8            rec_cmd;        /* command (0x13) */
+        __u8            rec_zero[3];    /* specified as zero - part of cmd */
+        __u8            rec_resvd;      /* reserved */
+        __u8            rec_s_id[3];    /* originator FID */
+        __be16          rec_ox_id;      /* originator exchange ID */
+        __be16          rec_rx_id;      /* responders exchange ID */
+};
+/*
+ * ELS_REC LS_ACC payload.
+ */
+struct fc_els_rec_acc {
+        __u8            reca_cmd;       /* accept (0x02) */
+        __u8            reca_zero[3];   /* specified as zero - part of cmd */
+        __be16          reca_ox_id;     /* originator exchange ID */
+        __be16          reca_rx_id;     /* responders exchange ID */
+        __u8            reca_resvd1;    /* reserved */
+        __u8            reca_ofid[3];   /* originator FID */
+        __u8            reca_resvd2;    /* reserved */
+        __u8            reca_rfid[3];   /* responder FID */
+        __be32          reca_fc4value;  /* FC4 value */
+        __be32          reca_e_stat;    /* ESB (exchange status block) status */
+};
+/*
+ * ELS_PRLI - Process login request and response.
+ */
+struct fc_els_prli {
+        __u8            prli_cmd;       /* command */
+        __u8            prli_spp_len;   /* length of each serv. parm. page */
+        __be16          prli_len;       /* length of entire payload */
+        /* service parameter pages follow */
+};
+/*
+ * ELS_ADISC payload
+ */
+struct fc_els_adisc {
+        __u8            adisc_cmd;
+        __u8            adisc_resv[3];
+        __u8            adisc_resv1;
+        __u8            adisc_hard_addr[3];
+        __be64          adisc_wwpn;
+        __be64          adisc_wwnn;
+        __u8            adisc_resv2;
+        __u8            adisc_port_id[3];
+} __attribute__((__packed__));
+/*
+ * ELS_LOGO - process or fabric logout.
+ */
+struct fc_els_logo {
+        __u8            fl_cmd;         /* command code */
+        __u8            fl_zero[3];     /* specified as zero - part of cmd */
+        __u8            fl_resvd;       /* reserved */
+        __u8            fl_n_port_id[3];/* N port ID */
+        __be64          fl_n_port_wwn;  /* port name */
+};
+/*
+ * ELS_RTV - read timeout value.
+ */
+struct fc_els_rtv {
+        __u8            rtv_cmd;        /* command code 0x0e */
+        __u8            rtv_zero[3];    /* specified as zero - part of cmd */
+};
+/*
+ * LS_ACC for ELS_RTV - read timeout value.
+ */
+struct fc_els_rtv_acc {
+        __u8            rtv_cmd;        /* command code 0x02 */
+        __u8            rtv_zero[3];    /* specified as zero - part of cmd */
+        __be32          rtv_r_a_tov;    /* resource allocation timeout value */
+        __be32          rtv_e_d_tov;    /* error detection timeout value */
+        __be32          rtv_toq;        /* timeout qualifier (see below) */
+};
+/*
+ * rtv_toq bits.
+ */
+#define FC_ELS_RTV_EDRES (1 << 26)      /* E_D_TOV resolution is nS else mS */
+#define FC_ELS_RTV_RTTOV (1 << 19)      /* R_T_TOV is 100 uS else 100 mS */
+/*
+ * ELS_SCR - state change registration payload.
+ */
+struct fc_els_scr {
+        __u8            scr_cmd;        /* command code */
+        __u8            scr_resv[6];    /* reserved */
+        __u8            scr_reg_func;   /* registration function (see below) */
+};
+enum fc_els_scr_func {
+        ELS_SCRF_FAB =  1,      /* fabric-detected registration */
+        ELS_SCRF_NPORT = 2,     /* Nx_Port-detected registration */
+        ELS_SCRF_FULL = 3,      /* full registration */
+        ELS_SCRF_CLEAR = 255,   /* remove any current registrations */
+};
+/*
+ * ELS_RSCN - registered state change notification payload.
+ */
+struct fc_els_rscn {
+        __u8            rscn_cmd;       /* RSCN opcode (0x61) */
+        __u8            rscn_page_len;  /* page length (4) */
+        __be16          rscn_plen;      /* payload length including this word */
+        /* followed by 4-byte generic affected Port_ID pages */
+};
+struct fc_els_rscn_page {
+        __u8            rscn_page_flags; /* event and address format */
+        __u8            rscn_fid[3];    /* fabric ID */
+};
+#define ELS_RSCN_EV_QUAL_BIT    2       /* shift count for event qualifier */
+#define ELS_RSCN_EV_QUAL_MASK   0xf     /* mask for event qualifier */
+#define ELS_RSCN_ADDR_FMT_BIT   0       /* shift count for address format */
+#define ELS_RSCN_ADDR_FMT_MASK  0x3     /* mask for address format */
+enum fc_els_rscn_ev_qual {
+        ELS_EV_QUAL_NONE = 0,           /* unspecified */
+        ELS_EV_QUAL_NS_OBJ = 1,         /* changed name server object */
+        ELS_EV_QUAL_PORT_ATTR = 2,      /* changed port attribute */
+        ELS_EV_QUAL_SERV_OBJ = 3,       /* changed service object */
+        ELS_EV_QUAL_SW_CONFIG = 4,      /* changed switch configuration */
+        ELS_EV_QUAL_REM_OBJ = 5,        /* removed object */
+};
+enum fc_els_rscn_addr_fmt {
+        ELS_ADDR_FMT_PORT = 0,  /* rscn_fid is a port address */
+        ELS_ADDR_FMT_AREA = 1,  /* rscn_fid is a area address */
+        ELS_ADDR_FMT_DOM = 2,   /* rscn_fid is a domain address */
+        ELS_ADDR_FMT_FAB = 3,   /* anything on fabric may have changed */
+};
+/*
+ * ELS_RNID - request Node ID.
+ */
+struct fc_els_rnid {
+        __u8            rnid_cmd;       /* RNID opcode (0x78) */
+        __u8            rnid_resv[3];   /* reserved */
+        __u8            rnid_fmt;       /* data format */
+        __u8            rnid_resv2[3];  /* reserved */
+};
+/*
+ * Node Identification Data formats (rnid_fmt)
+ */
+enum fc_els_rnid_fmt {
+        ELS_RNIDF_NONE = 0,             /* no specific identification data */
+        ELS_RNIDF_GEN = 0xdf,           /* general topology discovery format */
+};
+/*
+ * ELS_RNID response.
+ */
+struct fc_els_rnid_resp {
+        __u8            rnid_cmd;       /* response code (LS_ACC) */
+        __u8            rnid_resv[3];   /* reserved */
+        __u8            rnid_fmt;       /* data format */
+        __u8            rnid_cid_len;   /* common ID data length */
+        __u8            rnid_resv2;     /* reserved */
+        __u8            rnid_sid_len;   /* specific ID data length */
+};
+struct fc_els_rnid_cid {
+        __be64          rnid_wwpn;      /* N port name */
+        __be64          rnid_wwnn;      /* node name */
+};
+struct fc_els_rnid_gen {
+        __u8            rnid_vend_id[16]; /* vendor-unique ID */
+        __be32          rnid_atype;     /* associated type (see below) */
+        __be32          rnid_phys_port; /* physical port number */
+        __be32          rnid_att_nodes; /* number of attached nodes */
+        __u8            rnid_node_mgmt; /* node management (see below) */
+        __u8            rnid_ip_ver;    /* IP version (see below) */
+        __be16          rnid_prot_port; /* UDP / TCP port number */
+        __be32          rnid_ip_addr[4]; /* IP address */
+        __u8            rnid_resvd[2];  /* reserved */
+        __be16          rnid_vend_spec; /* vendor-specific field */
+};
+enum fc_els_rnid_atype {
+        ELS_RNIDA_UNK =         0x01,   /* unknown */
+        ELS_RNIDA_OTHER =       0x02,   /* none of the following */
+        ELS_RNIDA_HUB =         0x03,
+        ELS_RNIDA_SWITCH =      0x04,
+        ELS_RNIDA_GATEWAY =     0x05,
+        ELS_RNIDA_CONV =        0x06,   /* Obsolete, do not use this value */
+        ELS_RNIDA_HBA =         0x07,   /* Obsolete, do not use this value */
+        ELS_RNIDA_PROXY =       0x08,   /* Obsolete, do not use this value */
+        ELS_RNIDA_STORAGE =     0x09,
+        ELS_RNIDA_HOST =        0x0a,
+        ELS_RNIDA_SUBSYS =      0x0b,   /* storage subsystem (e.g., RAID) */
+        ELS_RNIDA_ACCESS =      0x0e,   /* access device (e.g. media changer) */
+        ELS_RNIDA_NAS =         0x11,   /* NAS server */
+        ELS_RNIDA_BRIDGE =      0x12,   /* bridge */
+        ELS_RNIDA_VIRT =        0x13,   /* virtualization device */
+        ELS_RNIDA_MF =          0xff,   /* multifunction device (bits below) */
+        ELS_RNIDA_MF_HUB =      1UL << 31,      /* hub */
+        ELS_RNIDA_MF_SW =       1UL << 30,      /* switch */
+        ELS_RNIDA_MF_GW =       1UL << 29,      /* gateway */
+        ELS_RNIDA_MF_ST =       1UL << 28,      /* storage */
+        ELS_RNIDA_MF_HOST =     1UL << 27,      /* host */
+        ELS_RNIDA_MF_SUB =      1UL << 26,      /* storage subsystem */
+        ELS_RNIDA_MF_ACC =      1UL << 25,      /* storage access dev */
+        ELS_RNIDA_MF_WDM =      1UL << 24,      /* wavelength division mux */
+        ELS_RNIDA_MF_NAS =      1UL << 23,      /* NAS server */
+        ELS_RNIDA_MF_BR =       1UL << 22,      /* bridge */
+        ELS_RNIDA_MF_VIRT =     1UL << 21,      /* virtualization device */
+};
+enum fc_els_rnid_mgmt {
+        ELS_RNIDM_SNMP =        0,
+        ELS_RNIDM_TELNET =      1,
+        ELS_RNIDM_HTTP =        2,
+        ELS_RNIDM_HTTPS =       3,
+        ELS_RNIDM_XML =         4,      /* HTTP + XML */
+};
+enum fc_els_rnid_ipver {
+        ELS_RNIDIP_NONE =       0,      /* no IP support or node mgmt. */
+        ELS_RNIDIP_V4 =         1,      /* IPv4 */
+        ELS_RNIDIP_V6 =         2,      /* IPv6 */
+};
+/*
+ * ELS RPL - Read Port List.
+ */
+struct fc_els_rpl {
+        __u8            rpl_cmd;        /* command */
+        __u8            rpl_resv[5];    /* reserved - must be zero */
+        __be16          rpl_max_size;   /* maximum response size or zero */
+        __u8            rpl_resv1;      /* reserved - must be zero */
+        __u8            rpl_index[3];   /* starting index */
+};
+/*
+ * Port number block in RPL response.
+ */
+struct fc_els_pnb {
+        __be32          pnb_phys_pn;    /* physical port number */
+        __u8            pnb_resv;       /* reserved */
+        __u8            pnb_port_id[3]; /* port ID */
+        __be64          pnb_wwpn;       /* port name */
+};
+/*
+ * RPL LS_ACC response.
+ */
+struct fc_els_rpl_resp {
+        __u8            rpl_cmd;        /* ELS_LS_ACC */
+        __u8            rpl_resv1;      /* reserved - must be zero */
+        __be16          rpl_plen;       /* payload length */
+        __u8            rpl_resv2;      /* reserved - must be zero */
+        __u8            rpl_llen[3];    /* list length */
+        __u8            rpl_resv3;      /* reserved - must be zero */
+        __u8            rpl_index[3];   /* starting index */
+        struct fc_els_pnb rpl_pnb[1];   /* variable number of PNBs */
+};
+/*
+ * Link Error Status Block.
+ */
+struct fc_els_lesb {
+        __be32          lesb_link_fail; /* link failure count */
+        __be32          lesb_sync_loss; /* loss of synchronization count */
+        __be32          lesb_sig_loss;  /* loss of signal count */
+        __be32          lesb_prim_err;  /* primitive sequence error count */
+        __be32          lesb_inv_word;  /* invalid transmission word count */
+        __be32          lesb_inv_crc;   /* invalid CRC count */
+};
+/*
+ * ELS RPS - Read Port Status Block request.
+ */
+struct fc_els_rps {
+        __u8            rps_cmd;        /* command */
+        __u8            rps_resv[2];    /* reserved - must be zero */
+        __u8            rps_flag;       /* flag - see below */
+        __be64          rps_port_spec;  /* port selection */
+};
+enum fc_els_rps_flag {
+        FC_ELS_RPS_DID =        0x00,   /* port identified by D_ID of req. */
+        FC_ELS_RPS_PPN =        0x01,   /* port_spec is physical port number */
+        FC_ELS_RPS_WWPN =       0x02,   /* port_spec is port WWN */
+};
+/*
+ * ELS RPS LS_ACC response.
+ */
+struct fc_els_rps_resp {
+        __u8            rps_cmd;        /* command - LS_ACC */
+        __u8            rps_resv[2];    /* reserved - must be zero */
+        __u8            rps_flag;       /* flag - see below */
+        __u8            rps_resv2[2];   /* reserved */
+        __be16          rps_status;     /* port status - see below */
+        struct fc_els_lesb rps_lesb;    /* link error status block */
+};
+enum fc_els_rps_resp_flag {
+        FC_ELS_RPS_LPEV =       0x01,   /* L_port extension valid */
+};
+enum fc_els_rps_resp_status {
+        FC_ELS_RPS_PTP =        1 << 5, /* point-to-point connection */
+        FC_ELS_RPS_LOOP =       1 << 4, /* loop mode */
+        FC_ELS_RPS_FAB =        1 << 3, /* fabric present */
+        FC_ELS_RPS_NO_SIG =     1 << 2, /* loss of signal */
+        FC_ELS_RPS_NO_SYNC =    1 << 1, /* loss of synchronization */
+        FC_ELS_RPS_RESET =      1 << 0, /* in link reset protocol */
+};
+/*
+ * ELS LIRR - Link Incident Record Registration request.
+ */
+struct fc_els_lirr {
+        __u8            lirr_cmd;       /* command */
+        __u8            lirr_resv[3];   /* reserved - must be zero */
+        __u8            lirr_func;      /* registration function */
+        __u8            lirr_fmt;       /* FC-4 type of RLIR requested */
+        __u8            lirr_resv2[2];  /* reserved - must be zero */
+};
+enum fc_els_lirr_func {
+        ELS_LIRR_SET_COND =     0x01,   /* set - conditionally receive */
+        ELS_LIRR_SET_UNCOND =   0x02,   /* set - unconditionally receive */
+        ELS_LIRR_CLEAR =        0xff    /* clear registration */
+};
+/*
+ * ELS SRL - Scan Remote Loop request.
+ */
+struct fc_els_srl {
+        __u8            srl_cmd;        /* command */
+        __u8            srl_resv[3];    /* reserved - must be zero */
+        __u8            srl_flag;       /* flag - see below */
+        __u8            srl_flag_param[3];      /* flag parameter */
+};
+enum fc_els_srl_flag {
+        FC_ELS_SRL_ALL =        0x00,   /* scan all FL ports */
+        FC_ELS_SRL_ONE =        0x01,   /* scan specified loop */
+        FC_ELS_SRL_EN_PER =     0x02,   /* enable periodic scanning (param) */
+        FC_ELS_SRL_DIS_PER =    0x03,   /* disable periodic scanning */
+};
+/*
+ * ELS RLS - Read Link Error Status Block request.
+ */
+struct fc_els_rls {
+        __u8            rls_cmd;        /* command */
+        __u8            rls_resv[4];    /* reserved - must be zero */
+        __u8            rls_port_id[3]; /* port ID */
+};
+/*
+ * ELS RLS LS_ACC Response.
+ */
+struct fc_els_rls_resp {
+        __u8            rls_cmd;        /* ELS_LS_ACC */
+        __u8            rls_resv[3];    /* reserved - must be zero */
+        struct fc_els_lesb rls_lesb;    /* link error status block */
+};
+/*
+ * ELS RLIR - Registered Link Incident Report.
+ * This is followed by the CLIR and the CLID, described below.
+ */
+struct fc_els_rlir {
+        __u8            rlir_cmd;       /* command */
+        __u8            rlir_resv[3];   /* reserved - must be zero */
+        __u8            rlir_fmt;       /* format (FC4-type if type specific) */
+        __u8            rlir_clr_len;   /* common link incident record length */
+        __u8            rlir_cld_len;   /* common link incident desc. length */
+        __u8            rlir_slr_len;   /* spec. link incident record length */
+};
+/*
+ * CLIR - Common Link Incident Record Data. - Sent via RLIR.
+ */
+struct fc_els_clir {
+        __be64          clir_wwpn;      /* incident port name */
+        __be64          clir_wwnn;      /* incident port node name */
+        __u8            clir_port_type; /* incident port type */
+        __u8            clir_port_id[3];        /* incident port ID */
+        __be64          clir_conn_wwpn; /* connected port name */
+        __be64          clir_conn_wwnn; /* connected node name */
+        __be64          clir_fab_name;  /* fabric name */
+        __be32          clir_phys_port; /* physical port number */
+        __be32          clir_trans_id;  /* transaction ID */
+        __u8            clir_resv[3];   /* reserved */
+        __u8            clir_ts_fmt;    /* time stamp format */
+        __be64          clir_timestamp; /* time stamp */
+};
+/*
+ * CLIR clir_ts_fmt - time stamp format values.
+ */
+enum fc_els_clir_ts_fmt {
+        ELS_CLIR_TS_UNKNOWN =   0,      /* time stamp field unknown */
+        ELS_CLIR_TS_SEC_FRAC =  1,      /* time in seconds and fractions */
+        ELS_CLIR_TS_CSU =       2,      /* time in clock synch update format */
+};
+/*
+ * Common Link Incident Descriptor - sent via RLIR.
+ */
+struct fc_els_clid {
+        __u8            clid_iq;        /* incident qualifier flags */
+        __u8            clid_ic;        /* incident code */
+        __be16          clid_epai;      /* domain/area of ISL */
+};
+/*
+ * CLID incident qualifier flags.
+ */
+enum fc_els_clid_iq {
+        ELS_CLID_SWITCH =       0x20,   /* incident port is a switch node */
+        ELS_CLID_E_PORT =       0x10,   /* incident is an ISL (E) port */
+        ELS_CLID_SEV_MASK =     0x0c,   /* severity 2-bit field mask */
+        ELS_CLID_SEV_INFO =     0x00,   /* report is informational */
+        ELS_CLID_SEV_INOP =     0x08,   /* link not operational */
+        ELS_CLID_SEV_DEG =      0x04,   /* link degraded but operational */
+        ELS_CLID_LASER =        0x02,   /* subassembly is a laser */
+        ELS_CLID_FRU =          0x01,   /* format can identify a FRU */
+};
+/*
+ * CLID incident code.
+ */
+enum fc_els_clid_ic {
+        ELS_CLID_IC_IMPL =      1,      /* implicit incident */
+        ELS_CLID_IC_BER =       2,      /* bit-error-rate threshold exceeded */
+        ELS_CLID_IC_LOS =       3,      /* loss of synch or signal */
+        ELS_CLID_IC_NOS =       4,      /* non-operational primitive sequence */
+        ELS_CLID_IC_PST =       5,      /* primitive sequence timeout */
+        ELS_CLID_IC_INVAL =     6,      /* invalid primitive sequence */
+        ELS_CLID_IC_LOOP_TO =   7,      /* loop initialization time out */
+        ELS_CLID_IC_LIP =       8,      /* receiving LIP */
+};
+#endif /* _FC_ELS_H_ */
diff --git a/include/scsi/fc/fc_encaps.h b/include/scsi/fc/fc_encaps.h
new file mode 100644
index 000000000000..f180c3e16220
--- /dev/null
+++ b/include/scsi/fc/fc_encaps.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright(c) 2007 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _FC_ENCAPS_H_
+#define _FC_ENCAPS_H_
+/*
+ * Protocol definitions from RFC 3643 - Fibre Channel Frame Encapsulation.
+ *
+ * Note:  The frame length field is the number of 32-bit words in
+ * the encapsulation including the fcip_encaps_header, CRC and EOF words.
+ * The minimum frame length value in bytes is (32 + 24 + 4 + 4) * 4 = 64.
+ * The maximum frame length value in bytes is (32 + 24 + 2112 + 4 + 4) = 2172.
+ */
+#define FC_ENCAPS_MIN_FRAME_LEN 64      /* min frame len (bytes) (see above) */
+#define FC_ENCAPS_MAX_FRAME_LEN (FC_ENCAPS_MIN_FRAME_LEN + FC_MAX_PAYLOAD)
+#define FC_ENCAPS_VER       1           /* current version number */
+struct fc_encaps_hdr {
+        __u8    fc_proto;       /* protocol number */
+        __u8    fc_ver;         /* version of encapsulation */
+        __u8    fc_proto_n;     /* ones complement of protocol */
+        __u8    fc_ver_n;       /* ones complement of version */
+        unsigned char fc_proto_data[8]; /* protocol specific data */
+        __be16  fc_len_flags;   /* 10-bit length/4 w/ 6 flag bits */
+        __be16  fc_len_flags_n; /* ones complement of length / flags */
+        /*
+         * Offset 0x10
+         */
+        __be32  fc_time[2];     /* time stamp: seconds and fraction */
+        __be32  fc_crc;         /* CRC */
+        __be32  fc_sof;         /* start of frame (see FC_SOF below) */
+        /* 0x20 - FC frame content followed by EOF word */
+};
+#define FCIP_ENCAPS_HDR_LEN 0x20        /* expected length for asserts */
+/*
+ * Macro's for making redundant copies of EOF and SOF.
+ */
+#define FC_XY(x, y)             ((((x) & 0xff) << 8) | ((y) & 0xff))
+#define FC_XYXY(x, y)           ((FCIP_XY(x, y) << 16) | FCIP_XY(x, y))
+#define FC_XYNN(x, y)           (FCIP_XYXY(x, y) ^ 0xffff)
+#define FC_SOF_ENCODE(n)        FC_XYNN(n, n)
+#define FC_EOF_ENCODE(n)        FC_XYNN(n, n)
+/*
+ * SOF / EOF bytes.
+ */
+enum fc_sof {
+        FC_SOF_F =      0x28,   /* fabric */
+        FC_SOF_I4 =     0x29,   /* initiate class 4 */
+        FC_SOF_I2 =     0x2d,   /* initiate class 2 */
+        FC_SOF_I3 =     0x2e,   /* initiate class 3 */
+        FC_SOF_N4 =     0x31,   /* normal class 4 */
+        FC_SOF_N2 =     0x35,   /* normal class 2 */
+        FC_SOF_N3 =     0x36,   /* normal class 3 */
+        FC_SOF_C4 =     0x39,   /* activate class 4 */
+} __attribute__((packed));
+enum fc_eof {
+        FC_EOF_N =      0x41,   /* normal (not last frame of seq) */
+        FC_EOF_T =      0x42,   /* terminate (last frame of sequence) */
+        FC_EOF_RT =     0x44,
+        FC_EOF_DT =     0x46,   /* disconnect-terminate class-1 */
+        FC_EOF_NI =     0x49,   /* normal-invalid */
+        FC_EOF_DTI =    0x4e,   /* disconnect-terminate-invalid */
+        FC_EOF_RTI =    0x4f,
+        FC_EOF_A =      0x50,   /* abort */
+} __attribute__((packed));
+#define FC_SOF_CLASS_MASK 0x06  /* mask for class of service in SOF */
+/*
+ * Define classes in terms of the SOF code (initial).
+ */
+enum fc_class {
+        FC_CLASS_NONE = 0,      /* software value indicating no class */
+        FC_CLASS_2 =    FC_SOF_I2,
+        FC_CLASS_3 =    FC_SOF_I3,
+        FC_CLASS_4 =    FC_SOF_I4,
+        FC_CLASS_F =    FC_SOF_F,
+};
+/*
+ * Determine whether SOF code indicates the need for a BLS ACK.
+ */
+static inline int fc_sof_needs_ack(enum fc_sof sof)
+{
+        return (~sof) & 0x02;   /* true for class 1, 2, 4, 6, or F */
+}
+/*
+ * Given an fc_class, return the normal (non-initial) SOF value.
+ */
+static inline enum fc_sof fc_sof_normal(enum fc_class class)
+{
+        return class + FC_SOF_N3 - FC_SOF_I3;   /* diff is always 8 */
+}
+/*
+ * Compute class from SOF value.
+ */
+static inline enum fc_class fc_sof_class(enum fc_sof sof)
+{
+        return (sof & 0x7) | FC_SOF_F;
+}
+/*
+ * Determine whether SOF is for the initial frame of a sequence.
+ */
+static inline int fc_sof_is_init(enum fc_sof sof)
+{
+        return sof < 0x30;
+}
+#endif /* _FC_ENCAPS_H_ */
diff --git a/include/scsi/fc/fc_fc2.h b/include/scsi/fc/fc_fc2.h
new file mode 100644
index 000000000000..cff8a8c22f50
--- /dev/null
+++ b/include/scsi/fc/fc_fc2.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright(c) 2007 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _FC_FC2_H_
+#define _FC_FC2_H_
+/*
+ * Fibre Channel Exchanges and Sequences.
+ */
+#ifndef PACKED
+#define PACKED  __attribute__ ((__packed__))
+#endif /* PACKED */
+/*
+ * Sequence Status Block.
+ * This format is set by the FC-FS standard and is sent over the wire.
+ * Note that the fields aren't all naturally aligned.
+ */
+struct fc_ssb {
+        __u8    ssb_seq_id;             /* sequence ID */
+        __u8    _ssb_resvd;
+        __be16  ssb_low_seq_cnt;        /* lowest SEQ_CNT */
+        __be16  ssb_high_seq_cnt;       /* highest SEQ_CNT */
+        __be16  ssb_s_stat;             /* sequence status flags */
+        __be16  ssb_err_seq_cnt;        /* error SEQ_CNT */
+        __u8    ssb_fh_cs_ctl;          /* frame header CS_CTL */
+        __be16  ssb_fh_ox_id;           /* frame header OX_ID */
+        __be16  ssb_rx_id;              /* responder's exchange ID */
+        __u8    _ssb_resvd2[2];
+} PACKED;
+/*
+ * The SSB should be 17 bytes.  Since it's layout is somewhat strange,
+ * we define the size here so that code can ASSERT that the size comes out
+ * correct.
+ */
+#define FC_SSB_SIZE         17          /* length of fc_ssb for assert */
+/*
+ * ssb_s_stat - flags from FC-FS-2 T11/1619-D Rev 0.90.
+ */
+#define SSB_ST_RESP         (1 << 15)   /* sequence responder */
+#define SSB_ST_ACTIVE       (1 << 14)   /* sequence is active */
+#define SSB_ST_ABNORMAL     (1 << 12)   /* abnormal ending condition */
+#define SSB_ST_REQ_MASK     (3 << 10)   /* ACK, abort sequence condition */
+#define SSB_ST_REQ_CONT     (0 << 10)
+#define SSB_ST_REQ_ABORT    (1 << 10)
+#define SSB_ST_REQ_STOP     (2 << 10)
+#define SSB_ST_REQ_RETRANS  (3 << 10)
+#define SSB_ST_ABTS         (1 << 9)    /* ABTS protocol completed */
+#define SSB_ST_RETRANS      (1 << 8)    /* retransmission completed */
+#define SSB_ST_TIMEOUT      (1 << 7)    /* sequence timed out by recipient */
+#define SSB_ST_P_RJT        (1 << 6)    /* P_RJT transmitted */
+#define SSB_ST_CLASS_BIT    4           /* class of service field LSB */
+#define SSB_ST_CLASS_MASK   3           /* class of service mask */
+#define SSB_ST_ACK          (1 << 3)    /* ACK (EOFt or EOFdt) transmitted */
+/*
+ * Exchange Status Block.
+ * This format is set by the FC-FS standard and is sent over the wire.
+ * Note that the fields aren't all naturally aligned.
+ */
+struct fc_esb {
+        __u8    esb_cs_ctl;             /* CS_CTL for frame header */
+        __be16  esb_ox_id;              /* originator exchange ID */
+        __be16  esb_rx_id;              /* responder exchange ID */
+        __be32  esb_orig_fid;           /* fabric ID of originator */
+        __be32  esb_resp_fid;           /* fabric ID of responder */
+        __be32  esb_e_stat;             /* status */
+        __u8    _esb_resvd[4];
+        __u8    esb_service_params[112]; /* TBD */
+        __u8    esb_seq_status[8];      /* sequence statuses, 8 bytes each */
+} __attribute__((packed));;
+/*
+ * Define expected size for ASSERTs.
+ * See comments on FC_SSB_SIZE.
+ */
+#define FC_ESB_SIZE         (1 + 5*4 + 112 + 8)     /* expected size */
+/*
+ * esb_e_stat - flags from FC-FS-2 T11/1619-D Rev 0.90.
+ */
+#define ESB_ST_RESP         (1 << 31)   /* responder to exchange */
+#define ESB_ST_SEQ_INIT     (1 << 30)   /* port holds sequence initiaive */
+#define ESB_ST_COMPLETE     (1 << 29)   /* exchange is complete */
+#define ESB_ST_ABNORMAL     (1 << 28)   /* abnormal ending condition */
+#define ESB_ST_REC_QUAL     (1 << 26)   /* recovery qualifier active */
+#define ESB_ST_ERRP_BIT     24          /* LSB for error policy */
+#define ESB_ST_ERRP_MASK    (3 << 24)   /* mask for error policy */
+#define ESB_ST_ERRP_MULT    (0 << 24)   /* abort, discard multiple sequences */
+#define ESB_ST_ERRP_SING    (1 << 24)   /* abort, discard single sequence */
+#define ESB_ST_ERRP_INF     (2 << 24)   /* process with infinite buffers */
+#define ESB_ST_ERRP_IMM     (3 << 24)   /* discard mult. with immed. retran. */
+#define ESB_ST_OX_ID_INVL   (1 << 23)   /* originator XID invalid */
+#define ESB_ST_RX_ID_INVL   (1 << 22)   /* responder XID invalid */
+#define ESB_ST_PRI_INUSE    (1 << 21)   /* priority / preemption in use */
+#endif /* _FC_FC2_H_ */
diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h
new file mode 100644
index 000000000000..57aaa8f0d613
--- /dev/null
+++ b/include/scsi/fc/fc_fcoe.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright(c) 2007 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _FC_FCOE_H_
+#define _FC_FCOE_H_
+/*
+ * FCoE - Fibre Channel over Ethernet.
+ */
+/*
+ * The FCoE ethertype eventually goes in net/if_ether.h.
+ */
+#ifndef ETH_P_FCOE
+#define ETH_P_FCOE      0x8906          /* FCOE ether type */
+#endif
+#ifndef ETH_P_8021Q
+#define ETH_P_8021Q     0x8100
+#endif
+/*
+ * FC_FCOE_OUI hasn't been standardized yet.   XXX TBD.
+ */
+#ifndef FC_FCOE_OUI
+#define FC_FCOE_OUI     0x0efc00        /* upper 24 bits of FCOE dest MAC TBD */
+#endif
+/*
+ * The destination MAC address for the fabric login may get a different OUI.
+ * This isn't standardized yet.
+ */
+#ifndef FC_FCOE_FLOGI_MAC
+/* gateway MAC - TBD */
+#define FC_FCOE_FLOGI_MAC { 0x0e, 0xfc, 0x00, 0xff, 0xff, 0xfe }
+#endif
+#define FC_FCOE_VER     0                       /* version */
+/*
+ * Ethernet Addresses based on FC S_ID and D_ID.
+ * Generated by FC_FCOE_OUI | S_ID/D_ID
+ */
+#define FC_FCOE_ENCAPS_ID(n)    (((u64) FC_FCOE_OUI << 24) | (n))
+#define FC_FCOE_DECAPS_ID(n)    ((n) >> 24)
+/*
+ * FCoE frame header - 14 bytes
+ *
+ * This is the August 2007 version of the FCoE header as defined by T11.
+ * This follows the VLAN header, which includes the ethertype.
+ */
+struct fcoe_hdr {
+        __u8            fcoe_ver;       /* version field - upper 4 bits */
+        __u8            fcoe_resvd[12]; /* reserved - send zero and ignore */
+        __u8            fcoe_sof;       /* start of frame per RFC 3643 */
+};
+#define FC_FCOE_DECAPS_VER(hp)      ((hp)->fcoe_ver >> 4)
+#define FC_FCOE_ENCAPS_VER(hp, ver) ((hp)->fcoe_ver = (ver) << 4)
+/*
+ * FCoE CRC & EOF - 8 bytes.
+ */
+struct fcoe_crc_eof {
+        __le32          fcoe_crc32;     /* CRC for FC packet */
+        __u8            fcoe_eof;       /* EOF from RFC 3643 */
+        __u8            fcoe_resvd[3];  /* reserved - send zero and ignore */
+} __attribute__((packed));
+/*
+ * Minimum FCoE + FC header length
+ * 14 bytes FCoE header + 24 byte FC header = 38 bytes
+ */
+#define FCOE_HEADER_LEN 38
+/*
+ * Minimum FCoE frame size
+ * 14 bytes FCoE header + 24 byte FC header + 8 byte FCoE trailer = 46 bytes
+ */
+#define FCOE_MIN_FRAME 46
+/*
+ * fc_fcoe_set_mac - Store OUI + DID into MAC address field.
+ * @mac: mac address to be set
+ * @did: fc dest id to use
+ */
+static inline void fc_fcoe_set_mac(u8 *mac, u8 *did)
+{
+        mac[0] = (u8) (FC_FCOE_OUI >> 16);
+        mac[1] = (u8) (FC_FCOE_OUI >> 8);
+        mac[2] = (u8) FC_FCOE_OUI;
+        mac[3] = did[0];
+        mac[4] = did[1];
+        mac[5] = did[2];
+}
+#endif /* _FC_FCOE_H_ */
diff --git a/include/scsi/fc/fc_fcp.h b/include/scsi/fc/fc_fcp.h
new file mode 100644
index 000000000000..5d38f1989f37
--- /dev/null
+++ b/include/scsi/fc/fc_fcp.h
@@ -0,0 +1,199 @@
+/*
+ * Copyright(c) 2007 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _FC_FCP_H_
+#define _FC_FCP_H_
+/*
+ * Fibre Channel Protocol for SCSI.
+ * From T10 FCP-3, T10 project 1560-D Rev 4, Sept. 13, 2005.
+ */
+/*
+ * fc/fs.h defines FC_TYPE_FCP.
+ */
+/*
+ * Service parameter page parameters (word 3 bits) for Process Login.
+ */
+#define FCP_SPPF_TASK_RETRY_ID  0x0200  /* task retry ID requested */
+#define FCP_SPPF_RETRY          0x0100  /* retry supported */
+#define FCP_SPPF_CONF_COMPL     0x0080  /* confirmed completion allowed */
+#define FCP_SPPF_OVLY_ALLOW     0x0040  /* data overlay allowed */
+#define FCP_SPPF_INIT_FCN       0x0020  /* initiator function */
+#define FCP_SPPF_TARG_FCN       0x0010  /* target function */
+#define FCP_SPPF_RD_XRDY_DIS    0x0002  /* disable XFER_RDY for reads */
+#define FCP_SPPF_WR_XRDY_DIS    0x0001  /* disable XFER_RDY for writes */
+/*
+ * FCP_CMND IU Payload.
+ */
+struct fcp_cmnd {
+        __u8            fc_lun[8];      /* logical unit number */
+        __u8            fc_cmdref;      /* commmand reference number */
+        __u8            fc_pri_ta;      /* priority and task attribute */
+        __u8            fc_tm_flags;    /* task management flags */
+        __u8            fc_flags;       /* additional len & flags */
+        __u8            fc_cdb[16];     /* base CDB */
+        __be32          fc_dl;          /* data length (must follow fc_cdb) */
+};
+#define FCP_CMND_LEN    32      /* expected length of structure */
+struct fcp_cmnd32 {
+        __u8            fc_lun[8];      /* logical unit number */
+        __u8            fc_cmdref;      /* commmand reference number */
+        __u8            fc_pri_ta;      /* priority and task attribute */
+        __u8            fc_tm_flags;    /* task management flags */
+        __u8            fc_flags;       /* additional len & flags */
+        __u8            fc_cdb[32];     /* base CDB */
+        __be32          fc_dl;          /* data length (must follow fc_cdb) */
+};
+#define FCP_CMND32_LEN      48  /* expected length of structure */
+#define FCP_CMND32_ADD_LEN  (16 / 4)    /* Additional cdb length */
+/*
+ * fc_pri_ta.
+ */
+#define FCP_PTA_SIMPLE      0   /* simple task attribute */
+#define FCP_PTA_HEADQ       1   /* head of queue task attribute */
+#define FCP_PTA_ORDERED     2   /* ordered task attribute */
+#define FCP_PTA_ACA         4   /* auto. contigent allegiance */
+#define FCP_PRI_SHIFT       3   /* priority field starts in bit 3 */
+#define FCP_PRI_RESVD_MASK  0x80        /* reserved bits in priority field */
+/*
+ * fc_tm_flags - task management flags field.
+ */
+#define FCP_TMF_CLR_ACA         0x40    /* clear ACA condition */
+#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 */
+/*
+ * fc_flags.
+ *  Bits 7:2 are the additional FCP_CDB length / 4.
+ */
+#define FCP_CFL_LEN_MASK        0xfc    /* mask for additional length */
+#define FCP_CFL_LEN_SHIFT       2       /* shift bits for additional length */
+#define FCP_CFL_RDDATA          0x02    /* read data */
+#define FCP_CFL_WRDATA          0x01    /* write data */
+/*
+ * FCP_TXRDY IU - transfer ready payload.
+ */
+struct fcp_txrdy {
+        __be32          ft_data_ro;     /* data relative offset */
+        __be32          ft_burst_len;   /* burst length */
+        __u8            _ft_resvd[4];   /* reserved */
+};
+#define FCP_TXRDY_LEN   12      /* expected length of structure */
+/*
+ * FCP_RESP IU - response payload.
+ *
+ * The response payload comes in three parts: the flags/status, the
+ * sense/response lengths and the sense data/response info section.
+ *
+ * From FCP3r04, note 6 of section 9.5.13:
+ *
+ * Some early implementations presented the FCP_RSP IU without the FCP_RESID,
+ * FCP_SNS_LEN, and FCP_RSP_LEN fields if the FCP_RESID_UNDER, FCP_RESID_OVER,
+ * FCP_SNS_LEN_VALID, and FCP_RSP_LEN_VALID bits were all set to zero. This
+ * non-standard behavior should be tolerated.
+ *
+ * All response frames will always contain the fcp_resp template.  Some
+ * will also include the fcp_resp_len template.
+ */
+struct fcp_resp {
+        __u8            _fr_resvd[8];   /* reserved */
+        __be16          fr_retry_delay; /* retry delay timer */
+        __u8            fr_flags;       /* flags */
+        __u8            fr_status;      /* SCSI status code */
+};
+#define FCP_RESP_LEN    12      /* expected length of structure */
+struct fcp_resp_ext {
+        __be32          fr_resid;       /* Residual value */
+        __be32          fr_sns_len;     /* SCSI Sense length */
+        __be32          fr_rsp_len;     /* Response Info length */
+        /*
+         * Optionally followed by RSP info and/or SNS info and/or
+         * bidirectional read residual length, if any.
+         */
+};
+#define FCP_RESP_EXT_LEN    12  /* expected length of the structure */
+struct fcp_resp_rsp_info {
+    __u8      _fr_resvd[3];       /* reserved */
+    __u8      rsp_code;           /* Response Info Code */
+    __u8      _fr_resvd2[4];      /* reserved */
+};
+struct fcp_resp_with_ext {
+        struct fcp_resp resp;
+        struct fcp_resp_ext ext;
+};
+#define FCP_RESP_WITH_EXT   (FCP_RESP_LEN + FCP_RESP_EXT_LEN)
+/*
+ * fr_flags.
+ */
+#define FCP_BIDI_RSP        0x80        /* bidirectional read response */
+#define FCP_BIDI_READ_UNDER 0x40        /* bidir. read less than requested */
+#define FCP_BIDI_READ_OVER  0x20        /* DL insufficient for full transfer */
+#define FCP_CONF_REQ        0x10        /* confirmation requested */
+#define FCP_RESID_UNDER     0x08        /* transfer shorter than expected */
+#define FCP_RESID_OVER      0x04        /* DL insufficient for full transfer */
+#define FCP_SNS_LEN_VAL     0x02        /* SNS_LEN field is valid */
+#define FCP_RSP_LEN_VAL     0x01        /* RSP_LEN field is valid */
+/*
+ * rsp_codes
+ */
+enum fcp_resp_rsp_codes {
+        FCP_TMF_CMPL = 0,
+        FCP_DATA_LEN_INVALID = 1,
+        FCP_CMND_FIELDS_INVALID = 2,
+        FCP_DATA_PARAM_MISMATCH = 3,
+        FCP_TMF_REJECTED = 4,
+        FCP_TMF_FAILED = 5,
+        FCP_TMF_INVALID_LUN = 9,
+};
+/*
+ * FCP SRR Link Service request - Sequence Retransmission Request.
+ */
+struct fcp_srr {
+        __u8            srr_op;         /* opcode ELS_SRR */
+        __u8            srr_resvd[3];   /* opcode / reserved - must be zero */
+        __be16          srr_ox_id;      /* OX_ID of failed command */
+        __be16          srr_rx_id;      /* RX_ID of failed command */
+        __be32          srr_rel_off;    /* relative offset */
+        __u8            srr_r_ctl;      /* r_ctl for the information unit */
+        __u8            srr_resvd2[3];  /* reserved */
+};
+#endif /* _FC_FCP_H_ */
diff --git a/include/scsi/fc/fc_fs.h b/include/scsi/fc/fc_fs.h
new file mode 100644
index 000000000000..3e4801d2bdbb
--- /dev/null
+++ b/include/scsi/fc/fc_fs.h
@@ -0,0 +1,340 @@
+/*
+ * Copyright(c) 2007 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _FC_FS_H_
+#define _FC_FS_H_
+/*
+ * Fibre Channel Framing and Signalling definitions.
+ * From T11 FC-FS-2 Rev 0.90 - 9 August 2005.
+ */
+/*
+ * Frame header
+ */
+struct fc_frame_header {
+        __u8          fh_r_ctl; /* routing control */
+        __u8          fh_d_id[3];       /* Destination ID */
+        __u8          fh_cs_ctl;        /* class of service control / pri */
+        __u8          fh_s_id[3];       /* Source ID */
+        __u8          fh_type;          /* see enum fc_fh_type below */
+        __u8          fh_f_ctl[3];      /* frame control */
+        __u8          fh_seq_id;        /* sequence ID */
+        __u8          fh_df_ctl;        /* data field control */
+        __be16        fh_seq_cnt;       /* sequence count */
+        __be16        fh_ox_id;         /* originator exchange ID */
+        __be16        fh_rx_id;         /* responder exchange ID */
+        __be32        fh_parm_offset;   /* parameter or relative offset */
+};
+#define FC_FRAME_HEADER_LEN 24  /* expected length of structure */
+#define FC_MAX_PAYLOAD  2112U           /* max payload length in bytes */
+#define FC_MIN_MAX_PAYLOAD  256U        /* lower limit on max payload */
+#define FC_MAX_FRAME    (FC_MAX_PAYLOAD + FC_FRAME_HEADER_LEN)
+#define FC_MIN_MAX_FRAME (FC_MIN_MAX_PAYLOAD + FC_FRAME_HEADER_LEN)
+/*
+ * fh_r_ctl - Routing control definitions.
+ */
+    /*
+     * FC-4 device_data.
+     */
+enum fc_rctl {
+        FC_RCTL_DD_UNCAT = 0x00,        /* uncategorized information */
+        FC_RCTL_DD_SOL_DATA = 0x01,     /* solicited data */
+        FC_RCTL_DD_UNSOL_CTL = 0x02,    /* unsolicited control */
+        FC_RCTL_DD_SOL_CTL = 0x03,      /* solicited control or reply */
+        FC_RCTL_DD_UNSOL_DATA = 0x04,   /* unsolicited data */
+        FC_RCTL_DD_DATA_DESC = 0x05,    /* data descriptor */
+        FC_RCTL_DD_UNSOL_CMD = 0x06,    /* unsolicited command */
+        FC_RCTL_DD_CMD_STATUS = 0x07,   /* command status */
+#define FC_RCTL_ILS_REQ FC_RCTL_DD_UNSOL_CTL    /* ILS request */
+#define FC_RCTL_ILS_REP FC_RCTL_DD_SOL_CTL      /* ILS reply */
+        /*
+         * Extended Link_Data
+         */
+        FC_RCTL_ELS_REQ = 0x22, /* extended link services request */
+        FC_RCTL_ELS_REP = 0x23, /* extended link services reply */
+        FC_RCTL_ELS4_REQ = 0x32, /* FC-4 ELS request */
+        FC_RCTL_ELS4_REP = 0x33, /* FC-4 ELS reply */
+        /*
+         * Optional Extended Headers
+         */
+        FC_RCTL_VFTH = 0x50,    /* virtual fabric tagging header */
+        FC_RCTL_IFRH = 0x51,    /* inter-fabric routing header */
+        FC_RCTL_ENCH = 0x52,    /* encapsulation header */
+        /*
+         * Basic Link Services fh_r_ctl values.
+         */
+        FC_RCTL_BA_NOP = 0x80,  /* basic link service NOP */
+        FC_RCTL_BA_ABTS = 0x81, /* basic link service abort */
+        FC_RCTL_BA_RMC = 0x82,  /* remove connection */
+        FC_RCTL_BA_ACC = 0x84,  /* basic accept */
+        FC_RCTL_BA_RJT = 0x85,  /* basic reject */
+        FC_RCTL_BA_PRMT = 0x86, /* dedicated connection preempted */
+        /*
+         * Link Control Information.
+         */
+        FC_RCTL_ACK_1 = 0xc0,   /* acknowledge_1 */
+        FC_RCTL_ACK_0 = 0xc1,   /* acknowledge_0 */
+        FC_RCTL_P_RJT = 0xc2,   /* port reject */
+        FC_RCTL_F_RJT = 0xc3,   /* fabric reject */
+        FC_RCTL_P_BSY = 0xc4,   /* port busy */
+        FC_RCTL_F_BSY = 0xc5,   /* fabric busy to data frame */
+        FC_RCTL_F_BSYL = 0xc6,  /* fabric busy to link control frame */
+        FC_RCTL_LCR = 0xc7,     /* link credit reset */
+        FC_RCTL_END = 0xc9,     /* end */
+};
+                                    /* incomplete list of definitions */
+/*
+ * R_CTL names initializer.
+ * Please keep this matching the above definitions.
+ */
+#define FC_RCTL_NAMES_INIT { \
+        [FC_RCTL_DD_UNCAT] =            "uncat",                        \
+        [FC_RCTL_DD_SOL_DATA] =         "sol data",                     \
+        [FC_RCTL_DD_UNSOL_CTL] =        "unsol ctl",                    \
+        [FC_RCTL_DD_SOL_CTL] =          "sol ctl/reply",                \
+        [FC_RCTL_DD_UNSOL_DATA] =       "unsol data",                   \
+        [FC_RCTL_DD_DATA_DESC] =        "data desc",                    \
+        [FC_RCTL_DD_UNSOL_CMD] =        "unsol cmd",                    \
+        [FC_RCTL_DD_CMD_STATUS] =       "cmd status",                   \
+        [FC_RCTL_ELS_REQ] =             "ELS req",                      \
+        [FC_RCTL_ELS_REP] =             "ELS rep",                      \
+        [FC_RCTL_ELS4_REQ] =            "FC-4 ELS req",                 \
+        [FC_RCTL_ELS4_REP] =            "FC-4 ELS rep",                 \
+        [FC_RCTL_BA_NOP] =              "BLS NOP",                      \
+        [FC_RCTL_BA_ABTS] =             "BLS abort",                    \
+        [FC_RCTL_BA_RMC] =              "BLS remove connection",        \
+        [FC_RCTL_BA_ACC] =              "BLS accept",                   \
+        [FC_RCTL_BA_RJT] =              "BLS reject",                   \
+        [FC_RCTL_BA_PRMT] =             "BLS dedicated connection preempted", \
+        [FC_RCTL_ACK_1] =               "LC ACK_1",                     \
+        [FC_RCTL_ACK_0] =               "LC ACK_0",                     \
+        [FC_RCTL_P_RJT] =               "LC port reject",               \
+        [FC_RCTL_F_RJT] =               "LC fabric reject",             \
+        [FC_RCTL_P_BSY] =               "LC port busy",                 \
+        [FC_RCTL_F_BSY] =               "LC fabric busy to data frame", \
+        [FC_RCTL_F_BSYL] =              "LC fabric busy to link control frame",\
+        [FC_RCTL_LCR] =                 "LC link credit reset",         \
+        [FC_RCTL_END] =                 "LC end",                       \
+}
+/*
+ * Well-known fabric addresses.
+ */
+enum fc_well_known_fid {
+        FC_FID_BCAST =          0xffffff,       /* broadcast */
+        FC_FID_FLOGI =          0xfffffe,       /* fabric login */
+        FC_FID_FCTRL =          0xfffffd,       /* fabric controller */
+        FC_FID_DIR_SERV =       0xfffffc,       /* directory server */
+        FC_FID_TIME_SERV =      0xfffffb,       /* time server */
+        FC_FID_MGMT_SERV =      0xfffffa,       /* management server */
+        FC_FID_QOS =            0xfffff9,       /* QoS Facilitator */
+        FC_FID_ALIASES =        0xfffff8,       /* alias server (FC-PH2) */
+        FC_FID_SEC_KEY =        0xfffff7,       /* Security key dist. server */
+        FC_FID_CLOCK =          0xfffff6,       /* clock synch server */
+        FC_FID_MCAST_SERV =     0xfffff5,       /* multicast server */
+};
+#define FC_FID_WELL_KNOWN_MAX   0xffffff /* highest well-known fabric ID */
+#define FC_FID_WELL_KNOWN_BASE  0xfffff5 /* start of well-known fabric ID */
+/*
+ * Other well-known addresses, outside the above contiguous range.
+ */
+#define FC_FID_DOM_MGR          0xfffc00        /* domain manager base */
+/*
+ * Fabric ID bytes.
+ */
+#define FC_FID_DOMAIN           0
+#define FC_FID_PORT             1
+#define FC_FID_LINK             2
+/*
+ * fh_type codes
+ */
+enum fc_fh_type {
+        FC_TYPE_BLS =   0x00,   /* basic link service */
+        FC_TYPE_ELS =   0x01,   /* extended link service */
+        FC_TYPE_IP =    0x05,   /* IP over FC, RFC 4338 */
+        FC_TYPE_FCP =   0x08,   /* SCSI FCP */
+        FC_TYPE_CT =    0x20,   /* Fibre Channel Services (FC-CT) */
+        FC_TYPE_ILS =   0x22,   /* internal link service */
+};
+/*
+ * FC_TYPE names initializer.
+ * Please keep this matching the above definitions.
+ */
+#define FC_TYPE_NAMES_INIT {                            \
+        [FC_TYPE_BLS] =         "BLS",                  \
+        [FC_TYPE_ELS] =         "ELS",                  \
+        [FC_TYPE_IP] =          "IP",                   \
+        [FC_TYPE_FCP] =         "FCP",                  \
+        [FC_TYPE_CT] =          "CT",                   \
+        [FC_TYPE_ILS] =         "ILS",                  \
+}
+/*
+ * Exchange IDs.
+ */
+#define FC_XID_UNKNOWN  0xffff  /* unknown exchange ID */
+#define FC_XID_MIN      0x0     /* supported min exchange ID */
+#define FC_XID_MAX      0xfffe  /* supported max exchange ID */
+/*
+ * fh_f_ctl - Frame control flags.
+ */
+#define FC_FC_EX_CTX    (1 << 23)       /* sent by responder to exchange */
+#define FC_FC_SEQ_CTX   (1 << 22)       /* sent by responder to sequence */
+#define FC_FC_FIRST_SEQ (1 << 21)       /* first sequence of this exchange */
+#define FC_FC_LAST_SEQ  (1 << 20)       /* last sequence of this exchange */
+#define FC_FC_END_SEQ   (1 << 19)       /* last frame of sequence */
+#define FC_FC_END_CONN  (1 << 18)       /* end of class 1 connection pending */
+#define FC_FC_RES_B17   (1 << 17)       /* reserved */
+#define FC_FC_SEQ_INIT  (1 << 16)       /* transfer of sequence initiative */
+#define FC_FC_X_ID_REASS (1 << 15)      /* exchange ID has been changed */
+#define FC_FC_X_ID_INVAL (1 << 14)      /* exchange ID invalidated */
+#define FC_FC_ACK_1     (1 << 12)       /* 13:12 = 1: ACK_1 expected */
+#define FC_FC_ACK_N     (2 << 12)       /* 13:12 = 2: ACK_N expected */
+#define FC_FC_ACK_0     (3 << 12)       /* 13:12 = 3: ACK_0 expected */
+#define FC_FC_RES_B11   (1 << 11)       /* reserved */
+#define FC_FC_RES_B10   (1 << 10)       /* reserved */
+#define FC_FC_RETX_SEQ  (1 << 9)        /* retransmitted sequence */
+#define FC_FC_UNI_TX    (1 << 8)        /* unidirectional transmit (class 1) */
+#define FC_FC_CONT_SEQ(i) ((i) << 6)
+#define FC_FC_ABT_SEQ(i) ((i) << 4)
+#define FC_FC_REL_OFF   (1 << 3)        /* parameter is relative offset */
+#define FC_FC_RES2      (1 << 2)        /* reserved */
+#define FC_FC_FILL(i)   ((i) & 3)       /* 1:0: bytes of trailing fill */
+/*
+ * BA_ACC payload.
+ */
+struct fc_ba_acc {
+        __u8            ba_seq_id_val;  /* SEQ_ID validity */
+#define FC_BA_SEQ_ID_VAL 0x80
+        __u8            ba_seq_id;      /* SEQ_ID of seq last deliverable */
+        __u8            ba_resvd[2];    /* reserved */
+        __be16          ba_ox_id;       /* OX_ID for aborted seq or exch */
+        __be16          ba_rx_id;       /* RX_ID for aborted seq or exch */
+        __be16          ba_low_seq_cnt; /* low SEQ_CNT of aborted seq */
+        __be16          ba_high_seq_cnt; /* high SEQ_CNT of aborted seq */
+};
+/*
+ * BA_RJT: Basic Reject payload.
+ */
+struct fc_ba_rjt {
+        __u8            br_resvd;       /* reserved */
+        __u8            br_reason;      /* reason code */
+        __u8            br_explan;      /* reason explanation */
+        __u8            br_vendor;      /* vendor unique code */
+};
+/*
+ * BA_RJT reason codes.
+ * From FS-2.
+ */
+enum fc_ba_rjt_reason {
+        FC_BA_RJT_NONE =        0,      /* in software this means no reject */
+        FC_BA_RJT_INVL_CMD =    0x01,   /* invalid command code */
+        FC_BA_RJT_LOG_ERR =     0x03,   /* logical error */
+        FC_BA_RJT_LOG_BUSY =    0x05,   /* logical busy */
+        FC_BA_RJT_PROTO_ERR =   0x07,   /* protocol error */
+        FC_BA_RJT_UNABLE =      0x09,   /* unable to perform request */
+        FC_BA_RJT_VENDOR =      0xff,   /* vendor-specific (see br_vendor) */
+};
+/*
+ * BA_RJT reason code explanations.
+ */
+enum fc_ba_rjt_explan {
+        FC_BA_RJT_EXP_NONE =    0x00,   /* no additional expanation */
+        FC_BA_RJT_INV_XID =     0x03,   /* invalid OX_ID-RX_ID combination */
+        FC_BA_RJT_ABT =         0x05,   /* sequence aborted, no seq info */
+};
+/*
+ * P_RJT or F_RJT: Port Reject or Fabric Reject parameter field.
+ */
+struct fc_pf_rjt {
+        __u8            rj_action;      /* reserved */
+        __u8            rj_reason;      /* reason code */
+        __u8            rj_resvd;       /* reserved */
+        __u8            rj_vendor;      /* vendor unique code */
+};
+/*
+ * P_RJT and F_RJT reject reason codes.
+ */
+enum fc_pf_rjt_reason {
+        FC_RJT_NONE =           0,      /* non-reject (reserved by standard) */
+        FC_RJT_INVL_DID =       0x01,   /* invalid destination ID */
+        FC_RJT_INVL_SID =       0x02,   /* invalid source ID */
+        FC_RJT_P_UNAV_T =       0x03,   /* port unavailable, temporary */
+        FC_RJT_P_UNAV =         0x04,   /* port unavailable, permanent */
+        FC_RJT_CLS_UNSUP =      0x05,   /* class not supported */
+        FC_RJT_DEL_USAGE =      0x06,   /* delimiter usage error */
+        FC_RJT_TYPE_UNSUP =     0x07,   /* type not supported */
+        FC_RJT_LINK_CTL =       0x08,   /* invalid link control */
+        FC_RJT_R_CTL =          0x09,   /* invalid R_CTL field */
+        FC_RJT_F_CTL =          0x0a,   /* invalid F_CTL field */
+        FC_RJT_OX_ID =          0x0b,   /* invalid originator exchange ID */
+        FC_RJT_RX_ID =          0x0c,   /* invalid responder exchange ID */
+        FC_RJT_SEQ_ID =         0x0d,   /* invalid sequence ID */
+        FC_RJT_DF_CTL =         0x0e,   /* invalid DF_CTL field */
+        FC_RJT_SEQ_CNT =        0x0f,   /* invalid SEQ_CNT field */
+        FC_RJT_PARAM =          0x10,   /* invalid parameter field */
+        FC_RJT_EXCH_ERR =       0x11,   /* exchange error */
+        FC_RJT_PROTO =          0x12,   /* protocol error */
+        FC_RJT_LEN =            0x13,   /* incorrect length */
+        FC_RJT_UNEXP_ACK =      0x14,   /* unexpected ACK */
+        FC_RJT_FAB_CLASS =      0x15,   /* class unsupported by fabric entity */
+        FC_RJT_LOGI_REQ =       0x16,   /* login required */
+        FC_RJT_SEQ_XS =         0x17,   /* excessive sequences attempted */
+        FC_RJT_EXCH_EST =       0x18,   /* unable to establish exchange */
+        FC_RJT_FAB_UNAV =       0x1a,   /* fabric unavailable */
+        FC_RJT_VC_ID =          0x1b,   /* invalid VC_ID (class 4) */
+        FC_RJT_CS_CTL =         0x1c,   /* invalid CS_CTL field */
+        FC_RJT_INSUF_RES =      0x1d,   /* insuff. resources for VC (Class 4) */
+        FC_RJT_INVL_CLS =       0x1f,   /* invalid class of service */
+        FC_RJT_PREEMT_RJT =     0x20,   /* preemption request rejected */
+        FC_RJT_PREEMT_DIS =     0x21,   /* preemption not enabled */
+        FC_RJT_MCAST_ERR =      0x22,   /* multicast error */
+        FC_RJT_MCAST_ET =       0x23,   /* multicast error terminate */
+        FC_RJT_PRLI_REQ =       0x24,   /* process login required */
+        FC_RJT_INVL_ATT =       0x25,   /* invalid attachment */
+        FC_RJT_VENDOR =         0xff,   /* vendor specific reject */
+};
+#endif /* _FC_FS_H_ */
diff --git a/include/scsi/fc/fc_gs.h b/include/scsi/fc/fc_gs.h
new file mode 100644
index 000000000000..ffab0272c65a
--- /dev/null
+++ b/include/scsi/fc/fc_gs.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright(c) 2007 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _FC_GS_H_
+#define _FC_GS_H_
+/*
+ * Fibre Channel Services - Common Transport.
+ * From T11.org FC-GS-2 Rev 5.3 November 1998.
+ */
+struct fc_ct_hdr {
+        __u8            ct_rev;         /* revision */
+        __u8            ct_in_id[3];    /* N_Port ID of original requestor */
+        __u8            ct_fs_type;     /* type of fibre channel service */
+        __u8            ct_fs_subtype;  /* subtype */
+        __u8            ct_options;
+        __u8            _ct_resvd1;
+        __be16          ct_cmd;         /* command / response code */
+        __be16          ct_mr_size;     /* maximum / residual size */
+        __u8            _ct_resvd2;
+        __u8            ct_reason;      /* reject reason */
+        __u8            ct_explan;      /* reason code explanation */
+        __u8            ct_vendor;      /* vendor unique data */
+};
+#define FC_CT_HDR_LEN   16      /* expected sizeof (struct fc_ct_hdr) */
+enum fc_ct_rev {
+        FC_CT_REV = 1           /* common transport revision */
+};
+/*
+ * ct_fs_type values.
+ */
+enum fc_ct_fs_type {
+        FC_FST_ALIAS =  0xf8,   /* alias service */
+        FC_FST_MGMT =   0xfa,   /* management service */
+        FC_FST_TIME =   0xfb,   /* time service */
+        FC_FST_DIR =    0xfc,   /* directory service */
+};
+/*
+ * ct_cmd: Command / response codes
+ */
+enum fc_ct_cmd {
+        FC_FS_RJT =     0x8001, /* reject */
+        FC_FS_ACC =     0x8002, /* accept */
+};
+/*
+ * FS_RJT reason codes.
+ */
+enum fc_ct_reason {
+        FC_FS_RJT_CMD =         0x01,   /* invalid command code */
+        FC_FS_RJT_VER =         0x02,   /* invalid version level */
+        FC_FS_RJT_LOG =         0x03,   /* logical error */
+        FC_FS_RJT_IUSIZ =       0x04,   /* invalid IU size */
+        FC_FS_RJT_BSY =         0x05,   /* logical busy */
+        FC_FS_RJT_PROTO =       0x07,   /* protocol error */
+        FC_FS_RJT_UNABL =       0x09,   /* unable to perform command request */
+        FC_FS_RJT_UNSUP =       0x0b,   /* command not supported */
+};
+/*
+ * FS_RJT reason code explanations.
+ */
+enum fc_ct_explan {
+        FC_FS_EXP_NONE =        0x00,   /* no additional explanation */
+        FC_FS_EXP_PID =         0x01,   /* port ID not registered */
+        FC_FS_EXP_PNAM =        0x02,   /* port name not registered */
+        FC_FS_EXP_NNAM =        0x03,   /* node name not registered */
+        FC_FS_EXP_COS =         0x04,   /* class of service not registered */
+        /* definitions not complete */
+};
+#endif /* _FC_GS_H_ */
diff --git a/include/scsi/fc/fc_ns.h b/include/scsi/fc/fc_ns.h
new file mode 100644
index 000000000000..790d7b97d4bc
--- /dev/null
+++ b/include/scsi/fc/fc_ns.h
@@ -0,0 +1,159 @@
+/*
+ * Copyright(c) 2007 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _FC_NS_H_
+#define _FC_NS_H_
+/*
+ * Fibre Channel Services - Name Service (dNS)
+ * From T11.org FC-GS-2 Rev 5.3 November 1998.
+ */
+/*
+ * Common-transport sub-type for Name Server.
+ */
+#define FC_NS_SUBTYPE       2   /* fs_ct_hdr.ct_fs_subtype */
+/*
+ * Name server Requests.
+ * Note:  this is an incomplete list, some unused requests are omitted.
+ */
+enum fc_ns_req {
+        FC_NS_GA_NXT =  0x0100,         /* get all next */
+        FC_NS_GI_A =    0x0101,         /* get identifiers - scope */
+        FC_NS_GPN_ID =  0x0112,         /* get port name by ID */
+        FC_NS_GNN_ID =  0x0113,         /* get node name by ID */
+        FC_NS_GID_PN =  0x0121,         /* get ID for port name */
+        FC_NS_GID_NN =  0x0131,         /* get IDs for node name */
+        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 */
+};
+/*
+ * Port type values.
+ */
+enum fc_ns_pt {
+        FC_NS_UNID_PORT = 0x00, /* unidentified */
+        FC_NS_N_PORT =  0x01,   /* N port */
+        FC_NS_NL_PORT = 0x02,   /* NL port */
+        FC_NS_FNL_PORT = 0x03,  /* F/NL port */
+        FC_NS_NX_PORT = 0x7f,   /* Nx port */
+        FC_NS_F_PORT =  0x81,   /* F port */
+        FC_NS_FL_PORT = 0x82,   /* FL port */
+        FC_NS_E_PORT =  0x84,   /* E port */
+        FC_NS_B_PORT =  0x85,   /* B port */
+};
+/*
+ * Port type object.
+ */
+struct fc_ns_pt_obj {
+        __u8            pt_type;
+};
+/*
+ * Port ID object
+ */
+struct fc_ns_fid {
+        __u8            fp_flags;       /* flags for responses only */
+        __u8            fp_fid[3];
+};
+/*
+ * fp_flags in port ID object, for responses only.
+ */
+#define FC_NS_FID_LAST  0x80            /* last object */
+/*
+ * FC4-types object.
+ */
+#define FC_NS_TYPES     256     /* number of possible FC-4 types */
+#define FC_NS_BPW       32      /* bits per word in bitmap */
+struct fc_ns_fts {
+        __be32  ff_type_map[FC_NS_TYPES / FC_NS_BPW]; /* bitmap of FC-4 types */
+};
+/*
+ * GID_PT request.
+ */
+struct fc_ns_gid_pt {
+        __u8            fn_pt_type;
+        __u8            fn_domain_id_scope;
+        __u8            fn_area_id_scope;
+        __u8            fn_resvd;
+};
+/*
+ * GID_FT or GPN_FT request.
+ */
+struct fc_ns_gid_ft {
+        __u8            fn_resvd;
+        __u8            fn_domain_id_scope;
+        __u8            fn_area_id_scope;
+        __u8            fn_fc4_type;
+};
+/*
+ * GPN_FT response.
+ */
+struct fc_gpn_ft_resp {
+        __u8            fp_flags;       /* see fp_flags definitions above */
+        __u8            fp_fid[3];      /* port ID */
+        __be32          fp_resvd;
+        __be64          fp_wwpn;        /* port name */
+};
+/*
+ * GID_PN request
+ */
+struct fc_ns_gid_pn {
+        __be64     fn_wwpn;    /* port name */
+};
+/*
+ * GID_PN response
+ */
+struct fc_gid_pn_resp {
+        __u8      fp_resvd;
+        __u8      fp_fid[3];     /* port ID */
+};
+/*
+ * RFT_ID request - register FC-4 types for ID.
+ */
+struct fc_ns_rft_id {
+        struct fc_ns_fid fr_fid;        /* port ID object */
+        struct fc_ns_fts fr_fts;        /* FC-4 types object */
+};
+/*
+ * RPN_ID request - register port name for ID.
+ * RNN_ID request - register node name for ID.
+ */
+struct fc_ns_rn_id {
+        struct fc_ns_fid fr_fid;        /* port ID object */
+        __be64          fr_wwn;         /* node name or port name */
+} __attribute__((__packed__));
+#endif /* _FC_NS_H_ */
diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h
new file mode 100644
index 000000000000..6300f556bce5
--- /dev/null
+++ b/include/scsi/fc_encode.h
@@ -0,0 +1,309 @@
+/*
+ * Copyright(c) 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _FC_ENCODE_H_
+#define _FC_ENCODE_H_
+#include <asm/unaligned.h>
+struct fc_ns_rft {
+        struct fc_ns_fid fid;   /* port ID object */
+        struct fc_ns_fts fts;   /* FC4-types object */
+};
+struct fc_ct_req {
+        struct fc_ct_hdr hdr;
+        union {
+                struct fc_ns_gid_ft gid;
+                struct fc_ns_rn_id  rn;
+                struct fc_ns_rft rft;
+        } payload;
+};
+/**
+ * fill FC header fields in specified fc_frame
+ */
+static inline void fc_fill_fc_hdr(struct fc_frame *fp, enum fc_rctl r_ctl,
+                                  u32 did, u32 sid, enum fc_fh_type type,
+                                  u32 f_ctl, u32 parm_offset)
+{
+        struct fc_frame_header *fh;
+        fh = fc_frame_header_get(fp);
+        WARN_ON(r_ctl == 0);
+        fh->fh_r_ctl = r_ctl;
+        hton24(fh->fh_d_id, did);
+        hton24(fh->fh_s_id, sid);
+        fh->fh_type = type;
+        hton24(fh->fh_f_ctl, f_ctl);
+        fh->fh_cs_ctl = 0;
+        fh->fh_df_ctl = 0;
+        fh->fh_parm_offset = htonl(parm_offset);
+}
+/**
+ * fc_ct_hdr_fill- fills ct header and reset ct payload
+ * returns pointer to ct request.
+ */
+static inline struct fc_ct_req *fc_ct_hdr_fill(const struct fc_frame *fp,
+                                               unsigned int op, size_t req_size)
+{
+        struct fc_ct_req *ct;
+        size_t ct_plen;
+        ct_plen  = sizeof(struct fc_ct_hdr) + req_size;
+        ct = fc_frame_payload_get(fp, ct_plen);
+        memset(ct, 0, ct_plen);
+        ct->hdr.ct_rev = FC_CT_REV;
+        ct->hdr.ct_fs_type = FC_FST_DIR;
+        ct->hdr.ct_fs_subtype = FC_NS_SUBTYPE;
+        ct->hdr.ct_cmd = htons((u16) op);
+        return ct;
+}
+/**
+ * fc_ct_fill - Fill in a name service request frame
+ */
+static inline int fc_ct_fill(struct fc_lport *lport, struct fc_frame *fp,
+                      unsigned int op, enum fc_rctl *r_ctl, u32 *did,
+                      enum fc_fh_type *fh_type)
+{
+        struct fc_ct_req *ct;
+        switch (op) {
+        case FC_NS_GPN_FT:
+                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_gid_ft));
+                ct->payload.gid.fn_fc4_type = FC_TYPE_FCP;
+                break;
+        case FC_NS_RFT_ID:
+                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rft));
+                hton24(ct->payload.rft.fid.fp_fid,
+                       fc_host_port_id(lport->host));
+                ct->payload.rft.fts = lport->fcts;
+                break;
+        case FC_NS_RPN_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);
+                break;
+        default:
+                FC_DBG("Invalid op code %x \n", op);
+                return -EINVAL;
+        }
+        *r_ctl = FC_RCTL_DD_UNSOL_CTL;
+        *did = FC_FID_DIR_SERV;
+        *fh_type = FC_TYPE_CT;
+        return 0;
+}
+/**
+ * fc_plogi_fill - Fill in plogi request frame
+ */
+static inline void fc_plogi_fill(struct fc_lport *lport, struct fc_frame *fp,
+                                 unsigned int op)
+{
+        struct fc_els_flogi *plogi;
+        struct fc_els_csp *csp;
+        struct fc_els_cssp *cp;
+        plogi = fc_frame_payload_get(fp, sizeof(*plogi));
+        memset(plogi, 0, sizeof(*plogi));
+        plogi->fl_cmd = (u8) op;
+        put_unaligned_be64(lport->wwpn, &plogi->fl_wwpn);
+        put_unaligned_be64(lport->wwnn, &plogi->fl_wwnn);
+        csp = &plogi->fl_csp;
+        csp->sp_hi_ver = 0x20;
+        csp->sp_lo_ver = 0x20;
+        csp->sp_bb_cred = htons(10);    /* this gets set by gateway */
+        csp->sp_bb_data = htons((u16) lport->mfs);
+        cp = &plogi->fl_cssp[3 - 1];    /* class 3 parameters */
+        cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
+        csp->sp_features = htons(FC_SP_FT_CIRO);
+        csp->sp_tot_seq = htons(255);   /* seq. we accept */
+        csp->sp_rel_off = htons(0x1f);
+        csp->sp_e_d_tov = htonl(lport->e_d_tov);
+        cp->cp_rdfs = htons((u16) lport->mfs);
+        cp->cp_con_seq = htons(255);
+        cp->cp_open_seq = 1;
+}
+/**
+ * fc_flogi_fill - Fill in a flogi request frame.
+ */
+static inline void fc_flogi_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+        struct fc_els_csp *sp;
+        struct fc_els_cssp *cp;
+        struct fc_els_flogi *flogi;
+        flogi = fc_frame_payload_get(fp, sizeof(*flogi));
+        memset(flogi, 0, sizeof(*flogi));
+        flogi->fl_cmd = (u8) ELS_FLOGI;
+        put_unaligned_be64(lport->wwpn, &flogi->fl_wwpn);
+        put_unaligned_be64(lport->wwnn, &flogi->fl_wwnn);
+        sp = &flogi->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 = &flogi->fl_cssp[3 - 1];    /* class 3 parameters */
+        cp->cp_class = htons(FC_CPC_VALID | FC_CPC_SEQ);
+}
+/**
+ * fc_logo_fill - Fill in a logo request frame.
+ */
+static inline void fc_logo_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+        struct fc_els_logo *logo;
+        logo = fc_frame_payload_get(fp, sizeof(*logo));
+        memset(logo, 0, sizeof(*logo));
+        logo->fl_cmd = ELS_LOGO;
+        hton24(logo->fl_n_port_id, fc_host_port_id(lport->host));
+        logo->fl_n_port_wwn = htonll(lport->wwpn);
+}
+/**
+ * fc_rtv_fill - Fill in RTV (read timeout value) request frame.
+ */
+static inline void fc_rtv_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+        struct fc_els_rtv *rtv;
+        rtv = fc_frame_payload_get(fp, sizeof(*rtv));
+        memset(rtv, 0, sizeof(*rtv));
+        rtv->rtv_cmd = ELS_RTV;
+}
+/**
+ * fc_rec_fill - Fill in rec request frame
+ */
+static inline void fc_rec_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+        struct fc_els_rec *rec;
+        struct fc_exch *ep = fc_seq_exch(fr_seq(fp));
+        rec = fc_frame_payload_get(fp, sizeof(*rec));
+        memset(rec, 0, sizeof(*rec));
+        rec->rec_cmd = ELS_REC;
+        hton24(rec->rec_s_id, fc_host_port_id(lport->host));
+        rec->rec_ox_id = htons(ep->oxid);
+        rec->rec_rx_id = htons(ep->rxid);
+}
+/**
+ * fc_prli_fill - Fill in prli request frame
+ */
+static inline void fc_prli_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+        struct {
+                struct fc_els_prli prli;
+                struct fc_els_spp spp;
+        } *pp;
+        pp = fc_frame_payload_get(fp, sizeof(*pp));
+        memset(pp, 0, sizeof(*pp));
+        pp->prli.prli_cmd = ELS_PRLI;
+        pp->prli.prli_spp_len = sizeof(struct fc_els_spp);
+        pp->prli.prli_len = htons(sizeof(*pp));
+        pp->spp.spp_type = FC_TYPE_FCP;
+        pp->spp.spp_flags = FC_SPP_EST_IMG_PAIR;
+        pp->spp.spp_params = htonl(lport->service_params);
+}
+/**
+ * fc_scr_fill - Fill in a scr request frame.
+ */
+static inline void fc_scr_fill(struct fc_lport *lport, struct fc_frame *fp)
+{
+        struct fc_els_scr *scr;
+        scr = fc_frame_payload_get(fp, sizeof(*scr));
+        memset(scr, 0, sizeof(*scr));
+        scr->scr_cmd = ELS_SCR;
+        scr->scr_reg_func = ELS_SCRF_FULL;
+}
+/**
+ * fc_els_fill - Fill in an ELS  request frame
+ */
+static inline int fc_els_fill(struct fc_lport *lport, struct fc_rport *rport,
+                       struct fc_frame *fp, unsigned int op,
+                       enum fc_rctl *r_ctl, u32 *did, enum fc_fh_type *fh_type)
+{
+        switch (op) {
+        case ELS_PLOGI:
+                fc_plogi_fill(lport, fp, ELS_PLOGI);
+                *did = rport->port_id;
+                break;
+        case ELS_FLOGI:
+                fc_flogi_fill(lport, fp);
+                *did = FC_FID_FLOGI;
+                break;
+        case ELS_LOGO:
+                fc_logo_fill(lport, fp);
+                *did = FC_FID_FLOGI;
+                /*
+                 * if rport is valid then it
+                 * is port logo, therefore
+                 * set did to rport id.
+                 */
+                if (rport)
+                        *did = rport->port_id;
+                break;
+        case ELS_RTV:
+                fc_rtv_fill(lport, fp);
+                *did = rport->port_id;
+                break;
+        case ELS_REC:
+                fc_rec_fill(lport, fp);
+                *did = rport->port_id;
+                break;
+        case ELS_PRLI:
+                fc_prli_fill(lport, fp);
+                *did = rport->port_id;
+                break;
+        case ELS_SCR:
+                fc_scr_fill(lport, fp);
+                *did = FC_FID_FCTRL;
+                break;
+        default:
+                FC_DBG("Invalid op code %x \n", op);
+                return -EINVAL;
+        }
+        *r_ctl = FC_RCTL_ELS_REQ;
+        *fh_type = FC_TYPE_ELS;
+        return 0;
+}
+#endif /* _FC_ENCODE_H_ */
diff --git a/include/scsi/fc_frame.h b/include/scsi/fc_frame.h
new file mode 100644
index 000000000000..04d34a71355f
--- /dev/null
+++ b/include/scsi/fc_frame.h
@@ -0,0 +1,242 @@
+/*
+ * Copyright(c) 2007 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _FC_FRAME_H_
+#define _FC_FRAME_H_
+#include <linux/scatterlist.h>
+#include <linux/skbuff.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/fc/fc_fs.h>
+#include <scsi/fc/fc_fcp.h>
+#include <scsi/fc/fc_encaps.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.
+ * A pointer to the port structure of the receiving port is also includeded.
+ */
+#define FC_FRAME_HEADROOM       32      /* headroom for VLAN + FCoE headers */
+#define FC_FRAME_TAILROOM       8       /* trailer space for FCoE */
+/*
+ * Information about an individual fibre channel frame received or to be sent.
+ * The buffer may be in up to 4 additional non-contiguous sections,
+ * but the linear section must hold the frame header.
+ */
+#define FC_FRAME_SG_LEN         4       /* scatter/gather list maximum length */
+#define fp_skb(fp)      (&((fp)->skb))
+#define fr_hdr(fp)      ((fp)->skb.data)
+#define fr_len(fp)      ((fp)->skb.len)
+#define fr_cb(fp)       ((struct fcoe_rcv_info *)&((fp)->skb.cb[0]))
+#define fr_dev(fp)      (fr_cb(fp)->fr_dev)
+#define fr_seq(fp)      (fr_cb(fp)->fr_seq)
+#define fr_sof(fp)      (fr_cb(fp)->fr_sof)
+#define fr_eof(fp)      (fr_cb(fp)->fr_eof)
+#define fr_flags(fp)    (fr_cb(fp)->fr_flags)
+#define fr_max_payload(fp)      (fr_cb(fp)->fr_max_payload)
+#define fr_cmd(fp)      (fr_cb(fp)->fr_cmd)
+#define fr_dir(fp)      (fr_cmd(fp)->sc_data_direction)
+#define fr_crc(fp)      (fr_cb(fp)->fr_crc)
+struct fc_frame {
+        struct sk_buff skb;
+};
+struct fcoe_rcv_info {
+        struct packet_type  *ptype;
+        struct fc_lport *fr_dev;        /* transport layer private pointer */
+        struct fc_seq   *fr_seq;        /* for use with exchange manager */
+        struct scsi_cmnd *fr_cmd;       /* for use of scsi command */
+        u32             fr_crc;
+        u16             fr_max_payload; /* max FC payload */
+        enum fc_sof     fr_sof;         /* start of frame delimiter */
+        enum fc_eof     fr_eof;         /* end of frame delimiter */
+        u8              fr_flags;       /* flags - see below */
+};
+/*
+ * Get fc_frame pointer for an skb that's already been imported.
+ */
+static inline struct fcoe_rcv_info *fcoe_dev_from_skb(const struct sk_buff *skb)
+{
+        BUILD_BUG_ON(sizeof(struct fcoe_rcv_info) > sizeof(skb->cb));
+        return (struct fcoe_rcv_info *) skb->cb;
+}
+/*
+ * fr_flags.
+ */
+#define FCPHF_CRC_UNCHECKED     0x01    /* CRC not computed, still appended */
+/*
+ * Initialize a frame.
+ * We don't do a complete memset here for performance reasons.
+ * The caller must set fr_free, fr_hdr, fr_len, fr_sof, and fr_eof eventually.
+ */
+static inline void fc_frame_init(struct fc_frame *fp)
+{
+        fr_dev(fp) = NULL;
+        fr_seq(fp) = NULL;
+        fr_flags(fp) = 0;
+}
+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);
+}
+/*
+ * Allocate fc_frame structure and buffer.  Set the initial length to
+ * payload_size + sizeof (struct fc_frame_header).
+ */
+static inline struct fc_frame *fc_frame_alloc(struct fc_lport *dev, size_t len)
+{
+        struct fc_frame *fp;
+        /*
+         * 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)
+                fp = fc_frame_alloc_fill(dev, len);
+        else
+                fp = _fc_frame_alloc(dev, len);
+        return fp;
+}
+/*
+ * Free the fc_frame structure and buffer.
+ */
+static inline void fc_frame_free(struct fc_frame *fp)
+{
+        kfree_skb(fp_skb(fp));
+}
+static inline int fc_frame_is_linear(struct fc_frame *fp)
+{
+        return !skb_is_nonlinear(fp_skb(fp));
+}
+/*
+ * Get frame header from message in fc_frame structure.
+ * This hides a cast and provides a place to add some checking.
+ */
+static inline
+struct fc_frame_header *fc_frame_header_get(const struct fc_frame *fp)
+{
+        WARN_ON(fr_len(fp) < sizeof(struct fc_frame_header));
+        return (struct fc_frame_header *) fr_hdr(fp);
+}
+/*
+ * Get frame payload from message in fc_frame structure.
+ * This hides a cast and provides a place to add some checking.
+ * The len parameter is the minimum length for the payload portion.
+ * Returns NULL if the frame is too short.
+ *
+ * This assumes the interesting part of the payload is in the first part
+ * of the buffer for received data.  This may not be appropriate to use for
+ * buffers being transmitted.
+ */
+static inline void *fc_frame_payload_get(const struct fc_frame *fp,
+                                         size_t len)
+{
+        void *pp = NULL;
+        if (fr_len(fp) >= sizeof(struct fc_frame_header) + len)
+                pp = fc_frame_header_get(fp) + 1;
+        return pp;
+}
+/*
+ * Get frame payload opcode (first byte) from message in fc_frame structure.
+ * This hides a cast and provides a place to add some checking. Return 0
+ * if the frame has no payload.
+ */
+static inline u8 fc_frame_payload_op(const struct fc_frame *fp)
+{
+        u8 *cp;
+        cp = fc_frame_payload_get(fp, sizeof(u8));
+        if (!cp)
+                return 0;
+        return *cp;
+}
+/*
+ * Get FC class from frame.
+ */
+static inline enum fc_class fc_frame_class(const struct fc_frame *fp)
+{
+        return fc_sof_class(fr_sof(fp));
+}
+/*
+ * Check the CRC in a frame.
+ * The CRC immediately follows the last data item *AFTER* the length.
+ * The return value is zero if the CRC matches.
+ */
+u32 fc_frame_crc_check(struct fc_frame *);
+static inline u8 fc_frame_rctl(const struct fc_frame *fp)
+{
+        return fc_frame_header_get(fp)->fh_r_ctl;
+}
+static inline bool fc_frame_is_cmd(const struct fc_frame *fp)
+{
+        return fc_frame_rctl(fp) == FC_RCTL_DD_UNSOL_CMD;
+}
+static inline bool fc_frame_is_read(const struct fc_frame *fp)
+{
+        if (fc_frame_is_cmd(fp) && fr_cmd(fp))
+                return fr_dir(fp) == DMA_FROM_DEVICE;
+        return false;
+}
+static inline bool fc_frame_is_write(const struct fc_frame *fp)
+{
+        if (fc_frame_is_cmd(fp) && fr_cmd(fp))
+                return fr_dir(fp) == DMA_TO_DEVICE;
+        return false;
+}
+/*
+ * Check for leaks.
+ * Print the frame header of any currently allocated frame, assuming there
+ * should be none at this point.
+ */
+void fc_frame_leak_check(void);
+#endif /* _FC_FRAME_H_ */
diff --git a/include/scsi/fc_transport_fcoe.h b/include/scsi/fc_transport_fcoe.h
new file mode 100644
index 000000000000..8dca2af14ffc
--- /dev/null
+++ b/include/scsi/fc_transport_fcoe.h
@@ -0,0 +1,54 @@
+#ifndef FC_TRANSPORT_FCOE_H
+#define FC_TRANSPORT_FCOE_H
+#include <linux/device.h>
+#include <linux/netdevice.h>
+#include <scsi/scsi_host.h>
+#include <scsi/libfc.h>
+/**
+ * struct fcoe_transport - FCoE transport struct for generic transport
+ * for Ethernet devices as well as pure HBAs
+ *
+ * @name: name for thsi transport
+ * @bus: physical bus type (pci_bus_type)
+ * @driver: physical bus driver for network device
+ * @create: entry create function
+ * @destroy: exit destroy function
+ * @list: list of transports
+ */
+struct fcoe_transport {
+        char *name;
+        unsigned short vendor;
+        unsigned short device;
+        struct bus_type *bus;
+        struct device_driver *driver;
+        int (*create)(struct net_device *device);
+        int (*destroy)(struct net_device *device);
+        bool (*match)(struct net_device *device);
+        struct list_head list;
+        struct list_head devlist;
+        struct mutex devlock;
+};
+/**
+ * MODULE_ALIAS_FCOE_PCI
+ *
+ * some care must be taken with this, vendor and device MUST be a hex value
+ * preceded with 0x and with letters in lower case (0x12ab, not 0x12AB or 12AB)
+ */
+#define MODULE_ALIAS_FCOE_PCI(vendor, device) \
+        MODULE_ALIAS("fcoe-pci-" __stringify(vendor) "-" __stringify(device))
+/* exported funcs */
+int fcoe_transport_attach(struct net_device *netdev);
+int fcoe_transport_release(struct net_device *netdev);
+int fcoe_transport_register(struct fcoe_transport *t);
+int fcoe_transport_unregister(struct fcoe_transport *t);
+int fcoe_load_transport_driver(struct net_device *netdev);
+int __init fcoe_transport_init(void);
+int __exit fcoe_transport_exit(void);
+/* fcow_sw is the default transport */
+extern struct fcoe_transport fcoe_sw_transport;
+#endif /* FC_TRANSPORT_FCOE_H */
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 0c9514de5df7..d0ed5226f8c4 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -333,8 +333,11 @@ enum iscsi_host_param {
 #define CAP_TEXT_NEGO           0x80
 #define CAP_MARKERS             0x100
 #define CAP_FW_DB               0x200
-#define CAP_SENDTARGETS_OFFLOAD 0x400
+#define CAP_SENDTARGETS_OFFLOAD 0x400   /* offload discovery process */
-#define CAP_DATA_PATH_OFFLOAD   0x800
+#define CAP_DATA_PATH_OFFLOAD   0x800   /* offload entire IO path */
+#define CAP_DIGEST_OFFLOAD      0x1000  /* offload hdr and data digests */
+#define CAP_PADDING_OFFLOAD     0x2000  /* offload padding insertion, removal,
+                                         and verification */
 /*
 * These flags describes reason of stop_conn() call
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
new file mode 100644
index 000000000000..9f2876397dda
--- /dev/null
+++ b/include/scsi/libfc.h
@@ -0,0 +1,938 @@
+/*
+ * Copyright(c) 2007 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _LIBFC_H_
+#define _LIBFC_H_
+#include <linux/timer.h>
+#include <linux/if.h>
+#include <scsi/scsi_transport.h>
+#include <scsi/scsi_transport_fc.h>
+#include <scsi/fc/fc_fcp.h>
+#include <scsi/fc/fc_ns.h>
+#include <scsi/fc/fc_els.h>
+#include <scsi/fc/fc_gs.h>
+#include <scsi/fc_frame.h>
+#define LIBFC_DEBUG
+#ifdef LIBFC_DEBUG
+/* Log messages */
+#define FC_DBG(fmt, args...)                                            \
+        do {                                                            \
+                printk(KERN_INFO "%s " fmt, __func__, ##args);          \
+        } while (0)
+#else
+#define FC_DBG(fmt, args...)
+#endif
+/*
+ * libfc error codes
+ */
+#define FC_NO_ERR       0       /* no error */
+#define FC_EX_TIMEOUT   1       /* Exchange timeout */
+#define FC_EX_CLOSED    2       /* Exchange closed */
+/* some helpful macros */
+#define ntohll(x) be64_to_cpu(x)
+#define htonll(x) cpu_to_be64(x)
+#define ntoh24(p) (((p)[0] << 16) | ((p)[1] << 8) | ((p)[2]))
+#define hton24(p, v)    do {                    \
+                p[0] = (((v) >> 16) & 0xFF);    \
+                p[1] = (((v) >> 8) & 0xFF);     \
+                p[2] = ((v) & 0xFF);            \
+        } while (0)
+/*
+ * FC HBA status
+ */
+#define FC_PAUSE                    (1 << 1)
+#define FC_LINK_UP                  (1 << 0)
+enum fc_lport_state {
+        LPORT_ST_NONE = 0,
+        LPORT_ST_FLOGI,
+        LPORT_ST_DNS,
+        LPORT_ST_RPN_ID,
+        LPORT_ST_RFT_ID,
+        LPORT_ST_SCR,
+        LPORT_ST_READY,
+        LPORT_ST_LOGO,
+        LPORT_ST_RESET
+};
+enum fc_disc_event {
+        DISC_EV_NONE = 0,
+        DISC_EV_SUCCESS,
+        DISC_EV_FAILED
+};
+enum fc_rport_state {
+        RPORT_ST_NONE = 0,
+        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 */
+};
+enum fc_rport_trans_state {
+        FC_PORTSTATE_ROGUE,
+        FC_PORTSTATE_REAL,
+};
+/**
+ * struct fc_disc_port - temporary discovery port to hold rport identifiers
+ * @lp: Fibre Channel host port instance
+ * @peers: node for list management during discovery and RSCN processing
+ * @ids: identifiers structure to pass to fc_remote_port_add()
+ * @rport_work: work struct for starting the rport state machine
+ */
+struct fc_disc_port {
+        struct fc_lport             *lp;
+        struct list_head            peers;
+        struct fc_rport_identifiers ids;
+        struct work_struct          rport_work;
+};
+enum fc_rport_event {
+        RPORT_EV_NONE = 0,
+        RPORT_EV_CREATED,
+        RPORT_EV_FAILED,
+        RPORT_EV_STOP,
+        RPORT_EV_LOGO
+};
+struct fc_rport_operations {
+        void (*event_callback)(struct fc_lport *, struct fc_rport *,
+                               enum fc_rport_event);
+};
+/**
+ * struct fc_rport_libfc_priv - libfc internal information about a remote port
+ * @local_port: Fibre Channel host port instance
+ * @rp_state: state tracks progress of PLOGI, PRLI, and RTV exchanges
+ * @flags: REC and RETRY supported flags
+ * @max_seq: maximum number of concurrent sequences
+ * @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_libfc_priv {
+        struct fc_lport            *local_port;
+        enum fc_rport_state        rp_state;
+        u16                        flags;
+        #define FC_RP_FLAGS_REC_SUPPORTED       (1 << 0)
+        #define FC_RP_FLAGS_RETRY               (1 << 1)
+        u16                        max_seq;
+        unsigned int               retries;
+        unsigned int               e_d_tov;
+        unsigned int               r_a_tov;
+        enum fc_rport_trans_state  trans_state;
+        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;
+};
+#define PRIV_TO_RPORT(x)                                                \
+        (struct fc_rport *)((void *)x - sizeof(struct fc_rport));
+#define RPORT_TO_PRIV(x)                                                \
+        (struct fc_rport_libfc_priv *)((void *)x + sizeof(struct fc_rport));
+struct fc_rport *fc_rport_rogue_create(struct fc_disc_port *);
+static inline void fc_rport_set_name(struct fc_rport *rport, u64 wwpn, u64 wwnn)
+{
+        rport->node_name = wwnn;
+        rport->port_name = wwpn;
+}
+/*
+ * fcoe stats structure
+ */
+struct fcoe_dev_stats {
+        u64             SecondsSinceLastReset;
+        u64             TxFrames;
+        u64             TxWords;
+        u64             RxFrames;
+        u64             RxWords;
+        u64             ErrorFrames;
+        u64             DumpedFrames;
+        u64             LinkFailureCount;
+        u64             LossOfSignalCount;
+        u64             InvalidTxWordCount;
+        u64             InvalidCRCCount;
+        u64             InputRequests;
+        u64             OutputRequests;
+        u64             ControlRequests;
+        u64             InputMegabytes;
+        u64             OutputMegabytes;
+};
+/*
+ * 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 {
+        struct fc_frame *fp;
+        enum fc_els_rjt_reason reason;
+        enum fc_els_rjt_explan explan;
+};
+/*
+ * FCP request structure, one for each scsi cmd request
+ */
+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 */
+        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;
+        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 */
+};
+/*
+ * Structure and function definitions for managing Fibre Channel Exchanges
+ * and Sequences
+ *
+ * fc_exch holds state for one exchange and links to its active sequence.
+ *
+ * fc_seq holds the state for an individual sequence.
+ */
+struct fc_exch_mgr;
+/*
+ * Sequence.
+ */
+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 */
+};
+#define FC_EX_DONE              (1 << 0) /* ep is completed */
+#define FC_EX_RST_CLEANUP       (1 << 1) /* reset is forcing completion */
+/*
+ * Exchange.
+ *
+ * Locking notes: The ex_lock protects following items:
+ *      state, esb_stat, f_ctl, seq.ssb_stat
+ *      seq_id
+ *      sequence allocation
+ */
+struct fc_exch {
+        struct fc_exch_mgr *em;         /* exchange manager */
+        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;
+};
+#define fc_seq_exch(sp) container_of(sp, struct fc_exch, seq)
+struct libfc_function_template {
+        /**
+         * Mandatory Fields
+         *
+         * These handlers must be implemented by the LLD.
+         */
+        /*
+         * Interface to send a FC frame
+         */
+        int (*frame_send)(struct fc_lport *lp, struct fc_frame *fp);
+        /**
+         * Optional Fields
+         *
+         * The LLD may choose to implement any of the following handlers.
+         * If LLD doesn't specify hander and leaves its pointer NULL then
+         * the default libfc function will be used for that handler.
+         */
+        /**
+         * ELS/CT interfaces
+         */
+        /*
+         * elsct_send - sends ELS/CT frame
+         */
+        struct fc_seq *(*elsct_send)(struct fc_lport *lport,
+                                     struct fc_rport *rport,
+                                     struct fc_frame *fp,
+                                     unsigned int op,
+                                     void (*resp)(struct fc_seq *,
+                                             struct fc_frame *fp,
+                                             void *arg),
+                                     void *arg, u32 timer_msec);
+        /**
+         * Exhance Manager interfaces
+         */
+        /*
+         * 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
+         * fc_frame pointer in response handler will also indicate timeout
+         * as error using IS_ERR related macros.
+         *
+         * The exchange destructor handler is also set in this routine.
+         * The destructor handler is invoked by EM layer when exchange
+         * is about to free, this can be used by caller to free its
+         * resources along with exchange free.
+         *
+         * The arg is passed back to resp and destructor handler.
+         *
+         * The timeout value (in msec) for an exchange is set if non zero
+         * timer_msec argument is specified. The timer is canceled when
+         * it fires or when the exchange is done. The exchange timeout handler
+         * is registered by EM layer.
+         */
+        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);
+        /*
+         * send a frame using existing sequence and exchange.
+         */
+        int (*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 (*seq_els_rsp_send)(struct fc_seq *sp, enum fc_els_cmd els_cmd,
+                                 struct fc_seq_els_data *els_data);
+        /*
+         * Abort an exchange and sequence. Generally called because of a
+         * exchange timeout or an abort from the upper layer.
+         *
+         * A timer_msec can be specified for abort timeout, if non-zero
+         * timer_msec value is specified then exchange resp handler
+         * will be called with timeout error if no response to abort.
+         */
+        int (*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 (*exch_done)(struct fc_seq *sp);
+        /*
+         * Assigns a EM and a free XID for an new exchange and then
+         * allocates a new exchange and sequence pair.
+         * The fp can be used to determine free XID.
+         */
+        struct fc_exch *(*exch_get)(struct fc_lport *lp, struct fc_frame *fp);
+        /*
+         * Release previously assigned XID by exch_get API.
+         * The LLD may implement this if XID is assigned by LLD
+         * in exch_get().
+         */
+        void (*exch_put)(struct fc_lport *lp, struct fc_exch_mgr *mp,
+                         u16 ex_id);
+        /*
+         * Start a new sequence on the same exchange/sequence tuple.
+         */
+        struct fc_seq *(*seq_start_next)(struct fc_seq *sp);
+        /*
+         * Reset an exchange manager, completing all sequences and exchanges.
+         * If s_id is non-zero, reset only exchanges originating from that FID.
+         * If d_id is non-zero, reset only exchanges sending to that FID.
+         */
+        void (*exch_mgr_reset)(struct fc_exch_mgr *,
+                               u32 s_id, u32 d_id);
+        void (*rport_flush_queue)(void);
+        /**
+         * Local Port interfaces
+         */
+        /*
+         * Receive a frame to a local port.
+         */
+        void (*lport_recv)(struct fc_lport *lp, struct fc_seq *sp,
+                           struct fc_frame *fp);
+        int (*lport_reset)(struct fc_lport *);
+        /**
+         * Remote Port interfaces
+         */
+        /*
+         * Initiates the RP state machine. It is called from the LP module.
+         * This function will issue the following commands to the N_Port
+         * identified by the FC ID provided.
+         *
+         * - PLOGI
+         * - PRLI
+         * - RTV
+         */
+        int (*rport_login)(struct fc_rport *rport);
+        /*
+         * Logoff, and remove the rport from the transport if
+         * it had been added. This will send a LOGO to the target.
+         */
+        int (*rport_logoff)(struct fc_rport *rport);
+        /*
+         * Recieve a request from a remote port.
+         */
+        void (*rport_recv_req)(struct fc_seq *, struct fc_frame *,
+                               struct fc_rport *);
+        struct fc_rport *(*rport_lookup)(const struct fc_lport *, u32);
+        /**
+         * FCP interfaces
+         */
+        /*
+         * Send a fcp cmd from fsp pkt.
+         * Called with the SCSI host lock unlocked and irqs disabled.
+         *
+         * The resp handler is called when FCP_RSP received.
+         *
+         */
+        int (*fcp_cmd_send)(struct fc_lport *lp, struct fc_fcp_pkt *fsp,
+                            void (*resp)(struct fc_seq *, struct fc_frame *fp,
+                                         void *arg));
+        /*
+         * Used at least durring linkdown and reset
+         */
+        void (*fcp_cleanup)(struct fc_lport *lp);
+        /*
+         * Abort all I/O on a local port
+         */
+        void (*fcp_abort_io)(struct fc_lport *lp);
+        /**
+         * Discovery interfaces
+         */
+        void (*disc_recv_req)(struct fc_seq *,
+                              struct fc_frame *, struct fc_lport *);
+        /*
+         * Start discovery for a local port.
+         */
+        void (*disc_start)(void (*disc_callback)(struct fc_lport *,
+                                                 enum fc_disc_event),
+                           struct fc_lport *);
+        /*
+         * Stop discovery for a given lport. This will remove
+         * all discovered rports
+         */
+        void (*disc_stop) (struct fc_lport *);
+        /*
+         * Stop discovery for a given lport. This will block
+         * until all discovered rports are deleted from the
+         * FC transport class
+         */
+        void (*disc_stop_final) (struct fc_lport *);
+};
+/* information used by the discovery layer */
+struct fc_disc {
+        unsigned char           retry_count;
+        unsigned char           delay;
+        unsigned char           pending;
+        unsigned char           requested;
+        unsigned short          seq_count;
+        unsigned char           buf_len;
+        enum fc_disc_event      event;
+        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 {
+        struct list_head list;
+        /* Associations */
+        struct Scsi_Host        *host;
+        struct fc_exch_mgr      *emp;
+        struct fc_rport         *dns_rp;
+        struct fc_rport         *ptp_rp;
+        void                    *scsi_priv;
+        struct fc_disc          disc;
+        /* Operational Information */
+        struct libfc_function_template tt;
+        u16                     link_status;
+        enum fc_lport_state     state;
+        unsigned long           boot_time;
+        struct fc_host_statistics host_stats;
+        struct fcoe_dev_stats   *dev_stats[NR_CPUS];
+        u64                     wwpn;
+        u64                     wwnn;
+        u8                      retry_count;
+        /* 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;
+        u16                     link_speed;
+        u16                     link_supported_speeds;
+        u16                     lro_xid;        /* max xid for fcoe lro */
+        struct fc_ns_fts        fcts;           /* FC-4 type masks */
+        struct fc_els_rnid_gen  rnid_gen;       /* RNID information */
+        /* Semaphores */
+        struct mutex lp_mutex;
+        /* Miscellaneous */
+        struct delayed_work     retry_work;
+        struct delayed_work     disc_work;
+};
+/**
+ * FC_LPORT HELPER FUNCTIONS
+ *****************************/
+static inline void *lport_priv(const struct fc_lport *lp)
+{
+        return (void *)(lp + 1);
+}
+static inline int fc_lport_test_ready(struct fc_lport *lp)
+{
+        return lp->state == LPORT_ST_READY;
+}
+static inline void fc_set_wwnn(struct fc_lport *lp, u64 wwnn)
+{
+        lp->wwnn = wwnn;
+}
+static inline void fc_set_wwpn(struct fc_lport *lp, u64 wwnn)
+{
+        lp->wwpn = wwnn;
+}
+static inline void fc_lport_state_enter(struct fc_lport *lp,
+                                        enum fc_lport_state state)
+{
+        if (state != lp->state)
+                lp->retry_count = 0;
+        lp->state = state;
+}
+/**
+ * LOCAL PORT LAYER
+ *****************************/
+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);
+/*
+ * The link is up for the given local port.
+ */
+void fc_linkup(struct fc_lport *);
+/*
+ * Link is down for the given local port.
+ */
+void fc_linkdown(struct fc_lport *);
+/*
+ * Pause and unpause traffic.
+ */
+void fc_pause(struct fc_lport *);
+void fc_unpause(struct fc_lport *);
+/*
+ * Configure the local port.
+ */
+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);
+/**
+ * REMOTE PORT LAYER
+ *****************************/
+int fc_rport_init(struct fc_lport *lp);
+void fc_rport_terminate_io(struct fc_rport *rp);
+/**
+ * DISCOVERY LAYER
+ *****************************/
+int fc_disc_init(struct fc_lport *lp);
+/**
+ * SCSI 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 *);
+/**
+ * ELS/CT interface
+ *****************************/
+/*
+ * Initializes ELS/CT interface
+ */
+int fc_elsct_init(struct fc_lport *lp);
+/**
+ * EXCHANGE MANAGER LAYER
+ *****************************/
+/*
+ * Initializes Exchange Manager related
+ * function pointers in struct libfc_function_template.
+ */
+int fc_exch_init(struct fc_lport *lp);
+/*
+ * 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.
+ * The LLD can use exch_get() of struct libfc_function_template
+ * to specify XID for a new exchange within
+ * a specified EM instance.
+ *
+ * The em_idx to uniquely identify an EM instance.
+ */
+struct fc_exch_mgr *fc_exch_mgr_alloc(struct fc_lport *lp,
+                                      enum fc_class class,
+                                      u16 min_xid,
+                                      u16 max_xid);
+/*
+ * Free an exchange manager.
+ */
+void fc_exch_mgr_free(struct fc_exch_mgr *mp);
+/*
+ * Receive a frame on specified local port and exchange manager.
+ */
+void fc_exch_recv(struct fc_lport *lp, struct fc_exch_mgr *mp,
+                  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);
+/*
+ * Assigns a EM and XID for a frame and then allocates
+ * a new exchange and sequence pair.
+ * The fp can be used to determine free XID.
+ */
+struct fc_exch *fc_exch_get(struct fc_lport *lp, struct fc_frame *fp);
+/*
+ * Allocate a new exchange and sequence pair.
+ * if ex_id is zero then next free exchange id
+ * from specified exchange manger mp will be assigned.
+ */
+struct fc_exch *fc_exch_alloc(struct fc_exch_mgr *mp,
+                              struct fc_frame *fp, u16 ex_id);
+/*
+ * Start a new sequence on the same exchange as the supplied sequence.
+ */
+struct fc_seq *fc_seq_start_next(struct fc_seq *sp);
+/*
+ * Reset an exchange manager, completing all sequences and exchanges.
+ * If s_id is non-zero, reset only exchanges originating from that FID.
+ * If d_id is non-zero, reset only exchanges sending to that FID.
+ */
+void fc_exch_mgr_reset(struct fc_exch_mgr *, 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);
+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);
+#endif /* _LIBFC_H_ */
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
new file mode 100644
index 000000000000..89fdbb9a6a1b
--- /dev/null
+++ b/include/scsi/libfcoe.h
@@ -0,0 +1,176 @@
+/*
+ * Copyright(c) 2007 - 2008 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * 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.
+ *
+ * Maintained at www.Open-FCoE.org
+ */
+#ifndef _LIBFCOE_H
+#define _LIBFCOE_H
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <scsi/fc/fc_fcoe.h>
+#include <scsi/libfc.h>
+/*
+ * this percpu struct for fcoe
+ */
+struct fcoe_percpu_s {
+        int             cpu;
+        struct task_struct *thread;
+        struct sk_buff_head fcoe_rx_list;
+        struct page *crc_eof_page;
+        int crc_eof_offset;
+};
+/*
+ * the fcoe sw transport private data
+ */
+struct fcoe_softc {
+        struct list_head list;
+        struct fc_lport *lp;
+        struct net_device *real_dev;
+        struct net_device *phys_dev;            /* device with ethtool_ops */
+        struct packet_type  fcoe_packet_type;
+        struct sk_buff_head fcoe_pending_queue;
+        u8 dest_addr[ETH_ALEN];
+        u8 ctl_src_addr[ETH_ALEN];
+        u8 data_src_addr[ETH_ALEN];
+        /*
+         * fcoe protocol address learning related stuff
+         */
+        u16 flogi_oxid;
+        u8 flogi_progress;
+        u8 address_mode;
+};
+static inline struct fcoe_softc *fcoe_softc(
+        const struct fc_lport *lp)
+{
+        return (struct fcoe_softc *)lport_priv(lp);
+}
+static inline struct net_device *fcoe_netdev(
+        const struct fc_lport *lp)
+{
+        return fcoe_softc(lp)->real_dev;
+}
+static inline struct fcoe_hdr *skb_fcoe_header(const struct sk_buff *skb)
+{
+        return (struct fcoe_hdr *)skb_network_header(skb);
+}
+static inline int skb_fcoe_offset(const struct sk_buff *skb)
+{
+        return skb_network_offset(skb);
+}
+static inline struct fc_frame_header *skb_fc_header(const struct sk_buff *skb)
+{
+        return (struct fc_frame_header *)skb_transport_header(skb);
+}
+static inline int skb_fc_offset(const struct sk_buff *skb)
+{
+        return skb_transport_offset(skb);
+}
+static inline void skb_reset_fc_header(struct sk_buff *skb)
+{
+        skb_reset_network_header(skb);
+        skb_set_transport_header(skb, skb_network_offset(skb) +
+                                 sizeof(struct fcoe_hdr));
+}
+static inline bool skb_fc_is_data(const struct sk_buff *skb)
+{
+        return skb_fc_header(skb)->fh_r_ctl == FC_RCTL_DD_SOL_DATA;
+}
+static inline bool skb_fc_is_cmd(const struct sk_buff *skb)
+{
+        return skb_fc_header(skb)->fh_r_ctl == FC_RCTL_DD_UNSOL_CMD;
+}
+static inline bool skb_fc_has_exthdr(const struct sk_buff *skb)
+{
+        return (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_VFTH) ||
+            (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_IFRH) ||
+            (skb_fc_header(skb)->fh_r_ctl == FC_RCTL_ENCH);
+}
+static inline bool skb_fc_is_roff(const struct sk_buff *skb)
+{
+        return skb_fc_header(skb)->fh_f_ctl[2] & FC_FC_REL_OFF;
+}
+static inline u16 skb_fc_oxid(const struct sk_buff *skb)
+{
+        return be16_to_cpu(skb_fc_header(skb)->fh_ox_id);
+}
+static inline u16 skb_fc_rxid(const struct sk_buff *skb)
+{
+        return be16_to_cpu(skb_fc_header(skb)->fh_rx_id);
+}
+/* FIXME - DMA_BIDIRECTIONAL ? */
+#define skb_cb(skb)     ((struct fcoe_rcv_info *)&((skb)->cb[0]))
+#define skb_cmd(skb)    (skb_cb(skb)->fr_cmd)
+#define skb_dir(skb)    (skb_cmd(skb)->sc_data_direction)
+static inline bool skb_fc_is_read(const struct sk_buff *skb)
+{
+        if (skb_fc_is_cmd(skb) && skb_cmd(skb))
+                return skb_dir(skb) == DMA_FROM_DEVICE;
+        return false;
+}
+static inline bool skb_fc_is_write(const struct sk_buff *skb)
+{
+        if (skb_fc_is_cmd(skb) && skb_cmd(skb))
+                return skb_dir(skb) == DMA_TO_DEVICE;
+        return false;
+}
+/* libfcoe funcs */
+int fcoe_reset(struct Scsi_Host *shost);
+u64 fcoe_wwn_from_mac(unsigned char mac[MAX_ADDR_LEN],
+                      unsigned int scheme, unsigned int port);
+u32 fcoe_fc_crc(struct fc_frame *fp);
+int fcoe_xmit(struct fc_lport *, struct fc_frame *);
+int fcoe_rcv(struct sk_buff *, struct net_device *,
+             struct packet_type *, struct net_device *);
+int fcoe_percpu_receive_thread(void *arg);
+void fcoe_clean_pending_queue(struct fc_lport *lp);
+void fcoe_percpu_clean(struct fc_lport *lp);
+void fcoe_watchdog(ulong vp);
+int fcoe_link_ok(struct fc_lport *lp);
+struct fc_lport *fcoe_hostlist_lookup(const struct net_device *);
+int fcoe_hostlist_add(const struct fc_lport *);
+int fcoe_hostlist_remove(const struct fc_lport *);
+struct Scsi_Host *fcoe_host_alloc(struct scsi_host_template *, int);
+int fcoe_libfc_config(struct fc_lport *, struct libfc_function_template *);
+/* fcoe sw hba */
+int __init fcoe_sw_init(void);
+int __exit fcoe_sw_exit(void);
+#endif /* _LIBFCOE_H */
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 61e53f14f7e1..7360e1916e75 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -30,6 +30,7 @@
 #include <linux/workqueue.h>
 #include <scsi/iscsi_proto.h>
 #include <scsi/iscsi_if.h>
+#include <scsi/scsi_transport_iscsi.h>
 struct scsi_transport_template;
 struct scsi_host_template;
@@ -70,12 +71,12 @@ enum {
 /* Connection suspend "bit" */
 #define ISCSI_SUSPEND_BIT               1
-#define ISCSI_ITT_MASK                  (0x1fff)
+#define ISCSI_ITT_MASK                  0x1fff
 #define ISCSI_TOTAL_CMDS_MAX            4096
 /* this must be a power of two greater than ISCSI_MGMT_CMDS_MAX */
 #define ISCSI_TOTAL_CMDS_MIN            16
 #define ISCSI_AGE_SHIFT                 28
-#define ISCSI_AGE_MASK                  (0xf << ISCSI_AGE_SHIFT)
+#define ISCSI_AGE_MASK                  0xf
 #define ISCSI_ADDRESS_BUF_LEN           64
@@ -93,24 +94,38 @@ enum {
        ISCSI_TASK_RUNNING,
 };
+struct iscsi_r2t_info {
+        __be32                  ttt;            /* copied from R2T */
+        __be32                  exp_statsn;     /* copied from R2T */
+        uint32_t                data_length;    /* copied from R2T */
+        uint32_t                data_offset;    /* copied from R2T */
+        int                     data_count;     /* DATA-Out payload progress */
+        int                     datasn;
+        /* LLDs should set/update these values */
+        int                     sent;           /* R2T sequence progress */
+};
 struct iscsi_task {
        /*
         * Because LLDs allocate their hdr differently, this is a pointer
         * and length to that storage. It must be setup at session
         * creation time.
         */
-        struct iscsi_cmd        *hdr;
+        struct iscsi_hdr        *hdr;
        unsigned short          hdr_max;
        unsigned short          hdr_len;        /* accumulated size of hdr used */
+        /* copied values in case we need to send tmfs */
+        itt_t                   hdr_itt;
+        __be32                  cmdsn;
+        uint8_t                 lun[8];
        int                     itt;            /* this ITT */
-        uint32_t                unsol_datasn;
        unsigned                imm_count;      /* imm-data (bytes)   */
-        unsigned                unsol_count;    /* unsolicited (bytes)*/
        /* offset in unsolicited stream (bytes); */
-        unsigned                unsol_offset;
+        struct iscsi_r2t_info   unsol_r2t;
-        unsigned                data_count;     /* remaining Data-Out */
        char                    *data;          /* mgmt payload */
+        unsigned                data_count;
        struct scsi_cmnd        *sc;            /* associated SCSI cmd*/
        struct iscsi_conn       *conn;          /* used connection    */
@@ -121,6 +136,11 @@ struct iscsi_task {
        void                    *dd_data;       /* driver/transport data */
 };
+static inline int iscsi_task_has_unsol_data(struct iscsi_task *task)
+{
+        return task->unsol_r2t.data_length > task->unsol_r2t.sent;
+}
 static inline void* iscsi_next_hdr(struct iscsi_task *task)
 {
        return (void*)task->hdr + task->hdr_len;
@@ -376,8 +396,9 @@ extern void iscsi_suspend_tx(struct iscsi_conn *conn);
 * pdu and task processing
 */
 extern void iscsi_update_cmdsn(struct iscsi_session *, struct iscsi_nopin *);
-extern void iscsi_prep_unsolicit_data_pdu(struct iscsi_task *,
+extern void iscsi_prep_data_out_pdu(struct iscsi_task *task,
-                                        struct iscsi_data *hdr);
+                                    struct iscsi_r2t_info *r2t,
+                                    struct iscsi_data *hdr);
 extern int iscsi_conn_send_pdu(struct iscsi_cls_conn *, struct iscsi_hdr *,
                                char *, uint32_t);
 extern int iscsi_complete_pdu(struct iscsi_conn *, struct iscsi_hdr *,
diff --git a/include/scsi/libiscsi_tcp.h b/include/scsi/libiscsi_tcp.h
new file mode 100644
index 000000000000..83e32f6d7859
--- /dev/null
+++ b/include/scsi/libiscsi_tcp.h
@@ -0,0 +1,132 @@
+/*
+ * iSCSI over TCP/IP Data-Path lib
+ *
+ * Copyright (C) 2008 Mike Christie
+ * Copyright (C) 2008 Red Hat, Inc.  All rights reserved.
+ * maintained by open-iscsi@googlegroups.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.
+ *
+ * See the file COPYING included with this distribution for more details.
+ */
+#ifndef LIBISCSI_TCP_H
+#define LIBISCSI_TCP_H
+#include <scsi/libiscsi.h>
+struct iscsi_tcp_conn;
+struct iscsi_segment;
+struct sk_buff;
+struct hash_desc;
+typedef int iscsi_segment_done_fn_t(struct iscsi_tcp_conn *,
+                                    struct iscsi_segment *);
+struct iscsi_segment {
+        unsigned char           *data;
+        unsigned int            size;
+        unsigned int            copied;
+        unsigned int            total_size;
+        unsigned int            total_copied;
+        struct hash_desc        *hash;
+        unsigned char           recv_digest[ISCSI_DIGEST_SIZE];
+        unsigned char           digest[ISCSI_DIGEST_SIZE];
+        unsigned int            digest_len;
+        struct scatterlist      *sg;
+        void                    *sg_mapped;
+        unsigned int            sg_offset;
+        iscsi_segment_done_fn_t *done;
+};
+/* Socket connection recieve helper */
+struct iscsi_tcp_recv {
+        struct iscsi_hdr        *hdr;
+        struct iscsi_segment    segment;
+        /* Allocate buffer for BHS + AHS */
+        uint32_t                hdr_buf[64];
+        /* copied and flipped values */
+        int                     datalen;
+};
+struct iscsi_tcp_conn {
+        struct iscsi_conn       *iscsi_conn;
+        void                    *dd_data;
+        int                     stop_stage;     /* conn_stop() flag: *
+                                                 * stop to recover,  *
+                                                 * stop to terminate */
+        /* control data */
+        struct iscsi_tcp_recv   in;             /* TCP receive context */
+        /* CRC32C (Rx) LLD should set this is they do not offload */
+        struct hash_desc        *rx_hash;
+};
+struct iscsi_tcp_task {
+        uint32_t                exp_datasn;     /* expected target's R2TSN/DataSN */
+        int                     data_offset;
+        struct iscsi_r2t_info   *r2t;           /* in progress solict R2T */
+        struct iscsi_pool       r2tpool;
+        struct kfifo            *r2tqueue;
+        void                    *dd_data;
+};
+enum {
+        ISCSI_TCP_SEGMENT_DONE,         /* curr seg has been processed */
+        ISCSI_TCP_SKB_DONE,             /* skb is out of data */
+        ISCSI_TCP_CONN_ERR,             /* iscsi layer has fired a conn err */
+        ISCSI_TCP_SUSPENDED,            /* conn is suspended */
+};
+extern void iscsi_tcp_hdr_recv_prep(struct iscsi_tcp_conn *tcp_conn);
+extern int iscsi_tcp_recv_skb(struct iscsi_conn *conn, struct sk_buff *skb,
+                              unsigned int offset, bool offloaded, int *status);
+extern void iscsi_tcp_cleanup_task(struct iscsi_task *task);
+extern int iscsi_tcp_task_init(struct iscsi_task *task);
+extern int iscsi_tcp_task_xmit(struct iscsi_task *task);
+/* segment helpers */
+extern int iscsi_tcp_recv_segment_is_hdr(struct iscsi_tcp_conn *tcp_conn);
+extern int iscsi_tcp_segment_done(struct iscsi_tcp_conn *tcp_conn,
+                                  struct iscsi_segment *segment, int recv,
+                                  unsigned copied);
+extern void iscsi_tcp_segment_unmap(struct iscsi_segment *segment);
+extern void iscsi_segment_init_linear(struct iscsi_segment *segment,
+                                      void *data, size_t size,
+                                      iscsi_segment_done_fn_t *done,
+                                      struct hash_desc *hash);
+extern int
+iscsi_segment_seek_sg(struct iscsi_segment *segment,
+                      struct scatterlist *sg_list, unsigned int sg_count,
+                      unsigned int offset, size_t size,
+                      iscsi_segment_done_fn_t *done, struct hash_desc *hash);
+/* digest helpers */
+extern void iscsi_tcp_dgst_header(struct hash_desc *hash, const void *hdr,
+                                  size_t hdrlen,
+                                  unsigned char digest[ISCSI_DIGEST_SIZE]);
+extern struct iscsi_cls_conn *
+iscsi_tcp_conn_setup(struct iscsi_cls_session *cls_session, int dd_data_size,
+                     uint32_t conn_idx);
+extern void iscsi_tcp_conn_teardown(struct iscsi_cls_conn *cls_conn);
+/* misc helpers */
+extern int iscsi_tcp_r2tpool_alloc(struct iscsi_session *session);
+extern void iscsi_tcp_r2tpool_free(struct iscsi_session *session);
+extern void iscsi_tcp_conn_get_stats(struct iscsi_cls_conn *cls_conn,
+                                     struct iscsi_stats *stats);
+#endif /* LIBISCSI_TCP_H */
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index a37a8148a310..01a4c58f8bad 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -159,8 +159,6 @@ struct scsi_device {
        atomic_t iodone_cnt;
        atomic_t ioerr_cnt;
-        int timeout;
        struct device           sdev_gendev,
                                sdev_dev;
@@ -367,10 +365,11 @@ extern int scsi_is_target_device(const struct device *);
 extern int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
                        int data_direction, void *buffer, unsigned bufflen,
                        unsigned char *sense, int timeout, int retries,
-                        int flag);
+                        int flag, int *resid);
 extern int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
                            int data_direction, void *buffer, unsigned bufflen,
-                            struct scsi_sense_hdr *, int timeout, int retries);
+                            struct scsi_sense_hdr *, int timeout, int retries,
+                            int *resid);
 extern int scsi_execute_async(struct scsi_device *sdev,
                              const unsigned char *cmd, int cmd_len, int data_direction,
                              void *buffer, unsigned bufflen, int use_sg,
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index c667cc396545..b50aabe2861e 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -113,10 +113,18 @@ struct iscsi_transport {
                         char *data, uint32_t data_size);
        void (*get_stats) (struct iscsi_cls_conn *conn,
                           struct iscsi_stats *stats);
        int (*init_task) (struct iscsi_task *task);
        int (*xmit_task) (struct iscsi_task *task);
-        void (*cleanup_task) (struct iscsi_conn *conn,
+        void (*cleanup_task) (struct iscsi_task *task);
-                                  struct iscsi_task *task);
+        int (*alloc_pdu) (struct iscsi_task *task, uint8_t opcode);
+        int (*xmit_pdu) (struct iscsi_task *task);
+        int (*init_pdu) (struct iscsi_task *task, unsigned int offset,
+                         unsigned int count);
+        void (*parse_pdu_itt) (struct iscsi_conn *conn, itt_t itt,
+                               int *index, int *age);
        void (*session_recovery_timedout) (struct iscsi_cls_session *session);
        struct iscsi_endpoint *(*ep_connect) (struct sockaddr *dst_addr,
                                              int non_blocking);
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 9c309daf492b..251fc1cd5002 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -281,10 +281,12 @@
 /* specific - Analog Devices */
 #define AC97_AD_TEST            0x5a    /* test register */
 #define AC97_AD_TEST2           0x5c    /* undocumented test register 2 */
+#define AC97_AD_HPFD_SHIFT      12      /* High Pass Filter Disable */
 #define AC97_AD_CODEC_CFG       0x70    /* codec configuration */
 #define AC97_AD_JACK_SPDIF      0x72    /* Jack Sense & S/PDIF */
 #define AC97_AD_SERIAL_CFG      0x74    /* Serial Configuration */
 #define AC97_AD_MISC            0x76    /* Misc Control Bits */
+#define AC97_AD_VREFD_SHIFT     2       /* V_REFOUT Disable (AD1888) */
 /* specific - Cirrus Logic */
 #define AC97_CSR_ACMODE         0x5e    /* AC Mode Register */
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 2c4dc908a54a..1c02ed1d7c4a 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -575,6 +575,7 @@ enum {
 #define SNDRV_TIMER_GLOBAL_SYSTEM       0
 #define SNDRV_TIMER_GLOBAL_RTC          1
 #define SNDRV_TIMER_GLOBAL_HPET         2
+#define SNDRV_TIMER_GLOBAL_HRTIMER      3
 /* info flags */
 #define SNDRV_TIMER_FLG_SLAVE           (1<<0)  /* cannot be controlled */
diff --git a/include/sound/core.h b/include/sound/core.h
index 1508c4ec1ba9..f632484bc743 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -353,7 +353,7 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
 * snd_printk - printk wrapper
 * @fmt: format string
 *
- * Works like print() but prints the file and the line of the caller
+ * Works like printk() but prints the file and the line of the caller
 * when configured with CONFIG_SND_VERBOSE_PRINTK.
 */
 #define snd_printk(fmt, args...) \
@@ -380,18 +380,40 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
        printk(fmt ,##args)
 #endif
+/**
+ * snd_BUG - give a BUG warning message and stack trace
+ *
+ * Calls WARN() if CONFIG_SND_DEBUG is set.
+ * Ignored when CONFIG_SND_DEBUG is not set.
+ */
 #define snd_BUG()               WARN(1, "BUG?\n")
+/**
+ * snd_BUG_ON - debugging check macro
+ * @cond: condition to evaluate
+ *
+ * When CONFIG_SND_DEBUG is set, this macro evaluates the given condition,
+ * and call WARN() and returns the value if it's non-zero.
+ * 
+ * When CONFIG_SND_DEBUG is not set, this just returns zero, and the given
+ * condition is ignored.
+ *
+ * NOTE: the argument won't be evaluated at all when CONFIG_SND_DEBUG=n.
+ * Thus, don't put any statement that influences on the code behavior,
+ * such as pre/post increment, to the argument of this macro.
+ * If you want to evaluate and give a warning, use standard WARN_ON().
+ */
 #define snd_BUG_ON(cond)        WARN((cond), "BUG? (%s)\n", __stringify(cond))
 #else /* !CONFIG_SND_DEBUG */
 #define snd_printd(fmt, args...)        do { } while (0)
 #define snd_BUG()                       do { } while (0)
-static inline int __snd_bug_on(void)
+static inline int __snd_bug_on(int cond)
 {
        return 0;
 }
-#define snd_BUG_ON(cond)                __snd_bug_on()  /* always false */
+#define snd_BUG_ON(cond)        __snd_bug_on(0 && (cond))  /* always false */
 #endif /* CONFIG_SND_DEBUG */
diff --git a/include/sound/info.h b/include/sound/info.h
index 8ae72e74f898..7c2ee1a21b00 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -40,30 +40,34 @@ struct snd_info_buffer {
 struct snd_info_entry;
 struct snd_info_entry_text {
-        void (*read) (struct snd_info_entry *entry, struct snd_info_buffer *buffer);
+        void (*read)(struct snd_info_entry *entry,
-        void (*write) (struct snd_info_entry *entry, struct snd_info_buffer *buffer);
+                     struct snd_info_buffer *buffer);
+        void (*write)(struct snd_info_entry *entry,
+                      struct snd_info_buffer *buffer);
 };
 struct snd_info_entry_ops {
-        int (*open) (struct snd_info_entry *entry,
+        int (*open)(struct snd_info_entry *entry,
-                     unsigned short mode, void **file_private_data);
+                    unsigned short mode, void **file_private_data);
-        int (*release) (struct snd_info_entry * entry,
+        int (*release)(struct snd_info_entry *entry,
-                        unsigned short mode, void *file_private_data);
+                       unsigned short mode, void *file_private_data);
-        long (*read) (struct snd_info_entry *entry, void *file_private_data,
+        long (*read)(struct snd_info_entry *entry, void *file_private_data,
-                      struct file * file, char __user *buf,
+                     struct file *file, char __user *buf,
+                     unsigned long count, unsigned long pos);
+        long (*write)(struct snd_info_entry *entry, void *file_private_data,
+                      struct file *file, const char __user *buf,
                      unsigned long count, unsigned long pos);
-        long (*write) (struct snd_info_entry *entry, void *file_private_data,
+        long long (*llseek)(struct snd_info_entry *entry,
-                       struct file * file, const char __user *buf,
+                            void *file_private_data, struct file *file,
-                       unsigned long count, unsigned long pos);
+                            long long offset, int orig);
-        long long (*llseek) (struct snd_info_entry *entry, void *file_private_data,
+        unsigned int(*poll)(struct snd_info_entry *entry,
-                            struct file * file, long long offset, int orig);
+                            void *file_private_data, struct file *file,
-        unsigned int (*poll) (struct snd_info_entry *entry, void *file_private_data,
+                            poll_table *wait);
-                              struct file * file, poll_table * wait);
+        int (*ioctl)(struct snd_info_entry *entry, void *file_private_data,
-        int (*ioctl) (struct snd_info_entry *entry, void *file_private_data,
+                     struct file *file, unsigned int cmd, unsigned long arg);
-                      struct file * file, unsigned int cmd, unsigned long arg);
+        int (*mmap)(struct snd_info_entry *entry, void *file_private_data,
-        int (*mmap) (struct snd_info_entry *entry, void *file_private_data,
+                    struct inode *inode, struct file *file,
-                     struct inode * inode, struct file * file,
+                    struct vm_area_struct *vma);
-                     struct vm_area_struct * vma);
 };
 struct snd_info_entry {
@@ -106,34 +110,37 @@ void snd_card_info_read_oss(struct snd_info_buffer *buffer);
 static inline void snd_card_info_read_oss(struct snd_info_buffer *buffer) {}
 #endif
-int snd_iprintf(struct snd_info_buffer * buffer, char *fmt,...) __attribute__ ((format (printf, 2, 3)));
+int snd_iprintf(struct snd_info_buffer *buffer, char *fmt, ...) \
+                                __attribute__ ((format (printf, 2, 3)));
 int snd_info_init(void);
 int snd_info_done(void);
-int snd_info_get_line(struct snd_info_buffer * buffer, char *line, int len);
+int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len);
 char *snd_info_get_str(char *dest, char *src, int len);
-struct snd_info_entry *snd_info_create_module_entry(struct module * module,
+struct snd_info_entry *snd_info_create_module_entry(struct module *module,
                                               const char *name,
-                                               struct snd_info_entry * parent);
+                                               struct snd_info_entry *parent);
-struct snd_info_entry *snd_info_create_card_entry(struct snd_card * card,
+struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card,
                                             const char *name,
-                                             struct snd_info_entry * parent);
+                                             struct snd_info_entry *parent);
-void snd_info_free_entry(struct snd_info_entry * entry);
+void snd_info_free_entry(struct snd_info_entry *entry);
-int snd_info_store_text(struct snd_info_entry * entry);
+int snd_info_store_text(struct snd_info_entry *entry);
-int snd_info_restore_text(struct snd_info_entry * entry);
+int snd_info_restore_text(struct snd_info_entry *entry);
-int snd_info_card_create(struct snd_card * card);
+int snd_info_card_create(struct snd_card *card);
-int snd_info_card_register(struct snd_card * card);
+int snd_info_card_register(struct snd_card *card);
-int snd_info_card_free(struct snd_card * card);
+int snd_info_card_free(struct snd_card *card);
-void snd_info_card_disconnect(struct snd_card * card);
+void snd_info_card_disconnect(struct snd_card *card);
-int snd_info_register(struct snd_info_entry * entry);
+void snd_info_card_id_change(struct snd_card *card);
+int snd_info_register(struct snd_info_entry *entry);
 /* for card drivers */
-int snd_card_proc_new(struct snd_card *card, const char *name, struct snd_info_entry **entryp);
+int snd_card_proc_new(struct snd_card *card, const char *name,
+                      struct snd_info_entry **entryp);
 static inline void snd_info_set_text_ops(struct snd_info_entry *entry, 
-                                         void *private_data,
+        void *private_data,
-                                         void (*read)(struct snd_info_entry *, struct snd_info_buffer *))
+        void (*read)(struct snd_info_entry *, struct snd_info_buffer *))
 {
        entry->private_data = private_data;
        entry->c.text.read = read;
@@ -146,21 +153,22 @@ int snd_info_check_reserved_words(const char *str);
 #define snd_seq_root NULL
 #define snd_oss_root NULL
-static inline int snd_iprintf(struct snd_info_buffer * buffer, char *fmt,...) { return 0; }
+static inline int snd_iprintf(struct snd_info_buffer *buffer, char *fmt, ...) { return 0; }
 static inline int snd_info_init(void) { return 0; }
 static inline int snd_info_done(void) { return 0; }
-static inline int snd_info_get_line(struct snd_info_buffer * buffer, char *line, int len) { return 0; }
+static inline int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len) { return 0; }
 static inline char *snd_info_get_str(char *dest, char *src, int len) { return NULL; }
-static inline struct snd_info_entry *snd_info_create_module_entry(struct module * module, const char *name, struct snd_info_entry * parent) { return NULL; }
+static inline struct snd_info_entry *snd_info_create_module_entry(struct module *module, const char *name, struct snd_info_entry *parent) { return NULL; }
-static inline struct snd_info_entry *snd_info_create_card_entry(struct snd_card * card, const char *name, struct snd_info_entry * parent) { return NULL; }
+static inline struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card, const char *name, struct snd_info_entry *parent) { return NULL; }
-static inline void snd_info_free_entry(struct snd_info_entry * entry) { ; }
+static inline void snd_info_free_entry(struct snd_info_entry *entry) { ; }
-static inline int snd_info_card_create(struct snd_card * card) { return 0; }
+static inline int snd_info_card_create(struct snd_card *card) { return 0; }
-static inline int snd_info_card_register(struct snd_card * card) { return 0; }
+static inline int snd_info_card_register(struct snd_card *card) { return 0; }
-static inline int snd_info_card_free(struct snd_card * card) { return 0; }
+static inline int snd_info_card_free(struct snd_card *card) { return 0; }
-static inline void snd_info_card_disconnect(struct snd_card * card) { }
+static inline void snd_info_card_disconnect(struct snd_card *card) { }
-static inline int snd_info_register(struct snd_info_entry * entry) { return 0; }
+static inline void snd_info_card_id_change(struct snd_card *card) { }
+static inline int snd_info_register(struct snd_info_entry *entry) { return 0; }
 static inline int snd_card_proc_new(struct snd_card *card, const char *name,
                                    struct snd_info_entry **entryp) { return -EINVAL; }
diff --git a/include/sound/jack.h b/include/sound/jack.h
index b1b2b8b59adb..2e0315cdd0d6 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -35,6 +35,8 @@ enum snd_jack_types {
        SND_JACK_HEADPHONE      = 0x0001,
        SND_JACK_MICROPHONE     = 0x0002,
        SND_JACK_HEADSET        = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,
+        SND_JACK_LINEOUT        = 0x0004,
+        SND_JACK_MECHANICAL     = 0x0008, /* If detected separately */
 };
 struct snd_jack {
diff --git a/include/sound/l3.h b/include/sound/l3.h
new file mode 100644
index 000000000000..423a08f0f1b0
--- /dev/null
+++ b/include/sound/l3.h
@@ -0,0 +1,18 @@
+#ifndef _L3_H_
+#define _L3_H_ 1
+struct l3_pins {
+        void (*setdat)(int);
+        void (*setclk)(int);
+        void (*setmode)(int);
+        int data_hold;
+        int data_setup;
+        int clock_high;
+        int mode_hold;
+        int mode;
+        int mode_setup;
+};
+int l3_write(struct l3_pins *adap, u8 addr, u8 *data, int len);
+#endif
diff --git a/include/sound/s3c24xx_uda134x.h b/include/sound/s3c24xx_uda134x.h
new file mode 100644
index 000000000000..33df4cb909d3
--- /dev/null
+++ b/include/sound/s3c24xx_uda134x.h
@@ -0,0 +1,14 @@
+#ifndef _S3C24XX_UDA134X_H_
+#define _S3C24XX_UDA134X_H_ 1
+#include <sound/uda134x.h>
+struct s3c24xx_uda134x_platform_data {
+        int l3_clk;
+        int l3_mode;
+        int l3_data;
+        void (*power) (int);
+        int model;
+};
+#endif
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
new file mode 100644
index 000000000000..24247f763608
--- /dev/null
+++ b/include/sound/soc-dai.h
@@ -0,0 +1,231 @@
+/*
+ * linux/sound/soc-dai.h -- ALSA SoC Layer
+ *
+ * Copyright:   2005-2008 Wolfson Microelectronics. PLC.
+ *
+ * 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.
+ *
+ * Digital Audio Interface (DAI) API.
+ */
+#ifndef __LINUX_SND_SOC_DAI_H
+#define __LINUX_SND_SOC_DAI_H
+#include <linux/list.h>
+struct snd_pcm_substream;
+/*
+ * DAI hardware audio formats.
+ *
+ * Describes the physical PCM data formating and clocking. Add new formats
+ * to the end.
+ */
+#define SND_SOC_DAIFMT_I2S              0 /* I2S mode */
+#define SND_SOC_DAIFMT_RIGHT_J          1 /* Right Justified mode */
+#define SND_SOC_DAIFMT_LEFT_J           2 /* Left Justified mode */
+#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 */
+/* left and right justified also known as MSB and LSB respectively */
+#define SND_SOC_DAIFMT_MSB              SND_SOC_DAIFMT_LEFT_J
+#define SND_SOC_DAIFMT_LSB              SND_SOC_DAIFMT_RIGHT_J
+/*
+ * DAI Clock gating.
+ *
+ * DAI bit clocks can be be gated (disabled) when not the DAI is not
+ * sending or receiving PCM data in a frame. This can be used to save power.
+ */
+#define SND_SOC_DAIFMT_CONT             (0 << 4) /* continuous clock */
+#define SND_SOC_DAIFMT_GATED            (1 << 4) /* clock is gated */
+/*
+ * DAI Left/Right Clocks.
+ *
+ * Specifies whether the DAI can support different samples for similtanious
+ * playback and capture. This usually requires a seperate physical frame
+ * clock for playback and capture.
+ */
+#define SND_SOC_DAIFMT_SYNC             (0 << 5) /* Tx FRM = Rx FRM */
+#define SND_SOC_DAIFMT_ASYNC            (1 << 5) /* Tx FRM ~ Rx FRM */
+/*
+ * TDM
+ *
+ * Time Division Multiplexing. Allows PCM data to be multplexed with other
+ * data on the DAI.
+ */
+#define SND_SOC_DAIFMT_TDM              (1 << 6)
+/*
+ * DAI hardware signal inversions.
+ *
+ * Specifies whether the DAI can also support inverted clocks for the specified
+ * format.
+ */
+#define SND_SOC_DAIFMT_NB_NF            (0 << 8) /* normal bit clock + frame */
+#define SND_SOC_DAIFMT_NB_IF            (1 << 8) /* normal bclk + inv frm */
+#define SND_SOC_DAIFMT_IB_NF            (2 << 8) /* invert bclk + nor frm */
+#define SND_SOC_DAIFMT_IB_IF            (3 << 8) /* invert bclk + frm */
+/*
+ * DAI hardware clock masters.
+ *
+ * This is wrt the codec, the inverse is true for the interface
+ * i.e. if the codec is clk and frm master then the interface is
+ * clk and frame slave.
+ */
+#define SND_SOC_DAIFMT_CBM_CFM          (0 << 12) /* codec clk & frm master */
+#define SND_SOC_DAIFMT_CBS_CFM          (1 << 12) /* codec clk slave & frm master */
+#define SND_SOC_DAIFMT_CBM_CFS          (2 << 12) /* codec clk master & frame slave */
+#define SND_SOC_DAIFMT_CBS_CFS          (3 << 12) /* codec clk & frm slave */
+#define SND_SOC_DAIFMT_FORMAT_MASK      0x000f
+#define SND_SOC_DAIFMT_CLOCK_MASK       0x00f0
+#define SND_SOC_DAIFMT_INV_MASK         0x0f00
+#define SND_SOC_DAIFMT_MASTER_MASK      0xf000
+/*
+ * Master Clock Directions
+ */
+#define SND_SOC_CLOCK_IN                0
+#define SND_SOC_CLOCK_OUT               1
+struct snd_soc_dai_ops;
+struct snd_soc_dai;
+struct snd_ac97_bus_ops;
+/* Digital Audio Interface registration */
+int snd_soc_register_dai(struct snd_soc_dai *dai);
+void snd_soc_unregister_dai(struct snd_soc_dai *dai);
+int snd_soc_register_dais(struct snd_soc_dai *dai, size_t count);
+void snd_soc_unregister_dais(struct snd_soc_dai *dai, size_t count);
+/* Digital Audio Interface clocking API.*/
+int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,
+        unsigned int freq, int dir);
+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);
+/* Digital Audio interface formatting */
+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 mask, int slots);
+int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate);
+/* Digital Audio Interface mute */
+int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute);
+/*
+ * Digital Audio Interface.
+ *
+ * Describes the Digital Audio Interface in terms of it's ALSA, DAI and AC97
+ * operations an capabilities. Codec and platfom drivers will register a this
+ * structure for every DAI they have.
+ *
+ * This structure covers the clocking, formating and ALSA operations for each
+ * interface a
+ */
+struct snd_soc_dai_ops {
+        /*
+         * DAI clocking configuration, all optional.
+         * Called by soc_card drivers, normally in their hw_params.
+         */
+        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_clkdiv)(struct snd_soc_dai *dai, int div_id, int div);
+        /*
+         * DAI format configuration
+         * Called by soc_card drivers, normally in their hw_params.
+         */
+        int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt);
+        int (*set_tdm_slot)(struct snd_soc_dai *dai,
+                unsigned int mask, int slots);
+        int (*set_tristate)(struct snd_soc_dai *dai, int tristate);
+        /*
+         * DAI digital mute - optional.
+         * Called by soc-core to minimise any pops.
+         */
+        int (*digital_mute)(struct snd_soc_dai *dai, int mute);
+        /*
+         * ALSA PCM audio operations - all optional.
+         * Called by soc-core during audio PCM operations.
+         */
+        int (*startup)(struct snd_pcm_substream *,
+                struct snd_soc_dai *);
+        void (*shutdown)(struct snd_pcm_substream *,
+                struct snd_soc_dai *);
+        int (*hw_params)(struct snd_pcm_substream *,
+                struct snd_pcm_hw_params *, struct snd_soc_dai *);
+        int (*hw_free)(struct snd_pcm_substream *,
+                struct snd_soc_dai *);
+        int (*prepare)(struct snd_pcm_substream *,
+                struct snd_soc_dai *);
+        int (*trigger)(struct snd_pcm_substream *, int,
+                struct snd_soc_dai *);
+};
+/*
+ * Digital Audio Interface runtime data.
+ *
+ * Holds runtime data for a DAI.
+ */
+struct snd_soc_dai {
+        /* DAI description */
+        char *name;
+        unsigned int id;
+        int ac97_control;
+        struct device *dev;
+        /* DAI callbacks */
+        int (*probe)(struct platform_device *pdev,
+                     struct snd_soc_dai *dai);
+        void (*remove)(struct platform_device *pdev,
+                       struct snd_soc_dai *dai);
+        int (*suspend)(struct snd_soc_dai *dai);
+        int (*resume)(struct snd_soc_dai *dai);
+        /* ops */
+        struct snd_soc_dai_ops ops;
+        /* DAI capabilities */
+        struct snd_soc_pcm_stream capture;
+        struct snd_soc_pcm_stream playback;
+        /* DAI runtime info */
+        struct snd_pcm_runtime *runtime;
+        struct snd_soc_codec *codec;
+        unsigned int active;
+        unsigned char pop_wait:1;
+        void *dma_data;
+        /* DAI private data */
+        void *private_data;
+        /* parent codec/platform */
+        union {
+                struct snd_soc_codec *codec;
+                struct snd_soc_platform *platform;
+        };
+        struct list_head list;
+};
+#endif
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index ca699a3017f3..7ee2f70ca42e 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -221,8 +221,6 @@ int snd_soc_dapm_new_controls(struct snd_soc_codec *codec,
        int num);
 /* dapm path setup */
-int  __deprecated snd_soc_dapm_connect_input(struct snd_soc_codec *codec,
-        const char *sink_name, const char *control_name, const char *src_name);
 int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec);
 void snd_soc_dapm_free(struct snd_soc_device *socdev);
 int snd_soc_dapm_add_routes(struct snd_soc_codec *codec,
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 5e0189876afd..f86e455d3828 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -21,8 +21,6 @@
 #include <sound/control.h>
 #include <sound/ac97_codec.h>
-#define SND_SOC_VERSION "0.13.2"
 /*
 * Convenience kcontrol builders
 */
@@ -145,105 +143,31 @@ enum snd_soc_bias_level {
        SND_SOC_BIAS_OFF,
 };
-/*
- * Digital Audio Interface (DAI) types
- */
-#define SND_SOC_DAI_AC97        0x1
-#define SND_SOC_DAI_I2S         0x2
-#define SND_SOC_DAI_PCM         0x4
-#define SND_SOC_DAI_AC97_BUS    0x8     /* for custom i.e. non ac97_codec.c */
-/*
- * DAI hardware audio formats
- */
-#define SND_SOC_DAIFMT_I2S              0       /* I2S mode */
-#define SND_SOC_DAIFMT_RIGHT_J  1       /* Right justified mode */
-#define SND_SOC_DAIFMT_LEFT_J   2       /* Left Justified mode */
-#define SND_SOC_DAIFMT_DSP_A    3       /* L data msb after FRM or LRC */
-#define SND_SOC_DAIFMT_DSP_B    4       /* L data msb during FRM or LRC */
-#define SND_SOC_DAIFMT_AC97             5       /* AC97 */
-#define SND_SOC_DAIFMT_MSB      SND_SOC_DAIFMT_LEFT_J
-#define SND_SOC_DAIFMT_LSB      SND_SOC_DAIFMT_RIGHT_J
-/*
- * DAI Gating
- */
-#define SND_SOC_DAIFMT_CONT                     (0 << 4)        /* continuous clock */
-#define SND_SOC_DAIFMT_GATED            (1 << 4)        /* clock is gated when not Tx/Rx */
-/*
- * DAI Sync
- * Synchronous LR (Left Right) clocks and Frame signals.
- */
-#define SND_SOC_DAIFMT_SYNC             (0 << 5)        /* Tx FRM = Rx FRM */
-#define SND_SOC_DAIFMT_ASYNC            (1 << 5)        /* Tx FRM ~ Rx FRM */
-/*
- * TDM
- */
-#define SND_SOC_DAIFMT_TDM              (1 << 6)
-/*
- * DAI hardware signal inversions
- */
-#define SND_SOC_DAIFMT_NB_NF            (0 << 8)        /* normal bclk + frm */
-#define SND_SOC_DAIFMT_NB_IF            (1 << 8)        /* normal bclk + inv frm */
-#define SND_SOC_DAIFMT_IB_NF            (2 << 8)        /* invert bclk + nor frm */
-#define SND_SOC_DAIFMT_IB_IF            (3 << 8)        /* invert bclk + frm */
-/*
- * DAI hardware clock masters
- * This is wrt the codec, the inverse is true for the interface
- * i.e. if the codec is clk and frm master then the interface is
- * clk and frame slave.
- */
-#define SND_SOC_DAIFMT_CBM_CFM  (0 << 12) /* codec clk & frm master */
-#define SND_SOC_DAIFMT_CBS_CFM  (1 << 12) /* codec clk slave & frm master */
-#define SND_SOC_DAIFMT_CBM_CFS  (2 << 12) /* codec clk master & frame slave */
-#define SND_SOC_DAIFMT_CBS_CFS  (3 << 12) /* codec clk & frm slave */
-#define SND_SOC_DAIFMT_FORMAT_MASK              0x000f
-#define SND_SOC_DAIFMT_CLOCK_MASK               0x00f0
-#define SND_SOC_DAIFMT_INV_MASK                 0x0f00
-#define SND_SOC_DAIFMT_MASTER_MASK              0xf000
-/*
- * Master Clock Directions
- */
-#define SND_SOC_CLOCK_IN        0
-#define SND_SOC_CLOCK_OUT       1
-/*
- * AC97 codec ID's bitmask
- */
-#define SND_SOC_DAI_AC97_ID0    (1 << 0)
-#define SND_SOC_DAI_AC97_ID1    (1 << 1)
-#define SND_SOC_DAI_AC97_ID2    (1 << 2)
-#define SND_SOC_DAI_AC97_ID3    (1 << 3)
 struct snd_soc_device;
 struct snd_soc_pcm_stream;
 struct snd_soc_ops;
 struct snd_soc_dai_mode;
 struct snd_soc_pcm_runtime;
 struct snd_soc_dai;
+struct snd_soc_platform;
 struct snd_soc_codec;
-struct snd_soc_machine_config;
 struct soc_enum;
 struct snd_soc_ac97_ops;
-struct snd_soc_clock_info;
 typedef int (*hw_write_t)(void *,const char* ,int);
 typedef int (*hw_read_t)(void *,char* ,int);
 extern struct snd_ac97_bus_ops soc_ac97_ops;
+int snd_soc_register_platform(struct snd_soc_platform *platform);
+void snd_soc_unregister_platform(struct snd_soc_platform *platform);
+int snd_soc_register_codec(struct snd_soc_codec *codec);
+void snd_soc_unregister_codec(struct snd_soc_codec *codec);
 /* 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_register_card(struct snd_soc_device *socdev);
+int snd_soc_init_card(struct snd_soc_device *socdev);
 /* set runtime hw params */
 int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
@@ -263,27 +187,6 @@ int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,
        struct snd_ac97_bus_ops *ops, int num);
 void snd_soc_free_ac97_codec(struct snd_soc_codec *codec);
-/* Digital Audio Interface clocking API.*/
-int snd_soc_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id,
-        unsigned int freq, int dir);
-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);
-/* Digital Audio interface formatting */
-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 mask, int slots);
-int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate);
-/* Digital Audio Interface mute */
-int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute);
 /*
 *Controls
 */
@@ -341,66 +244,14 @@ struct snd_soc_ops {
        int (*trigger)(struct snd_pcm_substream *, int);
 };
-/* ASoC DAI ops */
-struct snd_soc_dai_ops {
-        /* DAI clocking configuration */
-        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_clkdiv)(struct snd_soc_dai *dai, int div_id, int div);
-        /* DAI format configuration */
-        int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt);
-        int (*set_tdm_slot)(struct snd_soc_dai *dai,
-                unsigned int mask, int slots);
-        int (*set_tristate)(struct snd_soc_dai *dai, int tristate);
-        /* digital mute */
-        int (*digital_mute)(struct snd_soc_dai *dai, int mute);
-};
-/* SoC  DAI (Digital Audio Interface) */
-struct snd_soc_dai {
-        /* DAI description */
-        char *name;
-        unsigned int id;
-        unsigned char type;
-        /* DAI callbacks */
-        int (*probe)(struct platform_device *pdev,
-                     struct snd_soc_dai *dai);
-        void (*remove)(struct platform_device *pdev,
-                       struct snd_soc_dai *dai);
-        int (*suspend)(struct platform_device *pdev,
-                struct snd_soc_dai *dai);
-        int (*resume)(struct platform_device *pdev,
-                struct snd_soc_dai *dai);
-        /* ops */
-        struct snd_soc_ops ops;
-        struct snd_soc_dai_ops dai_ops;
-        /* DAI capabilities */
-        struct snd_soc_pcm_stream capture;
-        struct snd_soc_pcm_stream playback;
-        /* DAI runtime info */
-        struct snd_pcm_runtime *runtime;
-        struct snd_soc_codec *codec;
-        unsigned int active;
-        unsigned char pop_wait:1;
-        void *dma_data;
-        /* DAI private data */
-        void *private_data;
-};
 /* SoC Audio Codec */
 struct snd_soc_codec {
        char *name;
        struct module *owner;
        struct mutex mutex;
+        struct device *dev;
+        struct list_head list;
        /* callbacks */
        int (*set_bias_level)(struct snd_soc_codec *,
@@ -426,6 +277,7 @@ struct snd_soc_codec {
        short reg_cache_step;
        /* dapm */
+        u32 pop_time;
        struct list_head dapm_widgets;
        struct list_head dapm_paths;
        enum snd_soc_bias_level bias_level;
@@ -435,6 +287,11 @@ struct snd_soc_codec {
        /* codec DAI's */
        struct snd_soc_dai *dai;
        unsigned int num_dai;
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_reg;
+        struct dentry *debugfs_pop_time;
+#endif
 };
 /* codec device */
@@ -448,13 +305,12 @@ struct snd_soc_codec_device {
 /* SoC platform interface */
 struct snd_soc_platform {
        char *name;
+        struct list_head list;
        int (*probe)(struct platform_device *pdev);
        int (*remove)(struct platform_device *pdev);
-        int (*suspend)(struct platform_device *pdev,
+        int (*suspend)(struct snd_soc_dai *dai);
-                struct snd_soc_dai *dai);
+        int (*resume)(struct snd_soc_dai *dai);
-        int (*resume)(struct platform_device *pdev,
-                struct snd_soc_dai *dai);
        /* pcm creation and destruction */
        int (*pcm_new)(struct snd_card *, struct snd_soc_dai *,
@@ -484,9 +340,14 @@ struct snd_soc_dai_link  {
        struct snd_pcm *pcm;
 };
-/* SoC machine */
+/* SoC card */
-struct snd_soc_machine {
+struct snd_soc_card {
        char *name;
+        struct device *dev;
+        struct list_head list;
+        int instantiated;
        int (*probe)(struct platform_device *pdev);
        int (*remove)(struct platform_device *pdev);
@@ -499,23 +360,26 @@ struct snd_soc_machine {
        int (*resume_post)(struct platform_device *pdev);
        /* callbacks */
-        int (*set_bias_level)(struct snd_soc_machine *,
+        int (*set_bias_level)(struct snd_soc_card *,
                              enum snd_soc_bias_level level);
        /* CPU <--> Codec DAI links  */
        struct snd_soc_dai_link *dai_link;
        int num_links;
+        struct snd_soc_device *socdev;
+        struct snd_soc_platform *platform;
+        struct delayed_work delayed_work;
+        struct work_struct deferred_resume_work;
 };
 /* SoC Device - the audio subsystem */
 struct snd_soc_device {
        struct device *dev;
-        struct snd_soc_machine *machine;
+        struct snd_soc_card *card;
-        struct snd_soc_platform *platform;
        struct snd_soc_codec *codec;
        struct snd_soc_codec_device *codec_dev;
-        struct delayed_work delayed_work;
-        struct work_struct deferred_resume_work;
        void *codec_data;
 };
@@ -542,4 +406,6 @@ struct soc_enum {
        void *dapm;
 };
+#include <sound/soc-dai.h>
 #endif
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
index b6870cbaf2b3..426899e529c5 100644
--- a/include/sound/tea575x-tuner.h
+++ b/include/sound/tea575x-tuner.h
@@ -36,7 +36,7 @@ struct snd_tea575x_ops {
 struct snd_tea575x {
        struct snd_card *card;
        struct video_device vd;         /* video device */
-        struct file_operations fops;
+        struct v4l2_file_operations fops;
        int dev_nr;                     /* requested device number + 1 */
        int vd_registered;              /* video device is registered */
        int tea5759;                    /* 5759 chip is present */
diff --git a/include/sound/uda134x.h b/include/sound/uda134x.h
new file mode 100644
index 000000000000..475ef8bb7dcd
--- /dev/null
+++ b/include/sound/uda134x.h
@@ -0,0 +1,26 @@
+/*
+ * uda134x.h  --  UDA134x ALSA SoC Codec driver
+ *
+ * Copyright 2007 Dension Audio Systems Ltd.
+ * Author: Zoltan Devai
+ *
+ * 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 _UDA134X_H
+#define _UDA134X_H
+#include <sound/l3.h>
+struct uda134x_platform_data {
+        struct l3_pins l3;
+        void (*power) (int);
+        int model;
+#define UDA134X_UDA1340 1
+#define UDA134X_UDA1341 2
+#define UDA134X_UDA1344 3
+};
+#endif /* _UDA134X_H */
diff --git a/include/sound/version.h b/include/sound/version.h
index 4aafeda88634..2b48237e23bf 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
 /* include/version.h */
-#define CONFIG_SND_VERSION "1.0.18rc3"
+#define CONFIG_SND_VERSION "1.0.18a"
 #define CONFIG_SND_DATE ""
diff --git a/include/trace/block.h b/include/trace/block.h
new file mode 100644
index 000000000000..25c6a1fd5b77
--- /dev/null
+++ b/include/trace/block.h
@@ -0,0 +1,76 @@
+#ifndef _TRACE_BLOCK_H
+#define _TRACE_BLOCK_H
+#include <linux/blkdev.h>
+#include <linux/tracepoint.h>
+DECLARE_TRACE(block_rq_abort,
+        TPPROTO(struct request_queue *q, struct request *rq),
+                TPARGS(q, rq));
+DECLARE_TRACE(block_rq_insert,
+        TPPROTO(struct request_queue *q, struct request *rq),
+                TPARGS(q, rq));
+DECLARE_TRACE(block_rq_issue,
+        TPPROTO(struct request_queue *q, struct request *rq),
+                TPARGS(q, rq));
+DECLARE_TRACE(block_rq_requeue,
+        TPPROTO(struct request_queue *q, struct request *rq),
+                TPARGS(q, rq));
+DECLARE_TRACE(block_rq_complete,
+        TPPROTO(struct request_queue *q, struct request *rq),
+                TPARGS(q, rq));
+DECLARE_TRACE(block_bio_bounce,
+        TPPROTO(struct request_queue *q, struct bio *bio),
+                TPARGS(q, bio));
+DECLARE_TRACE(block_bio_complete,
+        TPPROTO(struct request_queue *q, struct bio *bio),
+                TPARGS(q, bio));
+DECLARE_TRACE(block_bio_backmerge,
+        TPPROTO(struct request_queue *q, struct bio *bio),
+                TPARGS(q, bio));
+DECLARE_TRACE(block_bio_frontmerge,
+        TPPROTO(struct request_queue *q, struct bio *bio),
+                TPARGS(q, bio));
+DECLARE_TRACE(block_bio_queue,
+        TPPROTO(struct request_queue *q, struct bio *bio),
+                TPARGS(q, bio));
+DECLARE_TRACE(block_getrq,
+        TPPROTO(struct request_queue *q, struct bio *bio, int rw),
+                TPARGS(q, bio, rw));
+DECLARE_TRACE(block_sleeprq,
+        TPPROTO(struct request_queue *q, struct bio *bio, int rw),
+                TPARGS(q, bio, rw));
+DECLARE_TRACE(block_plug,
+        TPPROTO(struct request_queue *q),
+                TPARGS(q));
+DECLARE_TRACE(block_unplug_timer,
+        TPPROTO(struct request_queue *q),
+                TPARGS(q));
+DECLARE_TRACE(block_unplug_io,
+        TPPROTO(struct request_queue *q),
+                TPARGS(q));
+DECLARE_TRACE(block_split,
+        TPPROTO(struct request_queue *q, struct bio *bio, unsigned int pdu),
+                TPARGS(q, bio, pdu));
+DECLARE_TRACE(block_remap,
+        TPPROTO(struct request_queue *q, struct bio *bio, dev_t dev,
+                sector_t from, sector_t to),
+                TPARGS(q, bio, dev, from, to));
+#endif
diff --git a/include/trace/boot.h b/include/trace/boot.h
new file mode 100644
index 000000000000..088ea089e31d
--- /dev/null
+++ b/include/trace/boot.h
@@ -0,0 +1,60 @@
+#ifndef _LINUX_TRACE_BOOT_H
+#define _LINUX_TRACE_BOOT_H
+#include <linux/module.h>
+#include <linux/kallsyms.h>
+#include <linux/init.h>
+/*
+ * Structure which defines the trace of an initcall
+ * while it is called.
+ * You don't have to fill the func field since it is
+ * only used internally by the tracer.
+ */
+struct boot_trace_call {
+        pid_t                   caller;
+        char                    func[KSYM_SYMBOL_LEN];
+};
+/*
+ * Structure which defines the trace of an initcall
+ * while it returns.
+ */
+struct boot_trace_ret {
+        char                    func[KSYM_SYMBOL_LEN];
+        int                             result;
+        unsigned long long      duration;               /* nsecs */
+};
+#ifdef CONFIG_BOOT_TRACER
+/* Append the traces on the ring-buffer */
+extern void trace_boot_call(struct boot_trace_call *bt, initcall_t fn);
+extern void trace_boot_ret(struct boot_trace_ret *bt, initcall_t fn);
+/* Tells the tracer that smp_pre_initcall is finished.
+ * So we can start the tracing
+ */
+extern void start_boot_trace(void);
+/* Resume the tracing of other necessary events
+ * such as sched switches
+ */
+extern void enable_boot_trace(void);
+/* Suspend this tracing. Actually, only sched_switches tracing have
+ * to be suspended. Initcalls doesn't need it.)
+ */
+extern void disable_boot_trace(void);
+#else
+static inline
+void trace_boot_call(struct boot_trace_call *bt, initcall_t fn) { }
+static inline
+void trace_boot_ret(struct boot_trace_ret *bt, initcall_t fn) { }
+static inline void start_boot_trace(void) { }
+static inline void enable_boot_trace(void) { }
+static inline void disable_boot_trace(void) { }
+#endif /* CONFIG_BOOT_TRACER */
+#endif /* __LINUX_TRACE_BOOT_H */
diff --git a/include/trace/sched.h b/include/trace/sched.h
index ad47369d01b5..0d81098ee9fc 100644
--- a/include/trace/sched.h
+++ b/include/trace/sched.h
@@ -4,52 +4,52 @@
 #include <linux/sched.h>
 #include <linux/tracepoint.h>
-DEFINE_TRACE(sched_kthread_stop,
+DECLARE_TRACE(sched_kthread_stop,
        TPPROTO(struct task_struct *t),
                TPARGS(t));
-DEFINE_TRACE(sched_kthread_stop_ret,
+DECLARE_TRACE(sched_kthread_stop_ret,
        TPPROTO(int ret),
                TPARGS(ret));
-DEFINE_TRACE(sched_wait_task,
+DECLARE_TRACE(sched_wait_task,
        TPPROTO(struct rq *rq, struct task_struct *p),
                TPARGS(rq, p));
-DEFINE_TRACE(sched_wakeup,
+DECLARE_TRACE(sched_wakeup,
-        TPPROTO(struct rq *rq, struct task_struct *p),
+        TPPROTO(struct rq *rq, struct task_struct *p, int success),
-                TPARGS(rq, p));
+                TPARGS(rq, p, success));
-DEFINE_TRACE(sched_wakeup_new,
+DECLARE_TRACE(sched_wakeup_new,
-        TPPROTO(struct rq *rq, struct task_struct *p),
+        TPPROTO(struct rq *rq, struct task_struct *p, int success),
-                TPARGS(rq, p));
+                TPARGS(rq, p, success));
-DEFINE_TRACE(sched_switch,
+DECLARE_TRACE(sched_switch,
        TPPROTO(struct rq *rq, struct task_struct *prev,
                struct task_struct *next),
                TPARGS(rq, prev, next));
-DEFINE_TRACE(sched_migrate_task,
+DECLARE_TRACE(sched_migrate_task,
-        TPPROTO(struct rq *rq, struct task_struct *p, int dest_cpu),
+        TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
-                TPARGS(rq, p, dest_cpu));
+                TPARGS(p, orig_cpu, dest_cpu));
-DEFINE_TRACE(sched_process_free,
+DECLARE_TRACE(sched_process_free,
        TPPROTO(struct task_struct *p),
                TPARGS(p));
-DEFINE_TRACE(sched_process_exit,
+DECLARE_TRACE(sched_process_exit,
        TPPROTO(struct task_struct *p),
                TPARGS(p));
-DEFINE_TRACE(sched_process_wait,
+DECLARE_TRACE(sched_process_wait,
        TPPROTO(struct pid *pid),
                TPARGS(pid));
-DEFINE_TRACE(sched_process_fork,
+DECLARE_TRACE(sched_process_fork,
        TPPROTO(struct task_struct *parent, struct task_struct *child),
                TPARGS(parent, child));
-DEFINE_TRACE(sched_signal_send,
+DECLARE_TRACE(sched_signal_send,
        TPPROTO(int sig, struct task_struct *p),
                TPARGS(sig, p));
diff --git a/include/video/radeon.h b/include/video/radeon.h
index d5dcaf154ba4..1cd09cc5b169 100644
--- a/include/video/radeon.h
+++ b/include/video/radeon.h
@@ -525,9 +525,6 @@
 #define CRTC_DISPLAY_DIS                           (1 << 10)
 #define CRTC_CRT_ON                                (1 << 15)
-/* DSTCACHE_MODE bits constants */
-#define RB2D_DC_AUTOFLUSH_ENABLE                   (1 << 8)
-#define RB2D_DC_DC_DISABLE_IGNORE_PE               (1 << 17)
 /* DSTCACHE_CTLSTAT bit constants */
 #define RB2D_DC_FLUSH_2D                           (1 << 0)
@@ -869,10 +866,15 @@
 #define GMC_DST_16BPP_YVYU422                      0x00000c00
 #define GMC_DST_32BPP_AYUV444                      0x00000e00
 #define GMC_DST_16BPP_ARGB4444                     0x00000f00
+#define GMC_SRC_MONO                               0x00000000
+#define GMC_SRC_MONO_LBKGD                         0x00001000
+#define GMC_SRC_DSTCOLOR                           0x00003000
 #define GMC_BYTE_ORDER_MSB_TO_LSB                  0x00000000
 #define GMC_BYTE_ORDER_LSB_TO_MSB                  0x00004000
 #define GMC_DP_CONVERSION_TEMP_9300                0x00008000
 #define GMC_DP_CONVERSION_TEMP_6500                0x00000000
+#define GMC_DP_SRC_RECT                            0x02000000
+#define GMC_DP_SRC_HOST                            0x03000000
 #define GMC_DP_SRC_HOST_BYTEALIGN                  0x04000000
 #define GMC_3D_FCN_EN_CLR                          0x00000000
 #define GMC_3D_FCN_EN_SET                          0x08000000
@@ -883,9 +885,6 @@
 #define GMC_WRITE_MASK_LEAVE                       0x00000000
 #define GMC_WRITE_MASK_SET                         0x40000000
 #define GMC_CLR_CMP_CNTL_DIS                       (1 << 28)
-#define GMC_SRC_DATATYPE_MASK                      (3 << 12)
-#define GMC_SRC_DATATYPE_MONO_FG_BG                (0 << 12)
-#define GMC_SRC_DATATYPE_MONO_FG_LA                (1 << 12)
 #define GMC_SRC_DATATYPE_COLOR                     (3 << 12)
 #define ROP3_S                                     0x00cc0000
 #define ROP3_SRCCOPY                               0x00cc0000
@@ -894,7 +893,6 @@
 #define DP_SRC_SOURCE_MASK                         (7    << 24)
 #define GMC_BRUSH_NONE                             (15   <<  4)
 #define DP_SRC_SOURCE_MEMORY                       (2    << 24)
-#define DP_SRC_SOURCE_HOST_DATA                    (3    << 24)
 #define GMC_BRUSH_SOLIDCOLOR                       0x000000d0
 /* DP_MIX bit constants */
@@ -980,12 +978,6 @@
 #define DISP_PWR_MAN_TV_ENABLE_RST                 (1 << 25)
 #define DISP_PWR_MAN_AUTO_PWRUP_EN                 (1 << 26)
-/* RBBM_GUICNTL constants */
-#define RBBM_GUICNTL_HOST_DATA_SWAP_NONE           (0 << 0)
-#define RBBM_GUICNTL_HOST_DATA_SWAP_16BIT          (1 << 0)
-#define RBBM_GUICNTL_HOST_DATA_SWAP_32BIT          (2 << 0)
-#define RBBM_GUICNTL_HOST_DATA_SWAP_HDW            (3 << 0)
 /* masks */
 #define CONFIG_MEMSIZE_MASK             0x1f000000
diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h
index 1a4bc6ada606..25144ab22b95 100644
--- a/include/video/sh_mobile_lcdc.h
+++ b/include/video/sh_mobile_lcdc.h
@@ -37,6 +37,7 @@ enum { LCDC_CLK_BUS, LCDC_CLK_PERIPHERAL, LCDC_CLK_EXTERNAL };
 struct sh_mobile_lcdc_sys_bus_cfg {
        unsigned long ldmt2r;
        unsigned long ldmt3r;
+        unsigned long deferred_io_msec;
 };
 struct sh_mobile_lcdc_sys_bus_ops {
diff --git a/include/xen/interface/event_channel.h b/include/xen/interface/event_channel.h
index 919b5bdcb2bd..2090881c3650 100644
--- a/include/xen/interface/event_channel.h
+++ b/include/xen/interface/event_channel.h
@@ -9,6 +9,8 @@
 #ifndef __XEN_PUBLIC_EVENT_CHANNEL_H__
 #define __XEN_PUBLIC_EVENT_CHANNEL_H__
+#include <xen/interface/xen.h>
 typedef uint32_t evtchn_port_t;
 DEFINE_GUEST_HANDLE(evtchn_port_t);
author	David Woodhouse <David.Woodhouse@intel.com>	2009-01-05 04:50:33 -0500
committer	David Woodhouse <David.Woodhouse@intel.com>	2009-01-05 04:50:33 -0500
commit	353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch)
tree	517290fd884d286fe2971137ac89f89e3567785a /include
parent	160bbab3000dafccbe43688e48208cecf4deb879 (diff)
parent	fe0bdec68b77020281dc814805edfe594ae89e0f (diff)