286 files changed, 5706 insertions, 2697 deletions

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index a1155a2beb3..862e483cce8 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -60,10 +60,7 @@ header-y += fadvise.h
 header-y += fd.h
 header-y += fdreg.h
 header-y += fib_rules.h
-header-y += ftape-header-segment.h
-header-y += ftape-vendors.h
 header-y += fuse.h
-header-y += futex.h
 header-y += genetlink.h
 header-y += gen_stats.h
 header-y += gigaset_dev.h
@@ -122,7 +119,6 @@ header-y += nfs4_mount.h
 header-y += nfs_mount.h
 header-y += oom.h
 header-y += param.h
-header-y += pci_ids.h
 header-y += pci_regs.h
 header-y += personality.h
 header-y += pfkeyv2.h
@@ -141,7 +137,6 @@ header-y += radeonfb.h
 header-y += raw.h
 header-y += resource.h
 header-y += rose.h
-header-y += sctp.h
 header-y += smbno.h
 header-y += snmp.h
 header-y += sockios.h
@@ -165,7 +160,6 @@ header-y += vt.h
 header-y += wireless.h
 header-y += xattr.h
 header-y += x25.h
-header-y += zorro_ids.h
 
 unifdef-y += acct.h
 unifdef-y += adb.h
@@ -193,7 +187,6 @@ unifdef-y += cuda.h
 unifdef-y += cyclades.h
 unifdef-y += dccp.h
 unifdef-y += dirent.h
-unifdef-y += divert.h
 unifdef-y += dlm.h
 unifdef-y += elfcore.h
 unifdef-y += errno.h
@@ -206,8 +199,8 @@ unifdef-y += fb.h
 unifdef-y += fcntl.h
 unifdef-y += filter.h
 unifdef-y += flat.h
+unifdef-y += futex.h
 unifdef-y += fs.h
-unifdef-y += ftape.h
 unifdef-y += gameport.h
 unifdef-y += generic_serial.h
 unifdef-y += genhd.h
@@ -225,6 +218,7 @@ unifdef-y += if_bridge.h
 unifdef-y += if_ec.h
 unifdef-y += if_eql.h
 unifdef-y += if_ether.h
+unifdef-y += if_fddi.h
 unifdef-y += if_frad.h
 unifdef-y += if_ltalk.h
 unifdef-y += if_pppox.h
@@ -286,6 +280,7 @@ unifdef-y += nvram.h
 unifdef-y += parport.h
 unifdef-y += patchkey.h
 unifdef-y += pci.h
+unifdef-y += personality.h
 unifdef-y += pktcdvd.h
 unifdef-y += pmu.h
 unifdef-y += poll.h
@@ -341,7 +336,7 @@ unifdef-y += videodev.h
 unifdef-y += wait.h
 unifdef-y += wanrouter.h
 unifdef-y += watchdog.h
+unifdef-y += wireless.h
 unifdef-y += xfrm.h
-unifdef-y += zftape.h
 
 objhdr-y += version.h
diff --git a/include/linux/acct.h b/include/linux/acct.h
index 0496d1f0995..302eb727ecb 100644
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
@@ -119,6 +119,7 @@ struct acct_v3
 #ifdef CONFIG_BSD_PROCESS_ACCT
 struct vfsmount;
 struct super_block;
+struct pacct_struct;
 extern void acct_auto_close_mnt(struct vfsmount *m);
 extern void acct_auto_close(struct super_block *sb);
 extern void acct_init_pacct(struct pacct_struct *pacct);
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 2b0c955590f..91f1f236387 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -47,6 +47,7 @@ enum acpi_irq_model_id {
         ACPI_IRQ_MODEL_PIC = 0,
         ACPI_IRQ_MODEL_IOAPIC,
         ACPI_IRQ_MODEL_IOSAPIC,
+        ACPI_IRQ_MODEL_PLATFORM,
         ACPI_IRQ_MODEL_COUNT
 };
 
diff --git a/include/linux/aio.h b/include/linux/aio.h
index 0d71c0041f1..a30ef13c9e6 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -105,13 +105,13 @@ struct kiocb {
         wait_queue_t            ki_wait;
         loff_t                  ki_pos;
 
+        atomic_t                ki_bio_count;   /* num bio used for this iocb */
         void                    *private;
         /* State that we remember to be able to restart/retry  */
         unsigned short          ki_opcode;
         size_t                  ki_nbytes;      /* copy of iocb->aio_nbytes */
         char                    __user *ki_buf; /* remaining iocb->aio_buf */
         size_t                  ki_left;        /* remaining bytes */
-        long                    ki_retried;     /* just for testing */
         struct iovec            ki_inline_vec;  /* inline vector */
         struct iovec            *ki_iovec;
         unsigned long           ki_nr_segs;
@@ -194,7 +194,7 @@ struct kioctx {
 
         struct aio_ring_info    ring_info;
 
-        struct work_struct      wq;
+        struct delayed_work     wq;
 };
 
 /* prototypes */
@@ -238,7 +238,6 @@ do {									\
 } while (0)
 
 #define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait)
-#define is_retried_kiocb(iocb) ((iocb)->ki_retried > 1)
 
 #include <linux/aio_abi.h>
 
diff --git a/include/linux/ata.h b/include/linux/ata.h
index d8944190702..1df941648a5 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -200,8 +200,9 @@ enum {
         ATA_CBL_NONE            = 0,
         ATA_CBL_PATA40          = 1,
         ATA_CBL_PATA80          = 2,
-        ATA_CBL_PATA_UNK        = 3,
-        ATA_CBL_SATA            = 4,
+        ATA_CBL_PATA40_SHORT    = 3,            /* 40 wire cable to high UDMA spec */
+        ATA_CBL_PATA_UNK        = 4,
+        ATA_CBL_SATA            = 5,
 
         /* SATA Status and Control Registers */
         SCR_STATUS              = 0,
@@ -342,6 +343,15 @@ static inline int ata_id_is_cfa(const u16 *id)
         return 0;
 }
 
+static inline int ata_drive_40wire(const u16 *dev_id)
+{
+        if (ata_id_major_version(dev_id) >= 5 && ata_id_is_sata(dev_id))
+                return 0;       /* SATA */
+        if (dev_id[93] & 0x4000)
+                return 0;       /* 80 wire */
+        return 1;
+}
+
 static inline int atapi_cdb_len(const u16 *dev_id)
 {
         u16 tmp = dev_id[0] & 0x3;
diff --git a/include/linux/atmarp.h b/include/linux/atmarp.h
index 24f82338f59..ee108f9e9cb 100644
--- a/include/linux/atmarp.h
+++ b/include/linux/atmarp.h
@@ -37,7 +37,7 @@ enum atmarp_ctrl_type {
 struct atmarp_ctrl {
         enum atmarp_ctrl_type   type;   /* message type */
         int                     itf_num;/* interface number (if present) */
-        uint32_t                ip;     /* IP address (act_need only) */
+        __be32                  ip;     /* IP address (act_need only) */
 };
 
 #endif
diff --git a/include/linux/atmbr2684.h b/include/linux/atmbr2684.h
index 7981b733f1e..969fb6c9e1c 100644
--- a/include/linux/atmbr2684.h
+++ b/include/linux/atmbr2684.h
@@ -86,8 +86,8 @@ struct atm_backend_br2684 {
  * efficient per-if in/out filters, this support will be removed
  */
 struct br2684_filter {
-        __u32   prefix;         /* network byte order */
-        __u32   netmask;        /* 0 = disable filter */
+        __be32  prefix;         /* network byte order */
+        __be32  netmask;        /* 0 = disable filter */
 };
 
 struct br2684_filter_set {
diff --git a/include/linux/atmmpc.h b/include/linux/atmmpc.h
index 5fbfa68136d..ea1650425a1 100644
--- a/include/linux/atmmpc.h
+++ b/include/linux/atmmpc.h
@@ -13,7 +13,7 @@
 
 struct atmmpc_ioc {
         int dev_num;
-        uint32_t ipaddr;              /* the IP address of the shortcut    */
+        __be32 ipaddr;              /* the IP address of the shortcut    */
         int type;                     /* ingress or egress                 */
 };
 
@@ -21,8 +21,8 @@ typedef struct in_ctrl_info {
         uint8_t   Last_NHRP_CIE_code;
         uint8_t   Last_Q2931_cause_value;     
         uint8_t   eg_MPC_ATM_addr[ATM_ESA_LEN];
-        uint32_t  tag;
-        uint32_t  in_dst_ip;      /* IP address this ingress MPC sends packets to */
+        __be32  tag;
+        __be32  in_dst_ip;      /* IP address this ingress MPC sends packets to */
         uint16_t  holding_time;
         uint32_t  request_id;
 } in_ctrl_info;
@@ -30,10 +30,10 @@ typedef struct in_ctrl_info {
 typedef struct eg_ctrl_info {
         uint8_t   DLL_header[256];
         uint8_t   DH_length;
-        uint32_t  cache_id;
-        uint32_t  tag;
-        uint32_t  mps_ip;
-        uint32_t  eg_dst_ip;      /* IP address to which ingress MPC sends packets */
+        __be32  cache_id;
+        __be32  tag;
+        __be32  mps_ip;
+        __be32  eg_dst_ip;      /* IP address to which ingress MPC sends packets */
         uint8_t   in_MPC_data_ATM_addr[ATM_ESA_LEN];
         uint16_t  holding_time;
 } eg_ctrl_info;
@@ -49,7 +49,7 @@ struct mpc_parameters {
 
 struct k_message {
         uint16_t type;
-        uint32_t ip_mask;
+        __be32 ip_mask;
         uint8_t  MPS_ctrl[ATM_ESA_LEN];
         union {
                 in_ctrl_info in_info;
diff --git a/include/linux/audit.h b/include/linux/audit.h
index b2ca666d999..0e07db6cc0d 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -101,6 +101,10 @@
 #define AUDIT_MAC_CIPSOV4_DEL   1408    /* NetLabel: del CIPSOv4 DOI entry */
 #define AUDIT_MAC_MAP_ADD       1409    /* NetLabel: add LSM domain mapping */
 #define AUDIT_MAC_MAP_DEL       1410    /* NetLabel: del LSM domain mapping */
+#define AUDIT_MAC_IPSEC_ADDSA   1411    /* Add a XFRM state */
+#define AUDIT_MAC_IPSEC_DELSA   1412    /* Delete a XFRM state */
+#define AUDIT_MAC_IPSEC_ADDSPD  1413    /* Add a XFRM policy */
+#define AUDIT_MAC_IPSEC_DELSPD  1414    /* Delete a XFRM policy */
 
 #define AUDIT_FIRST_KERN_ANOM_MSG   1700
 #define AUDIT_LAST_KERN_ANOM_MSG    1799
@@ -377,6 +381,7 @@ extern void auditsc_get_stamp(struct audit_context *ctx,
                               struct timespec *t, unsigned int *serial);
 extern int  audit_set_loginuid(struct task_struct *task, uid_t loginuid);
 extern uid_t audit_get_loginuid(struct audit_context *ctx);
+extern void audit_log_task_context(struct audit_buffer *ab);
 extern int __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 int audit_bprm(struct linux_binprm *bprm);
@@ -449,6 +454,7 @@ extern int audit_n_rules;
 #define audit_inode_update(i) do { ; } while (0)
 #define auditsc_get_stamp(c,t,s) do { BUG(); } while (0)
 #define audit_get_loginuid(c) ({ -1; })
+#define audit_log_task_context(b) do { ; } while (0)
 #define audit_ipc_obj(i) ({ 0; })
 #define audit_ipc_set_perm(q,u,g,m) ({ 0; })
 #define audit_bprm(p) ({ 0; })
diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index 75e91f5b6a0..a5cf1beacb4 100644
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -54,7 +54,7 @@ struct backlight_device {
 };
 
 extern struct backlight_device *backlight_device_register(const char *name,
-        void *devdata, struct backlight_properties *bp);
+        struct device *dev,void *devdata,struct backlight_properties *bp);
 extern void backlight_device_unregister(struct backlight_device *bd);
 
 #define to_backlight_device(obj) container_of(obj, struct backlight_device, class_dev)
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 092dbd0e765..08daf3272c0 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -309,6 +309,7 @@ extern struct bio *bio_map_kern(struct request_queue *, void *, unsigned int,
                                 gfp_t);
 extern void bio_set_pages_dirty(struct bio *bio);
 extern void bio_check_pages_dirty(struct bio *bio);
+extern void bio_release_pages(struct bio *bio);
 extern struct bio *bio_copy_user(struct request_queue *, unsigned long, unsigned int, int);
 extern int bio_uncopy_user(struct bio *);
 void zero_fill_bio(struct bio *bio);
diff --git a/include/linux/bitrev.h b/include/linux/bitrev.h
new file mode 100644
index 00000000000..05e540d6963
--- /dev/null
+++ b/include/linux/bitrev.h
@@ -0,0 +1,15 @@
+#ifndef _LINUX_BITREV_H
+#define _LINUX_BITREV_H
+
+#include <linux/types.h>
+
+extern u8 const byte_rev_table[256];
+
+static inline u8 bitrev8(u8 byte)
+{
+        return byte_rev_table[byte];
+}
+
+extern u32 bitrev32(u32 in);
+
+#endif /* _LINUX_BITREV_H */
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 7bfcde2d557..36a6eacefe2 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -331,10 +331,6 @@ struct request_pm_state
 
 #include <linux/elevator.h>
 
-typedef int (merge_request_fn) (request_queue_t *, struct request *,
-                                struct bio *);
-typedef int (merge_requests_fn) (request_queue_t *, struct request *,
-                                 struct request *);
 typedef void (request_fn_proc) (request_queue_t *q);
 typedef int (make_request_fn) (request_queue_t *q, struct bio *bio);
 typedef int (prep_rq_fn) (request_queue_t *, struct request *);
@@ -342,7 +338,6 @@ typedef void (unplug_fn) (request_queue_t *);
 
 struct bio_vec;
 typedef int (merge_bvec_fn) (request_queue_t *, struct bio *, struct bio_vec *);
-typedef void (activity_fn) (void *data, int rw);
 typedef int (issue_flush_fn) (request_queue_t *, struct gendisk *, sector_t *);
 typedef void (prepare_flush_fn) (request_queue_t *, struct request *);
 typedef void (softirq_done_fn)(struct request *);
@@ -377,14 +372,10 @@ struct request_queue
         struct request_list     rq;
 
         request_fn_proc         *request_fn;
-        merge_request_fn        *back_merge_fn;
-        merge_request_fn        *front_merge_fn;
-        merge_requests_fn       *merge_requests_fn;
         make_request_fn         *make_request_fn;
         prep_rq_fn              *prep_rq_fn;
         unplug_fn               *unplug_fn;
         merge_bvec_fn           *merge_bvec_fn;
-        activity_fn             *activity_fn;
         issue_flush_fn          *issue_flush_fn;
         prepare_flush_fn        *prepare_flush_fn;
         softirq_done_fn         *softirq_done_fn;
@@ -411,8 +402,6 @@ struct request_queue
          */
         void                    *queuedata;
 
-        void                    *activity_data;
-
         /*
          * queue needs bounce pages for pages above this limit
          */
@@ -653,6 +642,11 @@ extern int sg_scsi_ioctl(struct file *, struct request_queue *,
                 struct gendisk *, struct scsi_ioctl_command __user *);
 
 /*
+ * Temporary export, until SCSI gets fixed up.
+ */
+extern int ll_back_merge_fn(request_queue_t *, struct request *, struct bio *);
+
+/*
  * A queue has just exitted congestion.  Note this in the global counter of
  * congested queues, and wake up anyone who was waiting for requests to be
  * put back.
@@ -677,11 +671,11 @@ extern void blk_sync_queue(struct request_queue *q);
 extern void __blk_stop_queue(request_queue_t *q);
 extern void blk_run_queue(request_queue_t *);
 extern void blk_start_queueing(request_queue_t *);
-extern void blk_queue_activity_fn(request_queue_t *, activity_fn *, void *);
-extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned int);
-extern int blk_rq_unmap_user(struct bio *, unsigned int);
+extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned long);
+extern int blk_rq_unmap_user(struct bio *);
 extern int blk_rq_map_kern(request_queue_t *, struct request *, void *, unsigned int, gfp_t);
-extern int blk_rq_map_user_iov(request_queue_t *, struct request *, struct sg_iovec *, int);
+extern int blk_rq_map_user_iov(request_queue_t *, struct request *,
+                               struct sg_iovec *, int, unsigned int);
 extern int blk_execute_rq(request_queue_t *, struct gendisk *,
                           struct request *, int);
 extern void blk_execute_rq_nowait(request_queue_t *, struct gendisk *,
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index b99a714fcac..3680ff9a30e 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -50,6 +50,15 @@ enum blktrace_act {
 };
 
 /*
+ * Notify events.
+ */
+enum blktrace_notify {
+        __BLK_TN_PROCESS = 0,           /* establish pid/name mapping */
+        __BLK_TN_TIMESTAMP,             /* include system clock */
+};
+
+
+/*
  * Trace actions in full. Additionally, read or write is masked
  */
 #define BLK_TA_QUEUE            (__BLK_TA_QUEUE | BLK_TC_ACT(BLK_TC_QUEUE))
@@ -68,6 +77,9 @@ enum blktrace_act {
 #define BLK_TA_BOUNCE           (__BLK_TA_BOUNCE)
 #define BLK_TA_REMAP            (__BLK_TA_REMAP | BLK_TC_ACT(BLK_TC_QUEUE))
 
+#define BLK_TN_PROCESS          (__BLK_TN_PROCESS | BLK_TC_ACT(BLK_TC_NOTIFY))
+#define BLK_TN_TIMESTAMP        (__BLK_TN_TIMESTAMP | BLK_TC_ACT(BLK_TC_NOTIFY))
+
 #define BLK_IO_TRACE_MAGIC      0x65617400
 #define BLK_IO_TRACE_VERSION    0x07
 
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index 31e9abb6d97..2275f274870 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -119,8 +119,7 @@ extern void *alloc_large_system_hash(const char *tablename,
                                      unsigned int *_hash_mask,
                                      unsigned long limit);
 
-#define HASH_HIGHMEM    0x00000001      /* Consider highmem? */
-#define HASH_EARLY      0x00000002      /* Allocating during early boot? */
+#define HASH_EARLY      0x00000001      /* Allocating during early boot? */
 
 /* Only NUMA needs hash distribution.
  * IA64 is known to have sufficient vmalloc space.
diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h
new file mode 100644
index 00000000000..777dbf695d4
--- /dev/null
+++ b/include/linux/bottom_half.h
@@ -0,0 +1,10 @@
+#ifndef _LINUX_BH_H
+#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);
+
+#endif /* _LINUX_BH_H */
diff --git a/include/linux/bug.h b/include/linux/bug.h
new file mode 100644
index 00000000000..42aa0a54b6f
--- /dev/null
+++ b/include/linux/bug.h
@@ -0,0 +1,47 @@
+#ifndef _LINUX_BUG_H
+#define _LINUX_BUG_H
+
+#include <linux/module.h>
+#include <asm/bug.h>
+
+enum bug_trap_type {
+        BUG_TRAP_TYPE_NONE = 0,
+        BUG_TRAP_TYPE_WARN = 1,
+        BUG_TRAP_TYPE_BUG = 2,
+};
+
+#ifdef CONFIG_GENERIC_BUG
+#include <asm-generic/bug.h>
+
+static inline int is_warning_bug(const struct bug_entry *bug)
+{
+        return bug->flags & BUGFLAG_WARNING;
+}
+
+const struct bug_entry *find_bug(unsigned long bugaddr);
+
+enum bug_trap_type report_bug(unsigned long bug_addr);
+
+int  module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,
+                         struct module *);
+void module_bug_cleanup(struct module *);
+
+/* These are defined by the architecture */
+int is_valid_bugaddr(unsigned long addr);
+
+#else   /* !CONFIG_GENERIC_BUG */
+
+static inline enum bug_trap_type report_bug(unsigned long bug_addr)
+{
+        return BUG_TRAP_TYPE_BUG;
+}
+static inline int  module_bug_finalize(const Elf_Ehdr *hdr,
+                                        const Elf_Shdr *sechdrs,
+                                        struct module *mod)
+{
+        return 0;
+}
+static inline void module_bug_cleanup(struct module *mod) {}
+
+#endif  /* CONFIG_GENERIC_BUG */
+#endif  /* _LINUX_BUG_H */
diff --git a/include/linux/carta_random32.h b/include/linux/carta_random32.h
deleted file mode 100644
index f6f3bd9f20b..00000000000
--- a/include/linux/carta_random32.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Fast, simple, yet decent quality random number generator based on
- * a paper by David G. Carta ("Two Fast Implementations of the
- * `Minimal Standard' Random Number Generator," Communications of the
- * ACM, January, 1990).
- *
- * Copyright (c) 2002-2006 Hewlett-Packard Development Company, L.P.
- *      Contributed by Stephane Eranian <eranian@hpl.hp.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- */
-#ifndef _LINUX_CARTA_RANDOM32_H_
-#define _LINUX_CARTA_RANDOM32_H_
-
-u64 carta_random32(u64 seed);
-
-#endif /* _LINUX_CARTA_RANDOM32_H_ */
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h
index 6e27f42e3a5..cb57c30081a 100644
--- a/include/linux/cciss_ioctl.h
+++ b/include/linux/cciss_ioctl.h
@@ -80,7 +80,7 @@ typedef __u32 DriverVer_type;
 #define HWORD __u16
 #define DWORD __u32
 
-#define CISS_MAX_LUN    16      
+#define CISS_MAX_LUN    1024
 
 #define LEVEL2LUN   1   // index into Target(x) structure, due to byte swapping
 #define LEVEL3LUN   0
diff --git a/include/linux/cdev.h b/include/linux/cdev.h
index ee5f53f2ca1..f309b00e986 100644
--- a/include/linux/cdev.h
+++ b/include/linux/cdev.h
@@ -2,6 +2,10 @@
 #define _LINUX_CDEV_H
 #ifdef __KERNEL__
 
+#include <linux/kobject.h>
+#include <linux/kdev_t.h>
+#include <linux/list.h>
+
 struct cdev {
         struct kobject kobj;
         struct module *owner;
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index d852024ed09..1622d23a8dc 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -159,7 +159,7 @@ static inline s64 cyc2ns(struct clocksource *cs, cycle_t cycles)
  * Unless you're the timekeeping code, you should not be using this!
  */
 static inline void clocksource_calculate_interval(struct clocksource *c,
-                                                unsigned long length_nsec)
+                                                  unsigned long length_nsec)
 {
         u64 tmp;
 
diff --git a/include/linux/coda_linux.h b/include/linux/coda_linux.h
index be512cc9879..4c2632a8d31 100644
--- a/include/linux/coda_linux.h
+++ b/include/linux/coda_linux.h
@@ -64,7 +64,7 @@ void coda_sysctl_clean(void);
 
 #define CODA_ALLOC(ptr, cast, size) do { \
     if (size < PAGE_SIZE) \
-        ptr = (cast)kmalloc((unsigned long) size, GFP_KERNEL); \
+        ptr = kmalloc((unsigned long) size, GFP_KERNEL); \
     else \
         ptr = (cast)vmalloc((unsigned long) size); \
     if (!ptr) \
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 538423d4a86..aca66984aaf 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -40,7 +40,7 @@ extern void __chk_io_ptr(void __iomem *);
 #error no compiler-gcc.h file for this gcc version
 #elif __GNUC__ == 4
 # include <linux/compiler-gcc4.h>
-#elif __GNUC__ == 3
+#elif __GNUC__ == 3 && __GNUC_MINOR__ >= 2
 # include <linux/compiler-gcc3.h>
 #else
 # error Sorry, your compiler is too old/not recognized.
diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index a7f01502753..fef6f3d0a4a 100644
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -160,31 +160,6 @@ struct configfs_group_operations {
         void (*drop_item)(struct config_group *group, struct config_item *item);
 };
 
-
-
-/**
- * Use these macros to make defining attributes easier. See include/linux/device.h
- * for examples..
- */
-
-#if 0
-#define __ATTR(_name,_mode,_show,_store) { \
-        .attr = {.ca_name = __stringify(_name), .ca_mode = _mode, .ca_owner = THIS_MODULE },    \
-        .show   = _show,                                        \
-        .store  = _store,                                       \
-}
-
-#define __ATTR_RO(_name) { \
-        .attr   = { .ca_name = __stringify(_name), .ca_mode = 0444, .ca_owner = THIS_MODULE },  \
-        .show   = _name##_show, \
-}
-
-#define __ATTR_NULL { .attr = { .name = NULL } }
-
-#define attr_name(_attr) (_attr).attr.name
-#endif
-
-
 struct configfs_subsystem {
         struct config_group     su_group;
         struct semaphore        su_sem;
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 4c02119c6ab..10eb56b2940 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -170,7 +170,7 @@ void cn_queue_free_dev(struct cn_queue_dev *dev);
 
 int cn_cb_equal(struct cb_id *, struct cb_id *);
 
-void cn_queue_wrapper(void *data);
+void cn_queue_wrapper(struct work_struct *work);
 
 extern int cn_already_initialized;
 
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 3fef7d67aed..bfb520212d7 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -24,15 +24,24 @@
 #include <linux/compiler.h>
 #include <linux/cpumask.h>
 #include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 struct cpu {
         int node_id;            /* The node which contains the CPU */
-        int no_control;         /* Should the sysfs control file be created? */
+        int hotpluggable;       /* creates sysfs control file if hotpluggable */
         struct sys_device sysdev;
 };
 
 extern int register_cpu(struct cpu *cpu, int num);
 extern struct sys_device *get_cpu_sysdev(unsigned cpu);
+
+extern int cpu_add_sysdev_attr(struct sysdev_attribute *attr);
+extern void cpu_remove_sysdev_attr(struct sysdev_attribute *attr);
+
+extern int cpu_add_sysdev_attr_group(struct attribute_group *attrs);
+extern void cpu_remove_sysdev_attr_group(struct attribute_group *attrs);
+
+
 #ifdef CONFIG_HOTPLUG_CPU
 extern void unregister_cpu(struct cpu *cpu);
 #endif
@@ -66,6 +75,17 @@ extern struct sysdev_class cpu_sysdev_class;
 
 #ifdef CONFIG_HOTPLUG_CPU
 /* Stop CPUs going up and down. */
+
+static inline void cpuhotplug_mutex_lock(struct mutex *cpu_hp_mutex)
+{
+        mutex_lock(cpu_hp_mutex);
+}
+
+static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex)
+{
+        mutex_unlock(cpu_hp_mutex);
+}
+
 extern void lock_cpu_hotplug(void);
 extern void unlock_cpu_hotplug(void);
 #define hotcpu_notifier(fn, pri) {                              \
@@ -77,17 +97,24 @@ extern void unlock_cpu_hotplug(void);
 #define unregister_hotcpu_notifier(nb)  unregister_cpu_notifier(nb)
 int cpu_down(unsigned int cpu);
 #define cpu_is_offline(cpu) unlikely(!cpu_online(cpu))
-#else
+
+#else           /* CONFIG_HOTPLUG_CPU */
+
+static inline void cpuhotplug_mutex_lock(struct mutex *cpu_hp_mutex)
+{ }
+static inline void cpuhotplug_mutex_unlock(struct mutex *cpu_hp_mutex)
+{ }
+
 #define lock_cpu_hotplug()      do { } while (0)
 #define unlock_cpu_hotplug()    do { } while (0)
 #define lock_cpu_hotplug_interruptible() 0
-#define hotcpu_notifier(fn, pri)        do { } while (0)
-#define register_hotcpu_notifier(nb)    do { } while (0)
-#define unregister_hotcpu_notifier(nb)  do { } while (0)
+#define hotcpu_notifier(fn, pri)        do { (void)(fn); } while (0)
+#define register_hotcpu_notifier(nb)    do { (void)(nb); } while (0)
+#define unregister_hotcpu_notifier(nb)  do { (void)(nb); } while (0)
 
 /* CPUs don't go offline once they're online w/o CONFIG_HOTPLUG_CPU */
 static inline int cpu_is_offline(int cpu) { return 0; }
-#endif
+#endif          /* CONFIG_HOTPLUG_CPU */
 
 #ifdef CONFIG_SUSPEND_SMP
 extern int disable_nonboot_cpus(void);
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 4ea39fee99c..7f008f6bfdc 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -172,6 +172,8 @@ extern int __cpufreq_driver_target(struct cpufreq_policy *policy,
                                    unsigned int relation);
 
 
+extern int cpufreq_driver_getavg(struct cpufreq_policy *policy);
+
 int cpufreq_register_governor(struct cpufreq_governor *governor);
 void cpufreq_unregister_governor(struct cpufreq_governor *governor);
 
@@ -204,6 +206,7 @@ struct cpufreq_driver {
         unsigned int    (*get)  (unsigned int cpu);
 
         /* optional */
+        unsigned int (*getavg)  (unsigned int cpu);
         int     (*exit)         (struct cpufreq_policy *policy);
         int     (*suspend)      (struct cpufreq_policy *policy, pm_message_t pmsg);
         int     (*resume)       (struct cpufreq_policy *policy);
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index 4d8adf66368..fd404416f31 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -23,16 +23,26 @@ extern void cpuset_fork(struct task_struct *p);
 extern void cpuset_exit(struct task_struct *p);
 extern cpumask_t cpuset_cpus_allowed(struct task_struct *p);
 extern nodemask_t cpuset_mems_allowed(struct task_struct *p);
+#define cpuset_current_mems_allowed (current->mems_allowed)
 void cpuset_init_current_mems_allowed(void);
 void cpuset_update_task_memory_state(void);
 #define cpuset_nodes_subset_current_mems_allowed(nodes) \
                 nodes_subset((nodes), current->mems_allowed)
 int cpuset_zonelist_valid_mems_allowed(struct zonelist *zl);
 
-extern int __cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask);
-static int inline cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
+extern int __cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask);
+extern int __cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask);
+
+static int inline cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
+{
+        return number_of_cpusets <= 1 ||
+                __cpuset_zone_allowed_softwall(z, gfp_mask);
+}
+
+static int inline cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
 {
-        return number_of_cpusets <= 1 || __cpuset_zone_allowed(z, gfp_mask);
+        return number_of_cpusets <= 1 ||
+                __cpuset_zone_allowed_hardwall(z, gfp_mask);
 }
 
 extern int cpuset_excl_nodes_overlap(const struct task_struct *p);
@@ -83,6 +93,7 @@ static inline nodemask_t cpuset_mems_allowed(struct task_struct *p)
         return node_possible_map;
 }
 
+#define cpuset_current_mems_allowed (node_online_map)
 static inline void cpuset_init_current_mems_allowed(void) {}
 static inline void cpuset_update_task_memory_state(void) {}
 #define cpuset_nodes_subset_current_mems_allowed(nodes) (1)
@@ -92,7 +103,12 @@ static inline int cpuset_zonelist_valid_mems_allowed(struct zonelist *zl)
         return 1;
 }
 
-static inline int cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask)
+static inline int cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
+{
+        return 1;
+}
+
+static inline int cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
 {
         return 1;
 }
diff --git a/include/linux/crc32.h b/include/linux/crc32.h
index 56c0645789a..e20dd1f9b40 100644
--- a/include/linux/crc32.h
+++ b/include/linux/crc32.h
@@ -6,10 +6,10 @@
 #define _LINUX_CRC32_H
 
 #include <linux/types.h>
+#include <linux/bitrev.h>
 
 extern u32  crc32_le(u32 crc, unsigned char const *p, size_t len);
 extern u32  crc32_be(u32 crc, unsigned char const *p, size_t len);
-extern u32  bitreverse(u32 in);
 
 #define crc32(seed, data, length)  crc32_le(seed, (unsigned char const *)data, length)
 
@@ -21,7 +21,7 @@ extern u32  bitreverse(u32 in);
  * is in bit nr 0], thus it must be reversed before use. Except for
  * nics that bit swap the result internally...
  */
-#define ether_crc(length, data)    bitreverse(crc32_le(~0, data, length))
+#define ether_crc(length, data)    bitrev32(crc32_le(~0, data, length))
 #define ether_crc_le(length, data) crc32_le(~0, data, length)
 
 #endif /* _LINUX_CRC32_H */
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 6485e9716b3..4aa9046601d 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -241,12 +241,8 @@ int crypto_unregister_alg(struct crypto_alg *alg);
  * Algorithm query interface.
  */
 #ifdef CONFIG_CRYPTO
-int crypto_alg_available(const char *name, u32 flags)
-        __deprecated_for_modules;
 int crypto_has_alg(const char *name, u32 type, u32 mask);
 #else
-static int crypto_alg_available(const char *name, u32 flags)
-        __deprecated_for_modules;
 static inline int crypto_alg_available(const char *name, u32 flags)
 {
         return 0;
@@ -707,16 +703,6 @@ static inline void crypto_cipher_decrypt_one(struct crypto_cipher *tfm,
                                                 dst, src);
 }
 
-void crypto_digest_init(struct crypto_tfm *tfm) __deprecated_for_modules;
-void crypto_digest_update(struct crypto_tfm *tfm,
-                          struct scatterlist *sg, unsigned int nsg)
-        __deprecated_for_modules;
-void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
-        __deprecated_for_modules;
-void crypto_digest_digest(struct crypto_tfm *tfm,
-                          struct scatterlist *sg, unsigned int nsg, u8 *out)
-        __deprecated_for_modules;
-
 static inline struct crypto_hash *__crypto_hash_cast(struct crypto_tfm *tfm)
 {
         return (struct crypto_hash *)tfm;
@@ -729,14 +715,6 @@ static inline struct crypto_hash *crypto_hash_cast(struct crypto_tfm *tfm)
         return __crypto_hash_cast(tfm);
 }
 
-static int crypto_digest_setkey(struct crypto_tfm *tfm, const u8 *key,
-                                unsigned int keylen) __deprecated;
-static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
-                                       const u8 *key, unsigned int keylen)
-{
-        return tfm->crt_hash.setkey(crypto_hash_cast(tfm), key, keylen);
-}
-
 static inline struct crypto_hash *crypto_alloc_hash(const char *alg_name,
                                                     u32 type, u32 mask)
 {
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 53553c99cad..1cb054bd93f 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -30,7 +30,7 @@ struct dccp_hdr {
 #else
 #error  "Adjust your <asm/byteorder.h> defines"
 #endif
-        __u16   dccph_checksum;
+        __sum16 dccph_checksum;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
         __u8    dccph_x:1,
                 dccph_type:4,
@@ -175,14 +175,18 @@ enum {
         DCCPC_CCID3 = 3,
 };
 
-/* DCCP features */
+/* DCCP features (RFC 4340 section 6.4) */
 enum {
         DCCPF_RESERVED = 0,
         DCCPF_CCID = 1,
+        DCCPF_SHORT_SEQNOS = 2,         /* XXX: not yet implemented */
         DCCPF_SEQUENCE_WINDOW = 3,
+        DCCPF_ECN_INCAPABLE = 4,        /* XXX: not yet implemented */
         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 */
         /* 10-127 reserved */
         DCCPF_MIN_CCID_SPECIFIC = 128,
         DCCPF_MAX_CCID_SPECIFIC = 255,
@@ -196,13 +200,16 @@ struct dccp_so_feat {
 };
 
 /* DCCP socket options */
-#define DCCP_SOCKOPT_PACKET_SIZE        1
+#define DCCP_SOCKOPT_PACKET_SIZE        1 /* XXX deprecated, without effect */
 #define DCCP_SOCKOPT_SERVICE            2
 #define DCCP_SOCKOPT_CHANGE_L           3
 #define DCCP_SOCKOPT_CHANGE_R           4
+#define DCCP_SOCKOPT_SEND_CSCOV         10
+#define DCCP_SOCKOPT_RECV_CSCOV         11
 #define DCCP_SOCKOPT_CCID_RX_INFO       128
 #define DCCP_SOCKOPT_CCID_TX_INFO       192
 
+/* maximum number of services provided on the same listening port */
 #define DCCP_SERVICE_LIST_MAX_LEN      32
 
 #ifdef __KERNEL__
@@ -256,6 +263,13 @@ static inline struct dccp_hdr *dccp_hdr(const struct sk_buff *skb)
         return (struct dccp_hdr *)skb->h.raw;
 }
 
+static inline struct dccp_hdr *dccp_zeroed_hdr(struct sk_buff *skb, int headlen)
+{
+        skb->h.raw = skb_push(skb, headlen);
+        memset(skb->h.raw, 0, headlen);
+        return dccp_hdr(skb);
+}
+
 static inline struct dccp_hdr_ext *dccp_hdrx(const struct sk_buff *skb)
 {
         return (struct dccp_hdr_ext *)(skb->h.raw + sizeof(struct dccp_hdr));
@@ -342,6 +356,9 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb)
   * @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;
@@ -410,7 +427,7 @@ struct dccp_service_list {
 };
 
 #define DCCP_SERVICE_INVALID_VALUE htonl((__u32)-1)
-#define DCCP_SERVICE_CODE_IS_ABSENT              0
+#define DCCP_SERVICE_CODE_IS_ABSENT             0
 
 static inline int dccp_list_has_service(const struct dccp_service_list *sl,
                                         const __be32 service)
@@ -419,7 +436,7 @@ static inline int dccp_list_has_service(const struct dccp_service_list *sl,
                 u32 i = sl->dccpsl_nr;
                 while (i--)
                         if (sl->dccpsl_list[i] == service)
-                                return 1; 
+                                return 1;
         }
         return 0;
 }
@@ -439,12 +456,25 @@ struct dccp_ackvec;
  * @dccps_gss - greatest sequence number sent
  * @dccps_gsr - greatest valid sequence number received
  * @dccps_gar - greatest valid ack number received on a non-Sync; initialized to %dccps_iss
+ * @dccps_service - first (passive sock) or unique (active sock) service code
+ * @dccps_service_list - second .. last service code on passive socket
  * @dccps_timestamp_time - time of latest TIMESTAMP option
  * @dccps_timestamp_echo - latest timestamp received on a TIMESTAMP option
- * @dccps_packet_size - Set thru setsockopt
- * @dccps_role - Role of this sock, one of %dccp_role
+ * @dccps_l_ack_ratio -
+ * @dccps_r_ack_ratio -
+ * @dccps_pcslen - sender   partial checksum coverage (via sockopt)
+ * @dccps_pcrlen - receiver partial checksum coverage (via sockopt)
  * @dccps_ndp_count - number of Non Data Packets since last data packet
+ * @dccps_mss_cache -
+ * @dccps_minisock -
  * @dccps_hc_rx_ackvec - rx half connection ack vector
+ * @dccps_hc_rx_ccid -
+ * @dccps_hc_tx_ccid -
+ * @dccps_options_received -
+ * @dccps_epoch -
+ * @dccps_role - Role of this sock, one of %dccp_role
+ * @dccps_hc_rx_insert_options -
+ * @dccps_hc_tx_insert_options -
  * @dccps_xmit_timer - timer for when CCID is not ready to send
  */
 struct dccp_sock {
@@ -464,9 +494,10 @@ struct dccp_sock {
         struct dccp_service_list        *dccps_service_list;
         struct timeval                  dccps_timestamp_time;
         __u32                           dccps_timestamp_echo;
-        __u32                           dccps_packet_size;
         __u16                           dccps_l_ack_ratio;
         __u16                           dccps_r_ack_ratio;
+        __u16                           dccps_pcslen;
+        __u16                           dccps_pcrlen;
         unsigned long                   dccps_ndp_count;
         __u32                           dccps_mss_cache;
         struct dccp_minisock            dccps_minisock;
@@ -480,7 +511,7 @@ struct dccp_sock {
         __u8                            dccps_hc_tx_insert_options:1;
         struct timer_list               dccps_xmit_timer;
 };
- 
+
 static inline struct dccp_sock *dccp_sk(const struct sock *sk)
 {
         return (struct dccp_sock *)sk;
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 952bee79a8f..1678a5de701 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -24,7 +24,7 @@ extern int debug_locks_off(void);
         int __ret = 0;                                                  \
                                                                         \
         if (unlikely(c)) {                                              \
-                if (debug_locks_off())                                  \
+                if (debug_locks_off() && !debug_locks_silent)           \
                         WARN_ON(1);                                     \
                 __ret = 1;                                              \
         }                                                               \
diff --git a/include/linux/delayacct.h b/include/linux/delayacct.h
index 561e2a77805..55d1ca5e60f 100644
--- a/include/linux/delayacct.h
+++ b/include/linux/delayacct.h
@@ -30,7 +30,7 @@
 #ifdef CONFIG_TASK_DELAY_ACCT
 
 extern int delayacct_on;        /* Delay accounting turned on/off */
-extern kmem_cache_t *delayacct_cache;
+extern struct kmem_cache *delayacct_cache;
 extern void delayacct_init(void);
 extern void __delayacct_tsk_init(struct task_struct *);
 extern void __delayacct_tsk_exit(struct task_struct *);
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 03ef41c1eaa..499f5373e21 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -39,7 +39,8 @@ typedef void (*dm_dtr_fn) (struct dm_target *ti);
  * The map function must return:
  * < 0: error
  * = 0: The target will handle the io by resubmitting it later
- * > 0: simple remap complete
+ * = 1: simple remap complete
+ * = 2: The target wants to push back the io
  */
 typedef int (*dm_map_fn) (struct dm_target *ti, struct bio *bio,
                           union map_info *map_context);
@@ -50,6 +51,7 @@ typedef int (*dm_map_fn) (struct dm_target *ti, struct bio *bio,
  * 0   : ended successfully
  * 1   : for some reason the io has still not completed (eg,
  *       multipath target might want to requeue a failed io).
+ * 2   : The target wants to push back the io
  */
 typedef int (*dm_endio_fn) (struct dm_target *ti,
                             struct bio *bio, int error,
@@ -173,7 +175,7 @@ void *dm_get_mdptr(struct mapped_device *md);
 /*
  * A device can still be used while suspended, but I/O is deferred.
  */
-int dm_suspend(struct mapped_device *md, int with_lockfs);
+int dm_suspend(struct mapped_device *md, unsigned suspend_flags);
 int dm_resume(struct mapped_device *md);
 
 /*
@@ -188,6 +190,7 @@ int dm_wait_event(struct mapped_device *md, int event_nr);
 const char *dm_device_name(struct mapped_device *md);
 struct gendisk *dm_disk(struct mapped_device *md);
 int dm_suspended(struct mapped_device *md);
+int dm_noflush_suspending(struct dm_target *ti);
 
 /*
  * Geometry functions.
diff --git a/include/linux/device.h b/include/linux/device.h
index 9d4f6a96393..f44247fe813 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -21,6 +21,7 @@
 #include <linux/pm.h>
 #include <asm/semaphore.h>
 #include <asm/atomic.h>
+#include <asm/device.h>
 
 #define DEVICE_NAME_SIZE        50
 #define DEVICE_NAME_HALF        __stringify(20) /* Less than half to accommodate slop */
@@ -42,6 +43,8 @@ struct bus_type {
         struct klist            klist_devices;
         struct klist            klist_drivers;
 
+        struct blocking_notifier_head bus_notifier;
+
         struct bus_attribute    * bus_attrs;
         struct device_attribute * dev_attrs;
         struct driver_attribute * drv_attrs;
@@ -75,6 +78,29 @@ int __must_check bus_for_each_drv(struct bus_type *bus,
                 struct device_driver *start, void *data,
                 int (*fn)(struct device_driver *, void *));
 
+/*
+ * Bus notifiers: Get notified of addition/removal of devices
+ * and binding/unbinding of drivers to devices.
+ * In the long run, it should be a replacement for the platform
+ * notify hooks.
+ */
+struct notifier_block;
+
+extern int bus_register_notifier(struct bus_type *bus,
+                                 struct notifier_block *nb);
+extern int bus_unregister_notifier(struct bus_type *bus,
+                                   struct notifier_block *nb);
+
+/* All 4 notifers below get called with the target struct device *
+ * as an argument. Note that those functions are likely to be called
+ * with the device semaphore held in the core, so be careful.
+ */
+#define BUS_NOTIFY_ADD_DEVICE           0x00000001 /* device added */
+#define BUS_NOTIFY_DEL_DEVICE           0x00000002 /* device removed */
+#define BUS_NOTIFY_BOUND_DRIVER         0x00000003 /* driver bound to device */
+#define BUS_NOTIFY_UNBIND_DRIVER        0x00000004 /* driver about to be
+                                                      unbound */
+
 /* driverfs interface for exporting bus attributes */
 
 struct bus_attribute {
@@ -343,10 +369,11 @@ struct device {
         void            *driver_data;   /* data private to the driver */
         void            *platform_data; /* Platform specific data, device
                                            core doesn't touch it */
-        void            *firmware_data; /* Firmware specific data (e.g. ACPI,
-                                           BIOS data),reserved for device core*/
         struct dev_pm_info      power;
 
+#ifdef CONFIG_NUMA
+        int             numa_node;      /* NUMA node this device is close to */
+#endif
         u64             *dma_mask;      /* dma mask (if dma'able device) */
         u64             coherent_dma_mask;/* Like dma_mask, but for
                                              alloc_coherent mappings as
@@ -358,6 +385,8 @@ struct device {
 
         struct dma_coherent_mem *dma_mem; /* internal for coherent mem
                                              override */
+        /* arch specific additions */
+        struct dev_archdata     archdata;
 
         /* class_device migration path */
         struct list_head        node;
@@ -368,6 +397,25 @@ struct device {
         void    (*release)(struct device * dev);
 };
 
+#ifdef CONFIG_NUMA
+static inline int dev_to_node(struct device *dev)
+{
+        return dev->numa_node;
+}
+static inline void set_dev_node(struct device *dev, int node)
+{
+        dev->numa_node = node;
+}
+#else
+static inline int dev_to_node(struct device *dev)
+{
+        return -1;
+}
+static inline void set_dev_node(struct device *dev, int node)
+{
+}
+#endif
+
 static inline void *
 dev_get_drvdata (struct device *dev)
 {
@@ -385,6 +433,8 @@ static inline int device_is_registered(struct device *dev)
         return dev->is_registered;
 }
 
+void driver_init(void);
+
 /*
  * High level routines for use by the bus drivers
  */
@@ -395,7 +445,10 @@ extern int __must_check device_add(struct device * dev);
 extern void device_del(struct device * dev);
 extern int device_for_each_child(struct device *, void *,
                      int (*fn)(struct device *, void *));
+extern struct device *device_find_child(struct device *, void *data,
+                                        int (*match)(struct device *, void *));
 extern int device_rename(struct device *dev, char *new_name);
+extern int device_move(struct device *dev, struct device *new_parent);
 
 /*
  * Manual binding of a device to driver. See drivers/base/bus.c
@@ -415,8 +468,6 @@ extern struct device *device_create(struct class *cls, struct device *parent,
                                     __attribute__((format(printf,4,5)));
 extern void device_destroy(struct class *cls, dev_t devt);
 
-extern int virtual_device_parent(struct device *dev);
-
 /*
  * Platform "fixup" functions - allow the platform to have their say
  * about devices and actions that the general device layer doesn't
diff --git a/include/linux/divert.h b/include/linux/divert.h
deleted file mode 100644
index 8fb4e9de684..00000000000
--- a/include/linux/divert.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Frame Diversion, Benoit Locher <Benoit.Locher@skf.com>
- *
- * Changes:
- *              06/09/2000      BL:     initial version
- * 
- */
- 
-#ifndef _LINUX_DIVERT_H
-#define _LINUX_DIVERT_H
-
-#include <asm/types.h>
-
-#define MAX_DIVERT_PORTS        8       /* Max number of ports to divert (tcp, udp) */
-
-/* Divertable protocols */
-#define DIVERT_PROTO_NONE       0x0000
-#define DIVERT_PROTO_IP         0x0001
-#define DIVERT_PROTO_ICMP       0x0002
-#define DIVERT_PROTO_TCP        0x0004
-#define DIVERT_PROTO_UDP        0x0008
-
-/*
- *      This is an Ethernet Frame Diverter option block
- */
-struct divert_blk
-{
-        int             divert;  /* are we active */
-        unsigned int protos;    /* protocols */
-        __u16           tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
-        __u16           tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
-        __u16           udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
-        __u16           udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
-};
-
-/*
- * Diversion control block, for configuration with the userspace tool
- * divert
- */
-
-typedef union _divert_cf_arg
-{
-        __s16           int16;
-        __u16           uint16;
-        __s32           int32;
-        __u32           uint32;
-        __s64           int64;
-        __u64           uint64;
-        void    __user *ptr;
-} divert_cf_arg;
-
-
-struct divert_cf
-{
-        int     cmd;                            /* Command */
-        divert_cf_arg   arg1,
-                                        arg2,
-                                        arg3;
-        int     dev_index;      /* device index (eth0=0, etc...) */
-};
-
-
-/* Diversion commands */
-#define DIVCMD_DIVERT                   1 /* ENABLE/DISABLE diversion */
-#define DIVCMD_IP                               2 /* ENABLE/DISABLE whold IP diversion */
-#define DIVCMD_TCP                              3 /* ENABLE/DISABLE whold TCP diversion */
-#define DIVCMD_TCPDST                   4 /* ADD/REMOVE TCP DST port for diversion */
-#define DIVCMD_TCPSRC                   5 /* ADD/REMOVE TCP SRC port for diversion */
-#define DIVCMD_UDP                              6 /* ENABLE/DISABLE whole UDP diversion */
-#define DIVCMD_UDPDST                   7 /* ADD/REMOVE UDP DST port for diversion */
-#define DIVCMD_UDPSRC                   8 /* ADD/REMOVE UDP SRC port for diversion */
-#define DIVCMD_ICMP                             9 /* ENABLE/DISABLE whole ICMP diversion */
-#define DIVCMD_GETSTATUS                10 /* GET the status of the diverter */
-#define DIVCMD_RESET                    11 /* Reset the diverter on the specified dev */
-#define DIVCMD_GETVERSION               12 /* Retrieve the diverter code version (char[32]) */
-
-/* General syntax of the commands:
- * 
- * DIVCMD_xxxxxx(arg1, arg2, arg3, dev_index)
- * 
- * SIOCSIFDIVERT:
- *   DIVCMD_DIVERT(DIVARG1_ENABLE|DIVARG1_DISABLE, , ,ifindex)
- *   DIVCMD_IP(DIVARG1_ENABLE|DIVARG1_DISABLE, , , ifindex)
- *   DIVCMD_TCP(DIVARG1_ENABLE|DIVARG1_DISABLE, , , ifindex)
- *   DIVCMD_TCPDST(DIVARG1_ADD|DIVARG1_REMOVE, port, , ifindex)
- *   DIVCMD_TCPSRC(DIVARG1_ADD|DIVARG1_REMOVE, port, , ifindex)
- *   DIVCMD_UDP(DIVARG1_ENABLE|DIVARG1_DISABLE, , , ifindex)
- *   DIVCMD_UDPDST(DIVARG1_ADD|DIVARG1_REMOVE, port, , ifindex)
- *   DIVCMD_UDPSRC(DIVARG1_ADD|DIVARG1_REMOVE, port, , ifindex)
- *   DIVCMD_ICMP(DIVARG1_ENABLE|DIVARG1_DISABLE, , , ifindex)
- *   DIVCMD_RESET(, , , ifindex)
- *   
- * SIOGIFDIVERT:
- *   DIVCMD_GETSTATUS(divert_blk, , , ifindex)
- *   DIVCMD_GETVERSION(string[3])
- */
-
-
-/* Possible values for arg1 */
-#define DIVARG1_ENABLE                  0 /* ENABLE something */
-#define DIVARG1_DISABLE                 1 /* DISABLE something */
-#define DIVARG1_ADD                             2 /* ADD something */
-#define DIVARG1_REMOVE                  3 /* REMOVE something */
-
-
-#ifdef __KERNEL__
-
-/* diverter functions */
-#include <linux/skbuff.h>
-
-#ifdef CONFIG_NET_DIVERT
-#include <linux/netdevice.h>
-
-int alloc_divert_blk(struct net_device *);
-void free_divert_blk(struct net_device *);
-int divert_ioctl(unsigned int cmd, struct divert_cf __user *arg);
-void divert_frame(struct sk_buff *skb);
-static inline void handle_diverter(struct sk_buff *skb)
-{
-        /* if diversion is supported on device, then divert */
-        if (skb->dev->divert && skb->dev->divert->divert)
-                divert_frame(skb);
-}
-
-#else
-# define alloc_divert_blk(dev)          (0)
-# define free_divert_blk(dev)           do {} while (0)
-# define divert_ioctl(cmd, arg)         (-ENOPKG)
-# define handle_diverter(skb)           do {} while (0)
-#endif
-#endif 
-#endif  /* _LINUX_DIVERT_H */
diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h
index 8853fc4d1c5..b9348610782 100644
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.h
@@ -285,9 +285,9 @@ typedef char ioctl_struct[308];
 #define DM_DEV_SET_GEOMETRY     _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
 
 #define DM_VERSION_MAJOR        4
-#define DM_VERSION_MINOR        10
+#define DM_VERSION_MINOR        11
 #define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2006-09-14)"
+#define DM_VERSION_EXTRA        "-ioctl (2006-10-12)"
 
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */
@@ -323,4 +323,9 @@ typedef char ioctl_struct[308];
  */
 #define DM_SKIP_LOCKFS_FLAG     (1 << 10) /* In */
 
+/*
+ * Set this to suspend without flushing queued ios.
+ */
+#define DM_NOFLUSH_FLAG         (1 << 11) /* In */
+
 #endif                          /* _LINUX_DM_IOCTL_H */
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 66d621dbcb6..df1c91855f0 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -300,8 +300,9 @@ extern int efi_mem_attribute_range (unsigned long phys_addr, unsigned long size,
 extern int __init efi_uart_console_only (void);
 extern void efi_initialize_iomem_resources(struct resource *code_resource,
                                         struct resource *data_resource);
-extern unsigned long __init efi_get_time(void);
+extern unsigned long efi_get_time(void);
 extern int __init efi_set_rtc_mmss(unsigned long nowtime);
+extern int is_available_memory(efi_memory_desc_t * md);
 extern struct efi_memory_map memmap;
 
 /**
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 2fa9f114422..e88fcbc77f8 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -12,6 +12,8 @@ typedef void (elevator_merge_req_fn) (request_queue_t *, struct request *, struc
 
 typedef void (elevator_merged_fn) (request_queue_t *, struct request *, int);
 
+typedef int (elevator_allow_merge_fn) (request_queue_t *, struct request *, struct bio *);
+
 typedef int (elevator_dispatch_fn) (request_queue_t *, int);
 
 typedef void (elevator_add_req_fn) (request_queue_t *, struct request *);
@@ -21,11 +23,11 @@ typedef void (elevator_completed_req_fn) (request_queue_t *, struct request *);
 typedef int (elevator_may_queue_fn) (request_queue_t *, int);
 
 typedef int (elevator_set_req_fn) (request_queue_t *, struct request *, gfp_t);
-typedef void (elevator_put_req_fn) (request_queue_t *, struct request *);
+typedef void (elevator_put_req_fn) (struct request *);
 typedef void (elevator_activate_req_fn) (request_queue_t *, struct request *);
 typedef void (elevator_deactivate_req_fn) (request_queue_t *, struct request *);
 
-typedef void *(elevator_init_fn) (request_queue_t *, elevator_t *);
+typedef void *(elevator_init_fn) (request_queue_t *);
 typedef void (elevator_exit_fn) (elevator_t *);
 
 struct elevator_ops
@@ -33,6 +35,7 @@ struct elevator_ops
         elevator_merge_fn *elevator_merge_fn;
         elevator_merged_fn *elevator_merged_fn;
         elevator_merge_req_fn *elevator_merge_req_fn;
+        elevator_allow_merge_fn *elevator_allow_merge_fn;
 
         elevator_dispatch_fn *elevator_dispatch_fn;
         elevator_add_req_fn *elevator_add_req_fn;
diff --git a/include/linux/elf.h b/include/linux/elf.h
index b70d1d2c8d2..60713e6ea29 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -6,6 +6,8 @@
 #include <linux/elf-em.h>
 #include <asm/elf.h>
 
+struct file;
+
 #ifndef elf_read_implies_exec
   /* Executables for which elf_read_implies_exec() returns TRUE will
      have the READ_IMPLIES_EXEC personality flag set automatically.
@@ -358,6 +360,7 @@ extern Elf32_Dyn _DYNAMIC [];
 #define elfhdr          elf32_hdr
 #define elf_phdr        elf32_phdr
 #define elf_note        elf32_note
+#define elf_addr_t      Elf32_Off
 
 #else
 
@@ -365,8 +368,16 @@ extern Elf64_Dyn _DYNAMIC [];
 #define elfhdr          elf64_hdr
 #define elf_phdr        elf64_phdr
 #define elf_note        elf64_note
+#define elf_addr_t      Elf64_Off
 
 #endif
 
+#ifndef ARCH_HAVE_EXTRA_ELF_NOTES
+static inline int arch_notes_size(void) { return 0; }
+static inline void arch_write_notes(struct file *file) { }
+
+#define ELF_CORE_EXTRA_NOTES_SIZE arch_notes_size()
+#define ELF_CORE_WRITE_EXTRA_NOTES arch_write_notes(file)
+#endif /* ARCH_HAVE_EXTRA_ELF_NOTES */
 
 #endif /* _LINUX_ELF_H */
diff --git a/include/linux/ext3_jbd.h b/include/linux/ext3_jbd.h
index ce0e6109aff..8c43b13a02f 100644
--- a/include/linux/ext3_jbd.h
+++ b/include/linux/ext3_jbd.h
@@ -109,74 +109,32 @@ int ext3_mark_inode_dirty(handle_t *handle, struct inode *inode);
  * been done yet.
  */
 
-void ext3_journal_abort_handle(const char *caller, const char *err_fn,
-                struct buffer_head *bh, handle_t *handle, int err);
-
-static inline int
-__ext3_journal_get_undo_access(const char *where, handle_t *handle,
-                                struct buffer_head *bh)
+static inline void ext3_journal_release_buffer(handle_t *handle,
+                                                struct buffer_head *bh)
 {
-        int err = journal_get_undo_access(handle, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
+        journal_release_buffer(handle, bh);
 }
 
-static inline int
-__ext3_journal_get_write_access(const char *where, handle_t *handle,
-                                struct buffer_head *bh)
-{
-        int err = journal_get_write_access(handle, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+void ext3_journal_abort_handle(const char *caller, const char *err_fn,
+                struct buffer_head *bh, handle_t *handle, int err);
 
-static inline void
-ext3_journal_release_buffer(handle_t *handle, struct buffer_head *bh)
-{
-        journal_release_buffer(handle, bh);
-}
+int __ext3_journal_get_undo_access(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext3_journal_forget(const char *where, handle_t *handle, struct buffer_head *bh)
-{
-        int err = journal_forget(handle, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext3_journal_get_write_access(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext3_journal_revoke(const char *where, handle_t *handle,
-                      unsigned long blocknr, struct buffer_head *bh)
-{
-        int err = journal_revoke(handle, blocknr, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext3_journal_forget(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext3_journal_get_create_access(const char *where,
-                                 handle_t *handle, struct buffer_head *bh)
-{
-        int err = journal_get_create_access(handle, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext3_journal_revoke(const char *where, handle_t *handle,
+                                unsigned long blocknr, struct buffer_head *bh);
 
-static inline int
-__ext3_journal_dirty_metadata(const char *where,
-                              handle_t *handle, struct buffer_head *bh)
-{
-        int err = journal_dirty_metadata(handle, bh);
-        if (err)
-                ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext3_journal_get_create_access(const char *where,
+                                handle_t *handle, struct buffer_head *bh);
 
+int __ext3_journal_dirty_metadata(const char *where,
+                                handle_t *handle, struct buffer_head *bh);
 
 #define ext3_journal_get_undo_access(handle, bh) \
         __ext3_journal_get_undo_access(__FUNCTION__, (handle), (bh))
diff --git a/include/linux/ext4_jbd2.h b/include/linux/ext4_jbd2.h
index 72dd631912e..d716e6392cf 100644
--- a/include/linux/ext4_jbd2.h
+++ b/include/linux/ext4_jbd2.h
@@ -114,74 +114,32 @@ int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode);
  * been done yet.
  */
 
-void ext4_journal_abort_handle(const char *caller, const char *err_fn,
-                struct buffer_head *bh, handle_t *handle, int err);
-
-static inline int
-__ext4_journal_get_undo_access(const char *where, handle_t *handle,
-                                struct buffer_head *bh)
+static inline void ext4_journal_release_buffer(handle_t *handle,
+                                                struct buffer_head *bh)
 {
-        int err = jbd2_journal_get_undo_access(handle, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
+        jbd2_journal_release_buffer(handle, bh);
 }
 
-static inline int
-__ext4_journal_get_write_access(const char *where, handle_t *handle,
-                                struct buffer_head *bh)
-{
-        int err = jbd2_journal_get_write_access(handle, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+void ext4_journal_abort_handle(const char *caller, const char *err_fn,
+                struct buffer_head *bh, handle_t *handle, int err);
 
-static inline void
-ext4_journal_release_buffer(handle_t *handle, struct buffer_head *bh)
-{
-        jbd2_journal_release_buffer(handle, bh);
-}
+int __ext4_journal_get_undo_access(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext4_journal_forget(const char *where, handle_t *handle, struct buffer_head *bh)
-{
-        int err = jbd2_journal_forget(handle, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext4_journal_get_write_access(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext4_journal_revoke(const char *where, handle_t *handle,
-                      ext4_fsblk_t blocknr, struct buffer_head *bh)
-{
-        int err = jbd2_journal_revoke(handle, blocknr, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext4_journal_forget(const char *where, handle_t *handle,
+                                struct buffer_head *bh);
 
-static inline int
-__ext4_journal_get_create_access(const char *where,
-                                 handle_t *handle, struct buffer_head *bh)
-{
-        int err = jbd2_journal_get_create_access(handle, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext4_journal_revoke(const char *where, handle_t *handle,
+                                ext4_fsblk_t blocknr, struct buffer_head *bh);
 
-static inline int
-__ext4_journal_dirty_metadata(const char *where,
-                              handle_t *handle, struct buffer_head *bh)
-{
-        int err = jbd2_journal_dirty_metadata(handle, bh);
-        if (err)
-                ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);
-        return err;
-}
+int __ext4_journal_get_create_access(const char *where,
+                                handle_t *handle, struct buffer_head *bh);
 
+int __ext4_journal_dirty_metadata(const char *where,
+                                handle_t *handle, struct buffer_head *bh);
 
 #define ext4_journal_get_undo_access(handle, bh) \
         __ext4_journal_get_undo_access(__FUNCTION__, (handle), (bh))
diff --git a/include/linux/fault-inject.h b/include/linux/fault-inject.h
new file mode 100644
index 00000000000..32368c4f032
--- /dev/null
+++ b/include/linux/fault-inject.h
@@ -0,0 +1,84 @@
+#ifndef _LINUX_FAULT_INJECT_H
+#define _LINUX_FAULT_INJECT_H
+
+#ifdef CONFIG_FAULT_INJECTION
+
+#include <linux/types.h>
+#include <linux/debugfs.h>
+#include <asm/atomic.h>
+
+/*
+ * For explanation of the elements of this struct, see
+ * Documentation/fault-injection/fault-injection.txt
+ */
+struct fault_attr {
+        unsigned long probability;
+        unsigned long interval;
+        atomic_t times;
+        atomic_t space;
+        unsigned long verbose;
+        u32 task_filter;
+        unsigned long stacktrace_depth;
+        unsigned long require_start;
+        unsigned long require_end;
+        unsigned long reject_start;
+        unsigned long reject_end;
+
+        unsigned long count;
+
+#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
+
+        struct {
+                struct dentry *dir;
+
+                struct dentry *probability_file;
+                struct dentry *interval_file;
+                struct dentry *times_file;
+                struct dentry *space_file;
+                struct dentry *verbose_file;
+                struct dentry *task_filter_file;
+                struct dentry *stacktrace_depth_file;
+                struct dentry *require_start_file;
+                struct dentry *require_end_file;
+                struct dentry *reject_start_file;
+                struct dentry *reject_end_file;
+        } dentries;
+
+#endif
+};
+
+#define FAULT_ATTR_INITIALIZER {                                \
+                .interval = 1,                                  \
+                .times = ATOMIC_INIT(1),                        \
+                .require_end = ULONG_MAX,                       \
+                .stacktrace_depth = 32,                         \
+                .verbose = 2,                                   \
+        }
+
+#define DECLARE_FAULT_ATTR(name) struct fault_attr name = FAULT_ATTR_INITIALIZER
+int setup_fault_attr(struct fault_attr *attr, char *str);
+void should_fail_srandom(unsigned long entropy);
+bool should_fail(struct fault_attr *attr, ssize_t size);
+
+#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS
+
+int init_fault_attr_dentries(struct fault_attr *attr, const char *name);
+void cleanup_fault_attr_dentries(struct fault_attr *attr);
+
+#else /* CONFIG_FAULT_INJECTION_DEBUG_FS */
+
+static inline int init_fault_attr_dentries(struct fault_attr *attr,
+                                          const char *name)
+{
+        return -ENODEV;
+}
+
+static inline void cleanup_fault_attr_dentries(struct fault_attr *attr)
+{
+}
+
+#endif /* CONFIG_FAULT_INJECTION_DEBUG_FS */
+
+#endif /* CONFIG_FAULT_INJECTION */
+
+#endif /* _LINUX_FAULT_INJECT_H */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 3e69241e6a8..64177ec9a01 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -774,8 +774,8 @@ struct fb_info {
 #endif
 
         struct fb_ops *fbops;
-        struct device *device;
-        struct class_device *class_device; /* sysfs per device attrs */
+        struct device *device;          /* This is the parent */
+        struct device *dev;             /* This is this fb device */
         int class_flag;                    /* private sysfs flags */
 #ifdef CONFIG_FB_TILEBLITTING
         struct fb_tile_ops *tileops;    /* Tile Blitting */
@@ -910,8 +910,8 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,
 /* drivers/video/fbsysfs.c */
 extern struct fb_info *framebuffer_alloc(size_t size, struct device *dev);
 extern void framebuffer_release(struct fb_info *info);
-extern int fb_init_class_device(struct fb_info *fb_info);
-extern void fb_cleanup_class_device(struct fb_info *head);
+extern int fb_init_device(struct fb_info *fb_info);
+extern void fb_cleanup_device(struct fb_info *head);
 extern void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max);
 
 /* drivers/video/fbmon.c */
@@ -929,8 +929,6 @@ extern void fb_bl_default_curve(struct fb_info *fb_info, u8 off, u8 min, u8 max)
 #define FB_MODE_IS_FIRST        16
 #define FB_MODE_IS_FROM_VAR     32
 
-extern int fbmon_valid_timings(u_int pixclock, u_int htotal, u_int vtotal,
-                               const struct fb_info *fb_info);
 extern int fbmon_dpms(const struct fb_info *fb_info);
 extern int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var,
                        struct fb_info *info);
@@ -970,11 +968,11 @@ extern struct fb_videomode *fb_find_best_display(struct fb_monspecs *specs,
 /* drivers/video/fbcmap.c */
 extern int fb_alloc_cmap(struct fb_cmap *cmap, int len, int transp);
 extern void fb_dealloc_cmap(struct fb_cmap *cmap);
-extern int fb_copy_cmap(struct fb_cmap *from, struct fb_cmap *to);
-extern int fb_cmap_to_user(struct fb_cmap *from, struct fb_cmap_user *to);
+extern int fb_copy_cmap(const struct fb_cmap *from, struct fb_cmap *to);
+extern int fb_cmap_to_user(const struct fb_cmap *from, struct fb_cmap_user *to);
 extern int fb_set_cmap(struct fb_cmap *cmap, struct fb_info *fb_info);
 extern int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *fb_info);
-extern struct fb_cmap *fb_default_cmap(int len);
+extern const struct fb_cmap *fb_default_cmap(int len);
 extern void fb_invert_cmaps(void);
 
 struct fb_videomode {
diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index 4418c8d9d47..8270aac2aa5 100644
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -6,6 +6,7 @@
 
 /* rule is permanent, and cannot be deleted */
 #define FIB_RULE_PERMANENT      1
+#define FIB_RULE_INVERT         2
 
 struct fib_rule_hdr
 {
@@ -34,7 +35,7 @@ enum
         FRA_UNUSED3,
         FRA_UNUSED4,
         FRA_UNUSED5,
-        FRA_FWMARK,     /* netfilter mark */
+        FRA_FWMARK,     /* mark */
         FRA_FLOW,       /* flow/class id */
         FRA_UNUSED6,
         FRA_UNUSED7,
diff --git a/include/linux/file.h b/include/linux/file.h
index 74183e6f7f4..a59001e9ea5 100644
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -26,19 +26,12 @@ struct embedded_fd_set {
         unsigned long fds_bits[1];
 };
 
-/*
- * More than this number of fds: we use a separately allocated fd_set
- */
-#define EMBEDDED_FD_SET_SIZE (BITS_PER_BYTE * sizeof(struct embedded_fd_set))
-
 struct fdtable {
         unsigned int max_fds;
-        int max_fdset;
         struct file ** fd;      /* current fd array */
         fd_set *close_on_exec;
         fd_set *open_fds;
         struct rcu_head rcu;
-        struct files_struct *free_files;
         struct fdtable *next;
 };
 
@@ -64,6 +57,8 @@ struct files_struct {
 
 #define files_fdtable(files) (rcu_dereference((files)->fdt))
 
+extern struct kmem_cache *filp_cachep;
+
 extern void FASTCALL(__fput(struct file *));
 extern void FASTCALL(fput(struct file *));
 
@@ -81,16 +76,15 @@ extern int get_unused_fd(void);
 extern void FASTCALL(put_unused_fd(unsigned int fd));
 struct kmem_cache;
 
-extern struct file ** alloc_fd_array(int);
-extern void free_fd_array(struct file **, int);
-
-extern fd_set *alloc_fdset(int);
-extern void free_fdset(fd_set *, int);
-
 extern int expand_files(struct files_struct *, int nr);
-extern void free_fdtable(struct fdtable *fdt);
+extern void free_fdtable_rcu(struct rcu_head *rcu);
 extern void __init files_defer_init(void);
 
+static inline void free_fdtable(struct fdtable *fdt)
+{
+        call_rcu(&fdt->rcu, free_fdtable_rcu);
+}
+
 static inline struct file * fcheck_files(struct files_struct *files, unsigned int fd)
 {
         struct file * file = NULL;
@@ -114,4 +108,6 @@ struct files_struct *get_files_struct(struct task_struct *);
 void FASTCALL(put_files_struct(struct files_struct *fs));
 void reset_files_struct(struct task_struct *, struct files_struct *);
 
+extern struct kmem_cache *files_cachep;
+
 #endif /* __LINUX_FILE_H */
diff --git a/include/linux/freezer.h b/include/linux/freezer.h
new file mode 100644
index 00000000000..5e75e26d478
--- /dev/null
+++ b/include/linux/freezer.h
@@ -0,0 +1,90 @@
+/* Freezer declarations */
+
+#include <linux/sched.h>
+
+#ifdef CONFIG_PM
+/*
+ * Check if a process has been frozen
+ */
+static inline int frozen(struct task_struct *p)
+{
+        return p->flags & PF_FROZEN;
+}
+
+/*
+ * Check if there is a request to freeze a process
+ */
+static inline int freezing(struct task_struct *p)
+{
+        return test_tsk_thread_flag(p, TIF_FREEZE);
+}
+
+/*
+ * Request that a process be frozen
+ */
+static inline void freeze(struct task_struct *p)
+{
+        set_tsk_thread_flag(p, TIF_FREEZE);
+}
+
+/*
+ * Sometimes we may need to cancel the previous 'freeze' request
+ */
+static inline void do_not_freeze(struct task_struct *p)
+{
+        clear_tsk_thread_flag(p, TIF_FREEZE);
+}
+
+/*
+ * Wake up a frozen process
+ */
+static inline int thaw_process(struct task_struct *p)
+{
+        if (frozen(p)) {
+                p->flags &= ~PF_FROZEN;
+                wake_up_process(p);
+                return 1;
+        }
+        return 0;
+}
+
+/*
+ * freezing is complete, mark process as frozen
+ */
+static inline void frozen_process(struct task_struct *p)
+{
+        p->flags |= PF_FROZEN;
+        wmb();
+        clear_tsk_thread_flag(p, TIF_FREEZE);
+}
+
+extern void refrigerator(void);
+extern int freeze_processes(void);
+extern void thaw_processes(void);
+
+static inline int try_to_freeze(void)
+{
+        if (freezing(current)) {
+                refrigerator();
+                return 1;
+        } else
+                return 0;
+}
+
+extern void thaw_some_processes(int all);
+
+#else
+static inline int frozen(struct task_struct *p) { return 0; }
+static inline int freezing(struct task_struct *p) { return 0; }
+static inline void freeze(struct task_struct *p) { BUG(); }
+static inline int thaw_process(struct task_struct *p) { return 1; }
+static inline void frozen_process(struct task_struct *p) { BUG(); }
+
+static inline void refrigerator(void) {}
+static inline int freeze_processes(void) { BUG(); return 0; }
+static inline void thaw_processes(void) {}
+
+static inline int try_to_freeze(void) { return 0; }
+
+
+#endif
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 2fe6e3f900b..1410e5330c8 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -120,6 +120,7 @@ extern int dir_notify_enable;
 #define MS_PRIVATE      (1<<18) /* change to private */
 #define MS_SLAVE        (1<<19) /* change to slave */
 #define MS_SHARED       (1<<20) /* change to shared */
+#define MS_RELATIME     (1<<21) /* Update atime relative to mtime/ctime. */
 #define MS_ACTIVE       (1<<30)
 #define MS_NOUSER       (1<<31)
 
@@ -269,6 +270,7 @@ extern int dir_notify_enable;
 #include <linux/types.h>
 #include <linux/kdev_t.h>
 #include <linux/dcache.h>
+#include <linux/namei.h>
 #include <linux/stat.h>
 #include <linux/cache.h>
 #include <linux/kobject.h>
@@ -276,7 +278,7 @@ extern int dir_notify_enable;
 #include <linux/radix-tree.h>
 #include <linux/prio_tree.h>
 #include <linux/init.h>
-#include <linux/sched.h>
+#include <linux/pid.h>
 #include <linux/mutex.h>
 
 #include <asm/atomic.h>
@@ -424,6 +426,7 @@ struct address_space_operations {
         /* migrate the contents of a page to the specified target */
         int (*migratepage) (struct address_space *,
                         struct page *, struct page *);
+        int (*launder_page) (struct page *);
 };
 
 struct backing_dev_info;
@@ -456,7 +459,7 @@ struct block_device {
         struct inode *          bd_inode;       /* will die */
         int                     bd_openers;
         struct mutex            bd_mutex;       /* open/close mutex */
-        struct mutex            bd_mount_mutex; /* mount mutex */
+        struct semaphore        bd_mount_sem;
         struct list_head        bd_inodes;
         void *                  bd_holder;
         int                     bd_holders;
@@ -482,21 +485,6 @@ struct block_device {
 };
 
 /*
- * bdev->bd_mutex nesting subclasses for the lock validator:
- *
- * 0: normal
- * 1: 'whole'
- * 2: 'partition'
- */
-enum bdev_bd_mutex_lock_class
-{
-        BD_MUTEX_NORMAL,
-        BD_MUTEX_WHOLE,
-        BD_MUTEX_PARTITION
-};
-
-
-/*
  * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
  * radix trees
  */
@@ -543,19 +531,22 @@ struct inode {
         struct list_head        i_dentry;
         unsigned long           i_ino;
         atomic_t                i_count;
-        umode_t                 i_mode;
         unsigned int            i_nlink;
         uid_t                   i_uid;
         gid_t                   i_gid;
         dev_t                   i_rdev;
+        unsigned long           i_version;
         loff_t                  i_size;
+#ifdef __NEED_I_SIZE_ORDERED
+        seqcount_t              i_size_seqcount;
+#endif
         struct timespec         i_atime;
         struct timespec         i_mtime;
         struct timespec         i_ctime;
         unsigned int            i_blkbits;
-        unsigned long           i_version;
         blkcnt_t                i_blocks;
         unsigned short          i_bytes;
+        umode_t                 i_mode;
         spinlock_t              i_lock; /* i_blocks, i_bytes, maybe i_size */
         struct mutex            i_mutex;
         struct rw_semaphore     i_alloc_sem;
@@ -598,9 +589,6 @@ struct inode {
         void                    *i_security;
 #endif
         void                    *i_private; /* fs or device private pointer */
-#ifdef __NEED_I_SIZE_ORDERED
-        seqcount_t              i_size_seqcount;
-#endif
 };
 
 /*
@@ -636,7 +624,7 @@ extern void inode_double_unlock(struct inode *inode1, struct inode *inode2);
  * cmpxchg8b without the need of the lock prefix). For SMP compiles
  * and 64bit archs it makes no difference if preempt is enabled or not.
  */
-static inline loff_t i_size_read(struct inode *inode)
+static inline loff_t i_size_read(const struct inode *inode)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
         loff_t i_size;
@@ -679,12 +667,12 @@ static inline void i_size_write(struct inode *inode, loff_t i_size)
 #endif
 }
 
-static inline unsigned iminor(struct inode *inode)
+static inline unsigned iminor(const struct inode *inode)
 {
         return MINOR(inode->i_rdev);
 }
 
-static inline unsigned imajor(struct inode *inode)
+static inline unsigned imajor(const struct inode *inode)
 {
         return MAJOR(inode->i_rdev);
 }
@@ -726,8 +714,9 @@ struct file {
                 struct list_head        fu_list;
                 struct rcu_head         fu_rcuhead;
         } f_u;
-        struct dentry           *f_dentry;
-        struct vfsmount         *f_vfsmnt;
+        struct path             f_path;
+#define f_dentry        f_path.dentry
+#define f_vfsmnt        f_path.mnt
         const struct file_operations    *f_op;
         atomic_t                f_count;
         unsigned int            f_flags;
@@ -977,36 +966,13 @@ enum {
 #define vfs_check_frozen(sb, level) \
         wait_event((sb)->s_wait_unfrozen, ((sb)->s_frozen < (level)))
 
-static inline void get_fs_excl(void)
-{
-        atomic_inc(&current->fs_excl);
-}
-
-static inline void put_fs_excl(void)
-{
-        atomic_dec(&current->fs_excl);
-}
-
-static inline int has_fs_excl(void)
-{
-        return atomic_read(&current->fs_excl);
-}
+#define get_fs_excl() atomic_inc(&current->fs_excl)
+#define put_fs_excl() atomic_dec(&current->fs_excl)
+#define has_fs_excl() atomic_read(&current->fs_excl)
 
-
-/*
- * Superblock locking.
- */
-static inline void lock_super(struct super_block * sb)
-{
-        get_fs_excl();
-        mutex_lock(&sb->s_lock);
-}
-
-static inline void unlock_super(struct super_block * sb)
-{
-        put_fs_excl();
-        mutex_unlock(&sb->s_lock);
-}
+/* not quite ready to be deprecated, but... */
+extern void lock_super(struct super_block *);
+extern void unlock_super(struct super_block *);
 
 /*
  * VFS helper functions..
@@ -1262,7 +1228,7 @@ extern void touch_atime(struct vfsmount *mnt, struct dentry *dentry);
 static inline void file_accessed(struct file *file)
 {
         if (!(file->f_flags & O_NOATIME))
-                touch_atime(file->f_vfsmnt, file->f_dentry);
+                touch_atime(file->f_path.mnt, file->f_path.dentry);
 }
 
 int sync_inode(struct inode *inode, struct writeback_control *wbc);
@@ -1504,7 +1470,9 @@ extern char * getname(const char __user *);
 extern void __init vfs_caches_init_early(void);
 extern void __init vfs_caches_init(unsigned long);
 
-#define __getname()     kmem_cache_alloc(names_cachep, SLAB_KERNEL)
+extern struct kmem_cache *names_cachep;
+
+#define __getname()     kmem_cache_alloc(names_cachep, GFP_KERNEL)
 #define __putname(name) kmem_cache_free(names_cachep, (void *)(name))
 #ifndef CONFIG_AUDITSYSCALL
 #define putname(name)   __putname(name)
@@ -1520,7 +1488,6 @@ extern void bd_set_size(struct block_device *, loff_t size);
 extern void bd_forget(struct inode *inode);
 extern void bdput(struct block_device *);
 extern struct block_device *open_by_devnum(dev_t, unsigned);
-extern struct block_device *open_partition_by_devnum(dev_t, unsigned);
 extern const struct address_space_operations def_blk_aops;
 #else
 static inline void bd_forget(struct inode *inode) {}
@@ -1538,7 +1505,6 @@ extern int blkdev_driver_ioctl(struct inode *inode, struct file *file,
 extern long compat_blkdev_ioctl(struct file *, unsigned, unsigned long);
 extern int blkdev_get(struct block_device *, mode_t, unsigned);
 extern int blkdev_put(struct block_device *);
-extern int blkdev_put_partition(struct block_device *);
 extern int bd_claim(struct block_device *, void *);
 extern void bd_release(struct block_device *);
 #ifdef CONFIG_SYSFS
@@ -1653,7 +1619,7 @@ static inline void put_write_access(struct inode * inode)
 static inline void allow_write_access(struct file *file)
 {
         if (file)
-                atomic_inc(&file->f_dentry->d_inode->i_writecount);
+                atomic_inc(&file->f_path.dentry->d_inode->i_writecount);
 }
 extern int do_pipe(int *);
 extern struct file *create_read_pipe(struct file *f);
diff --git a/include/linux/fs_stack.h b/include/linux/fs_stack.h
new file mode 100644
index 00000000000..bb516ceeefc
--- /dev/null
+++ b/include/linux/fs_stack.h
@@ -0,0 +1,31 @@
+#ifndef _LINUX_FS_STACK_H
+#define _LINUX_FS_STACK_H
+
+/* This file defines generic functions used primarily by stackable
+ * filesystems; none of these functions require i_mutex to be held.
+ */
+
+#include <linux/fs.h>
+
+/* externs for fs/stack.c */
+extern void fsstack_copy_attr_all(struct inode *dest, const struct inode *src,
+                                int (*get_nlinks)(struct inode *));
+
+extern void fsstack_copy_inode_size(struct inode *dst, const struct inode *src);
+
+/* inlines */
+static inline void fsstack_copy_attr_atime(struct inode *dest,
+                                           const struct inode *src)
+{
+        dest->i_atime = src->i_atime;
+}
+
+static inline void fsstack_copy_attr_times(struct inode *dest,
+                                           const struct inode *src)
+{
+        dest->i_atime = src->i_atime;
+        dest->i_mtime = src->i_mtime;
+        dest->i_ctime = src->i_ctime;
+}
+
+#endif /* _LINUX_FS_STACK_H */
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
index c623d12a486..11a36ceddf7 100644
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
@@ -18,6 +18,8 @@ struct fs_struct {
         .umask          = 0022, \
 }
 
+extern struct kmem_cache *fs_cachep;
+
 extern void exit_fs(struct task_struct *);
 extern void set_fs_altroot(void);
 extern void set_fs_root(struct fs_struct *, struct vfsmount *, struct dentry *);
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 3da29e2d524..abb64c437f6 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -19,6 +19,7 @@
 #define _FSL_DEVICE_H_
 
 #include <linux/types.h>
+#include <linux/phy.h>
 
 /*
  * Some conventions on how we handle peripherals on Freescale chips
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index d4f219ffaa5..dfc4e4f68da 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -164,7 +164,7 @@ static inline void fsnotify_open(struct dentry *dentry)
  */
 static inline void fsnotify_close(struct file *file)
 {
-        struct dentry *dentry = file->f_dentry;
+        struct dentry *dentry = file->f_path.dentry;
         struct inode *inode = dentry->d_inode;
         const char *name = dentry->d_name.name;
         mode_t mode = file->f_mode;
diff --git a/include/linux/ftape-header-segment.h b/include/linux/ftape-header-segment.h
deleted file mode 100644
index 4732218f070..00000000000
--- a/include/linux/ftape-header-segment.h
+++ /dev/null
@@ -1,122 +0,0 @@
-#ifndef _FTAPE_HEADER_SEGMENT_H
-#define _FTAPE_HEADER_SEGMENT_H
-
-/*
- * Copyright (C) 1996-1997 Claus-Justus Heine.
-
- 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, 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; see the file COPYING.  If not, write to
- the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
- *
- * $Source: /homes/cvs/ftape-stacked/include/linux/ftape-header-segment.h,v $
- * $Revision: 1.2 $
- * $Date: 1997/10/05 19:19:28 $
- *
- *      This file defines some offsets into the header segment of a
- *      floppy tape cartridge.  For use with the QIC-40/80/3010/3020
- *      floppy-tape driver "ftape" for Linux.
- */
-
-#define FT_SIGNATURE   0  /* must be 0xaa55aa55 */
-#define FT_FMT_CODE    4
-#define FT_REV_LEVEL   5  /* only for QIC-80 since. Rev. L (== 0x0c)         */
-#define FT_HSEG_1      6  /* first header segment, except for format code  6 */
-#define FT_HSEG_2      8  /* second header segment, except for format code 6 */
-#define FT_FRST_SEG   10  /* first data segment, except for format code 6    */
-#define FT_LAST_SEG   12  /* last data segment, except for format code 6     */
-#define FT_FMT_DATE   14  /* date and time of most recent format, see below  */
-#define FT_WR_DATE    18  /* date and time of most recent write or format    */
-#define FT_SPT        24  /* segments per track                              */
-#define FT_TPC        26  /* tracks per cartridge                            */
-#define FT_FHM        27  /* floppy drive head (maximum of it)               */
-#define FT_FTM        28  /* floppy track max.                               */
-#define FT_FSM        29  /* floppy sector max. (128)                        */
-#define FT_LABEL      30  /* floppy tape label                               */
-#define FT_LABEL_DATE 74  /* date and time the tape label was written        */
-#define FT_LABEL_SZ   (FT_LABEL_DATE - FT_LABEL)
-#define FT_CMAP_START 78  /* starting segment of compression map             */
-#define FT_FMT_ERROR 128  /* must be set to 0xff if remainder gets lost during
-                           * tape format
-                           */
-#define FT_SEG_CNT   130  /* number of seg. written, formatted or verified
-                           * through lifetime of tape (why not read?)
-                           */
-#define FT_INIT_DATE 138  /* date and time of initial tape format    */
-#define FT_FMT_CNT   142  /* number of times tape has been formatted */
-#define FT_FSL_CNT   144  /* number of segments in failed sector log */
-#define FT_MK_CODE   146  /* id string of tape manufacturer          */
-#define FT_LOT_CODE  190  /* tape manufacturer lot code              */
-#define FT_6_HSEG_1  234  /* first header segment for format code  6 */
-#define FT_6_HSEG_2  238  /* second header segment for format code 6 */
-#define FT_6_FRST_SEG 242 /* first data segment for format code 6    */
-#define FT_6_LAST_SEG 246 /* last data segment for format code 6     */
-
-#define FT_FSL        256
-#define FT_HEADER_END 256 /* space beyond this point:
-                           * format codes 2, 3 and 5: 
-                           * -  failed sector log until byte 2047
-                           * -  bad sector map in the reamining part of segment
-                           * format codes 4 and 6:
-                           * -  bad sector map  starts hear
-                           */
-
-
-/*  value to be stored at the FT_SIGNATURE offset 
- */
-#define FT_HSEG_MAGIC 0xaa55aa55
-#define FT_D2G_MAGIC  0x82288228 /* Ditto 2GB */
-
-/* data and time encoding: */
-#define FT_YEAR_SHIFT 25
-#define FT_YEAR_MASK  0xfe000000
-#define FT_YEAR_0     1970
-#define FT_YEAR_MAX   127
-#define FT_YEAR(year) ((((year)-FT_YEAR_0)<<FT_YEAR_SHIFT)&FT_YEAR_MASK)
-
-#define FT_TIME_SHIFT   0
-#define FT_TIME_MASK    0x01FFFFFF
-#define FT_TIME_MAX     0x01ea6dff /* last second of a year */
-#define FT_TIME(mo,d,h,m,s) \
-        ((((s)+60*((m)+60*((h)+24*((d)+31*(mo))))) & FT_TIME_MASK))
-
-#define FT_TIME_STAMP(y,mo,d,h,m,s) (FT_YEAR(y) | FT_TIME(mo,d,h,m,s))
-
-/* values for the format code field */
-typedef enum {
-        fmt_normal = 2, /*  QIC-80 post Rev. B 205Ft or 307Ft tape    */
-        fmt_1100ft = 3, /*  QIC-80 post Rev. B 1100Ft tape            */
-        fmt_var    = 4, /*  QIC-80 post Rev. B variabel length format */
-        fmt_425ft  = 5, /*  QIC-80 post Rev. B 425Ft tape             */
-        fmt_big    = 6  /*  QIC-3010/3020 variable length tape with more 
-                         *  than 2^16 segments per tape
-                         */
-} ft_format_type;
-
-/* definitions for the failed sector log */
-#define FT_FSL_SIZE        (2 * FT_SECTOR_SIZE - FT_HEADER_END)
-#define FT_FSL_MAX_ENTRIES (FT_FSL_SIZE/sizeof(__u32))
-
-typedef struct ft_fsl_entry {
-        __u16 segment;
-        __u16 date;
-} __attribute__ ((packed)) ft_fsl_entry;
-
-
-/*  date encoding for the failed sector log 
- *  month: 1..12, day: 1..31, year: 1970..2097
- */
-#define FT_FSL_TIME_STAMP(y,m,d) \
-        (((((y) - FT_YEAR_0)<<9)&0xfe00) | (((m)<<5)&0x01e0) | ((d)&0x001f))
-
-#endif /* _FTAPE_HEADER_SEGMENT_H */
diff --git a/include/linux/ftape-vendors.h b/include/linux/ftape-vendors.h
deleted file mode 100644
index ec1a81f059e..00000000000
--- a/include/linux/ftape-vendors.h
+++ /dev/null
@@ -1,137 +0,0 @@
-#ifndef _FTAPE_VENDORS_H
-#define _FTAPE_VENDORS_H
-
-/*
- *      Copyright (C) 1993-1996 Bas Laarhoven,
- *                (C) 1996-1997 Claus-Justus Heine.
-
- 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, 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; see the file COPYING.  If not, write to
- the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
- *
- * $Source: /homes/cvs/ftape-stacked/include/linux/ftape-vendors.h,v $
- * $Revision: 1.6 $
- * $Date: 1997/10/09 15:38:11 $
- *
- *      This file contains the supported drive types with their
- *      QIC-117 spec. vendor code and drive dependent configuration
- *      information.
- */
-
-typedef enum {
-        unknown_wake_up = 0,
-        no_wake_up,
-        wake_up_colorado,
-        wake_up_mountain,
-        wake_up_insight,
-} wake_up_types;
-
-typedef struct {
-        wake_up_types wake_up;  /* see wake_up_types */
-        char *name;             /* Text describing the drive */
-} wakeup_method;
-
-/*  Note: order of entries in WAKEUP_METHODS must be so that a variable
- *        of type wake_up_types can be used as an index in the array.
- */
-#define WAKEUP_METHODS { \
-  { unknown_wake_up,    "Unknown" }, \
-  { no_wake_up,         "None" }, \
-  { wake_up_colorado,   "Colorado" }, \
-  { wake_up_mountain,   "Mountain" }, \
-  { wake_up_insight,    "Motor-on" }, \
-}
-
-typedef struct {
-        unsigned int vendor_id; /* vendor id from drive */
-        int speed;              /* maximum tape transport speed (ips) */
-        wake_up_types wake_up;  /* see wake_up_types */
-        char *name;             /* Text describing the drive */
-} vendor_struct;
-
-#define UNKNOWN_VENDOR (-1)
-
-#define QIC117_VENDORS {                                                    \
-/* see _vendor_struct */                                                    \
-  { 0x00000,  82, wake_up_colorado,  "Colorado DJ-10 (old)" },              \
-  { 0x00047,  90, wake_up_colorado,  "Colorado DJ-10/DJ-20" },              \
-  { 0x011c2,  84, wake_up_colorado,  "Colorado 700" },                      \
-  { 0x011c3,  90, wake_up_colorado,  "Colorado 1400" },                     \
-  { 0x011c4,  84, wake_up_colorado,  "Colorado DJ-10/DJ-20 (new)" },        \
-  { 0x011c5,  84, wake_up_colorado,  "HP Colorado T1000" },                 \
-  { 0x011c6,  90, wake_up_colorado,  "HP Colorado T3000" },                 \
-  { 0x00005,  45, wake_up_mountain,  "Archive 5580i" },                     \
-  { 0x10005,  50, wake_up_insight,   "Insight 80Mb, Irwin 80SX" },          \
-  { 0x00140,  74, wake_up_mountain,  "Archive S.Hornet [Identity/Escom]" }, \
-  { 0x00146,  72, wake_up_mountain,  "Archive 31250Q [Escom]" },            \
-  { 0x0014a, 100, wake_up_mountain,  "Archive XL9250i [Conner/Escom]" },    \
-  { 0x0014c,  98, wake_up_mountain,  "Conner C250MQT" },                    \
-  { 0x0014e,  80, wake_up_mountain,  "Conner C250MQ" },                     \
-  { 0x00150,  80, wake_up_mountain,  "Conner TSM420R/TST800R" },            \
-  { 0x00152,  80, wake_up_mountain,  "Conner TSM850R" },                    \
-  { 0x00156,  80, wake_up_mountain,  "Conner TSM850R/1700R/TST3200R" },     \
-  { 0x00180,   0, wake_up_mountain,  "Summit SE 150" },                     \
-  { 0x00181,  85, wake_up_mountain,  "Summit SE 250, Mountain FS8000" },    \
-  { 0x001c1,  82, no_wake_up,        "Wangtek 3040F" },                     \
-  { 0x001c8,  64, no_wake_up,        "Wangtek 3080F" },                     \
-  { 0x001c8,  64, wake_up_colorado,  "Wangtek 3080F" },                     \
-  { 0x001ca,  67, no_wake_up,        "Wangtek 3080F (new)" },               \
-  { 0x001cc,  77, wake_up_colorado,  "Wangtek 3200 / Teac 700" },           \
-  { 0x001cd,  75, wake_up_colorado,  "Reveal TB1400" },                     \
-  { 0x00380,  85, wake_up_colorado,  "Exabyte Eagle-96" },                  \
-  { 0x00381,  85, wake_up_colorado,  "Exabyte Eagle TR-3" },                \
-  { 0x00382,  85, wake_up_colorado,  "Exabyte Eagle TR-3" },                \
-  { 0x003ce,  77, wake_up_colorado,  "Teac 800" },                          \
-  { 0x003cf,   0, wake_up_colorado,  "Teac FT3010TR" },                     \
-  { 0x08880,  64, no_wake_up,        "Iomega 250, Ditto 800" },             \
-  { 0x08880,  64, wake_up_colorado,  "Iomega 250, Ditto 800" },             \
-  { 0x08880,  64, wake_up_insight,   "Iomega 250, Ditto 800" },             \
-  { 0x08881,  80, wake_up_colorado,  "Iomega 700" },                        \
-  { 0x08882,  80, wake_up_colorado,  "Iomega 3200" },                       \
-  { 0x08883,  80, wake_up_colorado,  "Iomega DITTO 2GB" },                  \
-  { 0x00021,  70, no_wake_up,        "AIWA CT-803" },                       \
-  { 0x004c0,  80, no_wake_up,        "AIWA TD-S1600" },                     \
-  { 0x00021,   0, wake_up_mountain,  "COREtape QIC80" },                    \
-  { 0x00441,   0, wake_up_mountain,  "ComByte DoublePlay" },                \
-  { 0x00481, 127, wake_up_mountain,  "PERTEC MyTape 800" },                 \
-  { 0x00483, 130, wake_up_mountain,  "PERTEC MyTape 3200" },                \
-  { UNKNOWN_VENDOR, 0, no_wake_up, "unknown" }                              \
-}
-
-#define QIC117_MAKE_CODES {                     \
-  { 0, "Unassigned" },                          \
-  { 1, "Alloy Computer Products" },             \
-  { 2, "3M" },                                  \
-  { 3, "Tandberg Data" },                       \
-  { 4, "Colorado" },                            \
-  { 5, "Archive/Conner" },                      \
-  { 6, "Mountain/Summit Memory Systems" },      \
-  { 7, "Wangtek/Rexon/Tecmar" },                \
-  { 8, "Sony" },                                \
-  { 9, "Cipher Data Products" },                \
-  { 10, "Irwin Magnetic Systems" },             \
-  { 11, "Braemar" },                            \
-  { 12, "Verbatim" },                           \
-  { 13, "Core International" },                 \
-  { 14, "Exabyte" },                            \
-  { 15, "Teac" },                               \
-  { 16, "Gigatek" },                            \
-  { 17, "ComByte" },                            \
-  { 18, "PERTEC Memories" },                    \
-  { 19, "Aiwa" },                               \
-  { 71, "Colorado" },                           \
-  { 546, "Iomega Inc" },                        \
-}
-
-#endif /* _FTAPE_VENDORS_H */
diff --git a/include/linux/ftape.h b/include/linux/ftape.h
deleted file mode 100644
index 7e7038cba86..00000000000
--- a/include/linux/ftape.h
+++ /dev/null
@@ -1,201 +0,0 @@
-#ifndef _FTAPE_H
-#define _FTAPE_H
-
-/*
- * Copyright (C) 1994-1996 Bas Laarhoven,
- *           (C) 1996-1997 Claus-Justus Heine.
-
- 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, 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; see the file COPYING.  If not, write to
- the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
- *
- * $Source: /homes/cvs/ftape-stacked/include/linux/ftape.h,v $
- * $Revision: 1.17.6.4 $
- * $Date: 1997/11/25 01:52:54 $
- *
- *      This file contains global definitions, typedefs and macro's
- *      for the QIC-40/80/3010/3020 floppy-tape driver for Linux.
- */
-
-#define FTAPE_VERSION "ftape v3.04d 25/11/97"
-
-#ifdef __KERNEL__
-#include <linux/interrupt.h>
-#include <linux/mm.h>
-#endif
-#include <linux/types.h>
-#include <linux/mtio.h>
-
-#define FT_SECTOR(x)            (x+1)   /* sector offset into real sector */
-#define FT_SECTOR_SIZE          1024
-#define FT_SECTORS_PER_SEGMENT    32
-#define FT_ECC_SECTORS             3
-#define FT_SEGMENT_SIZE         ((FT_SECTORS_PER_SEGMENT - FT_ECC_SECTORS) * FT_SECTOR_SIZE)
-#define FT_BUFF_SIZE    (FT_SECTORS_PER_SEGMENT * FT_SECTOR_SIZE)
-
-/*
- *   bits of the minor device number that define drive selection
- *   methods. Could be used one day to access multiple tape
- *   drives on the same controller.
- */
-#define FTAPE_SEL_A     0
-#define FTAPE_SEL_B     1
-#define FTAPE_SEL_C     2
-#define FTAPE_SEL_D     3
-#define FTAPE_SEL_MASK     3
-#define FTAPE_SEL(unit) ((unit) & FTAPE_SEL_MASK)
-#define FTAPE_NO_REWIND 4       /* mask for minor nr */
-
-/* the following two may be reported when MTIOCGET is requested ... */
-typedef union {
-        struct {
-                __u8 error;
-                __u8 command;
-        } error;
-        long space;
-} ft_drive_error;
-typedef union {
-        struct {
-                __u8 drive_status;
-                __u8 drive_config;
-                __u8 tape_status;
-        } status;
-        long space;
-} ft_drive_status;
-
-#ifdef __KERNEL__
-
-#define FT_RQM_DELAY    12
-#define FT_MILLISECOND  1
-#define FT_SECOND       1000
-#define FT_FOREVER      -1
-#ifndef HZ
-#error "HZ undefined."
-#endif
-#define FT_USPT         (1000000/HZ) /* microseconds per tick */
-
-/* This defines the number of retries that the driver will allow
- * before giving up (and letting a higher level handle the error).
- */
-#ifdef TESTING
-#define FT_SOFT_RETRIES 1          /* number of low level retries */
-#define FT_RETRIES_ON_ECC_ERROR 3  /* ecc error when correcting segment */
-#else
-#define FT_SOFT_RETRIES 6          /* number of low level retries (triple) */
-#define FT_RETRIES_ON_ECC_ERROR 3  /* ecc error when correcting segment */
-#endif
-
-#ifndef THE_FTAPE_MAINTAINER
-#define THE_FTAPE_MAINTAINER "the ftape maintainer"
-#endif
-
-/* Initialize missing configuration parameters.
- */
-#ifndef CONFIG_FT_NR_BUFFERS
-# define CONFIG_FT_NR_BUFFERS 3
-#endif
-#ifndef CONFIG_FT_FDC_THR
-# define CONFIG_FT_FDC_THR 8
-#endif
-#ifndef CONFIG_FT_FDC_MAX_RATE
-# define CONFIG_FT_FDC_MAX_RATE 2000
-#endif
-#ifndef CONFIG_FT_FDC_BASE
-# define CONFIG_FT_FDC_BASE 0
-#endif
-#ifndef CONFIG_FT_FDC_IRQ
-# define CONFIG_FT_FDC_IRQ  0
-#endif
-#ifndef CONFIG_FT_FDC_DMA
-# define CONFIG_FT_FDC_DMA  0
-#endif
-
-/* Turn some booleans into numbers.
- */
-#ifdef CONFIG_FT_PROBE_FC10
-# undef CONFIG_FT_PROBE_FC10
-# define CONFIG_FT_PROBE_FC10 1
-#else
-# define CONFIG_FT_PROBE_FC10 0
-#endif
-#ifdef CONFIG_FT_MACH2
-# undef CONFIG_FT_MACH2
-# define CONFIG_FT_MACH2 1
-#else
-# define CONFIG_FT_MACH2 0
-#endif
-
-/* Insert default settings
- */
-#if CONFIG_FT_PROBE_FC10 == 1
-# if CONFIG_FT_FDC_BASE == 0
-#  undef  CONFIG_FT_FDC_BASE
-#  define CONFIG_FT_FDC_BASE 0x180
-# endif
-# if CONFIG_FT_FDC_IRQ == 0
-#  undef  CONFIG_FT_FDC_IRQ
-#  define CONFIG_FT_FDC_IRQ 9
-# endif
-# if CONFIG_FT_FDC_DMA == 0
-#  undef  CONFIG_FT_FDC_DMA
-#  define CONFIG_FT_FDC_DMA 3
-# endif
-#elif CONFIG_FT_MACH2 == 1    /* CONFIG_FT_PROBE_FC10 == 1 */
-# if CONFIG_FT_FDC_BASE == 0
-#  undef  CONFIG_FT_FDC_BASE
-#  define CONFIG_FT_FDC_BASE 0x1E0
-# endif
-# if CONFIG_FT_FDC_IRQ == 0
-#  undef  CONFIG_FT_FDC_IRQ
-#  define CONFIG_FT_FDC_IRQ 6
-# endif
-# if CONFIG_FT_FDC_DMA == 0
-#  undef  CONFIG_FT_FDC_DMA
-#  define CONFIG_FT_FDC_DMA 2
-# endif
-#elif defined(CONFIG_FT_ALT_FDC)  /* CONFIG_FT_MACH2 */
-# if CONFIG_FT_FDC_BASE == 0
-#  undef  CONFIG_FT_FDC_BASE
-#  define CONFIG_FT_FDC_BASE 0x370
-# endif
-# if CONFIG_FT_FDC_IRQ == 0
-#  undef  CONFIG_FT_FDC_IRQ
-#  define CONFIG_FT_FDC_IRQ 6
-# endif
-# if CONFIG_FT_FDC_DMA == 0
-#  undef  CONFIG_FT_FDC_DMA
-#  define CONFIG_FT_FDC_DMA 2
-# endif
-#else                          /* CONFIG_FT_ALT_FDC */
-# if CONFIG_FT_FDC_BASE == 0
-#  undef  CONFIG_FT_FDC_BASE
-#  define CONFIG_FT_FDC_BASE 0x3f0
-# endif
-# if CONFIG_FT_FDC_IRQ == 0
-#  undef  CONFIG_FT_FDC_IRQ
-#  define CONFIG_FT_FDC_IRQ 6
-# endif
-# if CONFIG_FT_FDC_DMA == 0
-#  undef  CONFIG_FT_FDC_DMA
-#  define CONFIG_FT_FDC_DMA 2
-# endif
-#endif                         /* standard FDC */
-
-/*      some useful macro's
- */
-#define NR_ITEMS(x)     (int)(sizeof(x)/ sizeof(*x))
-
-#endif  /* __KERNEL__ */
-
-#endif
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 9fc48a674b8..534744efe30 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -15,7 +15,7 @@
 #define FUSE_KERNEL_VERSION 7
 
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 7
+#define FUSE_KERNEL_MINOR_VERSION 8
 
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
@@ -92,6 +92,11 @@ struct fuse_file_lock {
 #define FUSE_ASYNC_READ         (1 << 0)
 #define FUSE_POSIX_LOCKS        (1 << 1)
 
+/**
+ * Release flags
+ */
+#define FUSE_RELEASE_FLUSH      (1 << 0)
+
 enum fuse_opcode {
         FUSE_LOOKUP        = 1,
         FUSE_FORGET        = 2,  /* no reply */
@@ -127,6 +132,8 @@ enum fuse_opcode {
         FUSE_ACCESS        = 34,
         FUSE_CREATE        = 35,
         FUSE_INTERRUPT     = 36,
+        FUSE_BMAP          = 37,
+        FUSE_DESTROY       = 38,
 };
 
 /* The read buffer is required to be at least 8k, but may be much larger */
@@ -205,12 +212,13 @@ struct fuse_open_out {
 struct fuse_release_in {
         __u64   fh;
         __u32   flags;
-        __u32   padding;
+        __u32   release_flags;
+        __u64   lock_owner;
 };
 
 struct fuse_flush_in {
         __u64   fh;
-        __u32   flush_flags;
+        __u32   unused;
         __u32   padding;
         __u64   lock_owner;
 };
@@ -296,6 +304,16 @@ struct fuse_interrupt_in {
         __u64   unique;
 };
 
+struct fuse_bmap_in {
+        __u64   block;
+        __u32   blocksize;
+        __u32   padding;
+};
+
+struct fuse_bmap_out {
+        __u64   block;
+};
+
 struct fuse_in_header {
         __u32   len;
         __u32   opcode;
diff --git a/include/linux/futex.h b/include/linux/futex.h
index d097b5b72bc..3f153b4e156 100644
--- a/include/linux/futex.h
+++ b/include/linux/futex.h
@@ -93,6 +93,7 @@ struct robust_list_head {
  */
 #define ROBUST_LIST_LIMIT       2048
 
+#ifdef __KERNEL__
 long do_futex(u32 __user *uaddr, int op, u32 val, unsigned long timeout,
               u32 __user *uaddr2, u32 val2, u32 val3);
 
@@ -110,6 +111,7 @@ static inline void exit_pi_state_list(struct task_struct *curr)
 {
 }
 #endif
+#endif /* __KERNEL__ */
 
 #define FUTEX_OP_SET            0       /* *(int *)UADDR2 = OPARG; */
 #define FUTEX_OP_ADD            1       /* *(int *)UADDR2 += OPARG; */
diff --git a/include/linux/gameport.h b/include/linux/gameport.h
index 2cdba0c2395..afad9527284 100644
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
@@ -105,7 +105,7 @@ static inline void gameport_set_phys(struct gameport *gameport,
 
 static inline struct gameport *gameport_allocate_port(void)
 {
-        struct gameport *gameport = kcalloc(1, sizeof(struct gameport), GFP_KERNEL);
+        struct gameport *gameport = kzalloc(sizeof(struct gameport), GFP_KERNEL);
 
         return gameport;
 }
diff --git a/include/linux/generic_serial.h b/include/linux/generic_serial.h
index e2538456195..5412da28fa4 100644
--- a/include/linux/generic_serial.h
+++ b/include/linux/generic_serial.h
@@ -91,7 +91,7 @@ void gs_hangup(struct tty_struct *tty);
 int  gs_block_til_ready(void *port, struct file *filp);
 void gs_close(struct tty_struct *tty, struct file *filp);
 void gs_set_termios (struct tty_struct * tty, 
-                     struct termios * old_termios);
+                     struct ktermios * old_termios);
 int  gs_init_port(struct gs_port *port);
 int  gs_setserial(struct gs_port *port, struct serial_struct __user *sp);
 int  gs_getserial(struct gs_port *port, struct serial_struct __user *sp);
diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index 9049dc65ae5..f7a93770e1b 100644
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -17,6 +17,9 @@ struct genlmsghdr {
 #define GENL_HDRLEN     NLMSG_ALIGN(sizeof(struct genlmsghdr))
 
 #define GENL_ADMIN_PERM         0x01
+#define GENL_CMD_CAP_DO         0x02
+#define GENL_CMD_CAP_DUMP       0x04
+#define GENL_CMD_CAP_HASPOL     0x08
 
 /*
  * List of reserved static generic netlink identifiers:
@@ -58,9 +61,6 @@ enum {
         CTRL_ATTR_OP_UNSPEC,
         CTRL_ATTR_OP_ID,
         CTRL_ATTR_OP_FLAGS,
-        CTRL_ATTR_OP_POLICY,
-        CTRL_ATTR_OP_DOIT,
-        CTRL_ATTR_OP_DUMPIT,
         __CTRL_ATTR_OP_MAX,
 };
 
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 41f276fdd18..0a022b2f63f 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -83,6 +83,9 @@ struct hd_struct {
         struct kobject *holder_dir;
         unsigned ios[2], sectors[2];    /* READs and WRITEs */
         int policy, partno;
+#ifdef CONFIG_FAIL_MAKE_REQUEST
+        int make_it_fail;
+#endif
 };
 
 #define GENHD_FL_REMOVABLE                      1
@@ -90,6 +93,7 @@ struct hd_struct {
 #define GENHD_FL_CD                             8
 #define GENHD_FL_UP                             16
 #define GENHD_FL_SUPPRESS_PARTITION_INFO        32
+#define GENHD_FL_FAIL                           64
 
 struct disk_stats {
         unsigned long sectors[2];       /* READs and WRITEs */
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index bf2b6bc3f6f..00c314aedab 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -116,6 +116,9 @@ static inline enum zone_type gfp_zone(gfp_t flags)
 #ifndef HAVE_ARCH_FREE_PAGE
 static inline void arch_free_page(struct page *page, int order) { }
 #endif
+#ifndef HAVE_ARCH_ALLOC_PAGE
+static inline void arch_alloc_page(struct page *page, int order) { }
+#endif
 
 extern struct page *
 FASTCALL(__alloc_pages(gfp_t, unsigned int, struct zonelist *));
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index a7ae7c177ca..8b7e4c1e32a 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -54,8 +54,13 @@ struct gfs2_inum {
         __be64 no_addr;
 };
 
-static inline int gfs2_inum_equal(const struct gfs2_inum *ino1,
-                                  const struct gfs2_inum *ino2)
+struct gfs2_inum_host {
+        __u64 no_formal_ino;
+        __u64 no_addr;
+};
+
+static inline int gfs2_inum_equal(const struct gfs2_inum_host *ino1,
+                                  const struct gfs2_inum_host *ino2)
 {
         return ino1->no_formal_ino == ino2->no_formal_ino &&
                ino1->no_addr == ino2->no_addr;
@@ -89,6 +94,12 @@ struct gfs2_meta_header {
         __be32 __pad1;          /* Was incarnation number in gfs1 */
 };
 
+struct gfs2_meta_header_host {
+        __u32 mh_magic;
+        __u32 mh_type;
+        __u32 mh_format;
+};
+
 /*
  * super-block structure
  *
@@ -128,6 +139,23 @@ struct gfs2_sb {
         /* In gfs1, quota and license dinodes followed */
 };
 
+struct gfs2_sb_host {
+        struct gfs2_meta_header_host sb_header;
+
+        __u32 sb_fs_format;
+        __u32 sb_multihost_format;
+
+        __u32 sb_bsize;
+        __u32 sb_bsize_shift;
+
+        struct gfs2_inum_host sb_master_dir; /* Was jindex dinode in gfs1 */
+        struct gfs2_inum_host sb_root_dir;
+
+        char sb_lockproto[GFS2_LOCKNAME_LEN];
+        char sb_locktable[GFS2_LOCKNAME_LEN];
+        /* In gfs1, quota and license dinodes followed */
+};
+
 /*
  * resource index structure
  */
@@ -145,6 +173,14 @@ struct gfs2_rindex {
         __u8 ri_reserved[64];
 };
 
+struct gfs2_rindex_host {
+        __u64 ri_addr;  /* grp block disk address */
+        __u64 ri_data0; /* first data location */
+        __u32 ri_length;        /* length of rgrp header in fs blocks */
+        __u32 ri_data;  /* num of data blocks in rgrp */
+        __u32 ri_bitbytes;      /* number of bytes in data bitmaps */
+};
+
 /*
  * resource group header structure
  */
@@ -176,6 +212,13 @@ struct gfs2_rgrp {
         __u8 rg_reserved[80]; /* Several fields from gfs1 now reserved */
 };
 
+struct gfs2_rgrp_host {
+        __u32 rg_flags;
+        __u32 rg_free;
+        __u32 rg_dinodes;
+        __u64 rg_igeneration;
+};
+
 /*
  * quota structure
  */
@@ -187,6 +230,12 @@ struct gfs2_quota {
         __u8 qu_reserved[64];
 };
 
+struct gfs2_quota_host {
+        __u64 qu_limit;
+        __u64 qu_warn;
+        __u64 qu_value;
+};
+
 /*
  * dinode structure
  */
@@ -270,6 +319,27 @@ struct gfs2_dinode {
         __u8 di_reserved[56];
 };
 
+struct gfs2_dinode_host {
+        __u64 di_size;  /* number of bytes in file */
+        __u64 di_blocks;        /* number of blocks in file */
+
+        /* This section varies from gfs1. Padding added to align with
+         * remainder of dinode
+         */
+        __u64 di_goal_meta;     /* rgrp to alloc from next */
+        __u64 di_goal_data;     /* data block goal */
+        __u64 di_generation;    /* generation number for NFS */
+
+        __u32 di_flags; /* GFS2_DIF_... */
+        __u16 di_height;        /* height of metadata */
+
+        /* These only apply to directories  */
+        __u16 di_depth; /* Number of bits in the table */
+        __u32 di_entries;       /* The number of entries in the directory */
+
+        __u64 di_eattr; /* extended attribute block number */
+};
+
 /*
  * directory structure - many of these per directory file
  */
@@ -344,6 +414,16 @@ struct gfs2_log_header {
         __be32 lh_hash;
 };
 
+struct gfs2_log_header_host {
+        struct gfs2_meta_header_host lh_header;
+
+        __u64 lh_sequence;      /* Sequence number of this transaction */
+        __u32 lh_flags; /* GFS2_LOG_HEAD_... */
+        __u32 lh_tail;          /* Block number of log tail */
+        __u32 lh_blkno;
+        __u32 lh_hash;
+};
+
 /*
  * Log type descriptor
  */
@@ -384,6 +464,11 @@ struct gfs2_inum_range {
         __be64 ir_length;
 };
 
+struct gfs2_inum_range_host {
+        __u64 ir_start;
+        __u64 ir_length;
+};
+
 /*
  * Statfs change
  * Describes an change to the pool of free and allocated
@@ -396,6 +481,12 @@ struct gfs2_statfs_change {
         __be64 sc_dinodes;
 };
 
+struct gfs2_statfs_change_host {
+        __u64 sc_total;
+        __u64 sc_free;
+        __u64 sc_dinodes;
+};
+
 /*
  * Quota change
  * Describes an allocation change for a particular
@@ -410,33 +501,38 @@ struct gfs2_quota_change {
         __be32 qc_id;
 };
 
+struct gfs2_quota_change_host {
+        __u64 qc_change;
+        __u32 qc_flags; /* GFS2_QCF_... */
+        __u32 qc_id;
+};
+
 #ifdef __KERNEL__
 /* Translation functions */
 
-extern void gfs2_inum_in(struct gfs2_inum *no, const void *buf);
-extern void gfs2_inum_out(const struct gfs2_inum *no, void *buf);
-extern void gfs2_sb_in(struct gfs2_sb *sb, const void *buf);
-extern void gfs2_rindex_in(struct gfs2_rindex *ri, const void *buf);
-extern void gfs2_rindex_out(const struct gfs2_rindex *ri, void *buf);
-extern void gfs2_rgrp_in(struct gfs2_rgrp *rg, const void *buf);
-extern void gfs2_rgrp_out(const struct gfs2_rgrp *rg, void *buf);
-extern void gfs2_quota_in(struct gfs2_quota *qu, const void *buf);
-extern void gfs2_quota_out(const struct gfs2_quota *qu, void *buf);
-extern void gfs2_dinode_in(struct gfs2_dinode *di, const void *buf);
-extern void gfs2_dinode_out(const struct gfs2_dinode *di, void *buf);
+extern void gfs2_inum_in(struct gfs2_inum_host *no, const void *buf);
+extern void gfs2_inum_out(const struct gfs2_inum_host *no, void *buf);
+extern void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf);
+extern void gfs2_rindex_in(struct gfs2_rindex_host *ri, const void *buf);
+extern void gfs2_rindex_out(const struct gfs2_rindex_host *ri, void *buf);
+extern void gfs2_rgrp_in(struct gfs2_rgrp_host *rg, const void *buf);
+extern void gfs2_rgrp_out(const struct gfs2_rgrp_host *rg, void *buf);
+extern void gfs2_quota_in(struct gfs2_quota_host *qu, const void *buf);
+struct gfs2_inode;
+extern void gfs2_dinode_out(const struct gfs2_inode *ip, void *buf);
 extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, const void *buf);
 extern void gfs2_ea_header_out(const struct gfs2_ea_header *ea, void *buf);
-extern void gfs2_log_header_in(struct gfs2_log_header *lh, const void *buf);
-extern void gfs2_inum_range_in(struct gfs2_inum_range *ir, const void *buf);
-extern void gfs2_inum_range_out(const struct gfs2_inum_range *ir, void *buf);
-extern void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, const void *buf);
-extern void gfs2_statfs_change_out(const struct gfs2_statfs_change *sc, void *buf);
-extern void gfs2_quota_change_in(struct gfs2_quota_change *qc, const void *buf);
+extern void gfs2_log_header_in(struct gfs2_log_header_host *lh, const void *buf);
+extern void gfs2_inum_range_in(struct gfs2_inum_range_host *ir, const void *buf);
+extern void gfs2_inum_range_out(const struct gfs2_inum_range_host *ir, void *buf);
+extern void gfs2_statfs_change_in(struct gfs2_statfs_change_host *sc, const void *buf);
+extern void gfs2_statfs_change_out(const struct gfs2_statfs_change_host *sc, void *buf);
+extern void gfs2_quota_change_in(struct gfs2_quota_change_host *qc, const void *buf);
 
 /* Printing functions */
 
-extern void gfs2_rindex_print(const struct gfs2_rindex *ri);
-extern void gfs2_dinode_print(const struct gfs2_dinode *di);
+extern void gfs2_rindex_print(const struct gfs2_rindex_host *ri);
+extern void gfs2_dinode_print(const struct gfs2_inode *ip);
 
 #endif /* __KERNEL__ */
 
diff --git a/include/linux/hid-debug.h b/include/linux/hid-debug.h
new file mode 100644
index 00000000000..f04d6d75c09
--- /dev/null
+++ b/include/linux/hid-debug.h
@@ -0,0 +1,757 @@
+/*
+ * $Id: hid-debug.h,v 1.8 2001/09/25 09:37:57 vojtech Exp $
+ *
+ *  (c) 1999 Andreas Gal                <gal@cs.uni-magdeburg.de>
+ *  (c) 2000-2001 Vojtech Pavlik        <vojtech@ucw.cz>
+ *
+ *  Some debug stuff for the HID parser.
+ */
+
+/*
+ * 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
+ *
+ * Should you need to contact me, the author, you can do so either by
+ * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
+ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ */
+
+#include <linux/input.h>
+
+struct hid_usage_entry {
+        unsigned  page;
+        unsigned  usage;
+        char     *description;
+};
+
+static const struct hid_usage_entry hid_usage_table[] = {
+  {  0,      0, "Undefined" },
+  {  1,      0, "GenericDesktop" },
+    {0, 0x01, "Pointer"},
+    {0, 0x02, "Mouse"},
+    {0, 0x04, "Joystick"},
+    {0, 0x05, "GamePad"},
+    {0, 0x06, "Keyboard"},
+    {0, 0x07, "Keypad"},
+    {0, 0x08, "MultiAxis"},
+      {0, 0x30, "X"},
+      {0, 0x31, "Y"},
+      {0, 0x32, "Z"},
+      {0, 0x33, "Rx"},
+      {0, 0x34, "Ry"},
+      {0, 0x35, "Rz"},
+      {0, 0x36, "Slider"},
+      {0, 0x37, "Dial"},
+      {0, 0x38, "Wheel"},
+      {0, 0x39, "HatSwitch"},
+    {0, 0x3a, "CountedBuffer"},
+      {0, 0x3b, "ByteCount"},
+      {0, 0x3c, "MotionWakeup"},
+      {0, 0x3d, "Start"},
+      {0, 0x3e, "Select"},
+      {0, 0x40, "Vx"},
+      {0, 0x41, "Vy"},
+      {0, 0x42, "Vz"},
+      {0, 0x43, "Vbrx"},
+      {0, 0x44, "Vbry"},
+      {0, 0x45, "Vbrz"},
+      {0, 0x46, "Vno"},
+    {0, 0x80, "SystemControl"},
+      {0, 0x81, "SystemPowerDown"},
+      {0, 0x82, "SystemSleep"},
+      {0, 0x83, "SystemWakeUp"},
+      {0, 0x84, "SystemContextMenu"},
+      {0, 0x85, "SystemMainMenu"},
+      {0, 0x86, "SystemAppMenu"},
+      {0, 0x87, "SystemMenuHelp"},
+      {0, 0x88, "SystemMenuExit"},
+      {0, 0x89, "SystemMenuSelect"},
+      {0, 0x8a, "SystemMenuRight"},
+      {0, 0x8b, "SystemMenuLeft"},
+      {0, 0x8c, "SystemMenuUp"},
+      {0, 0x8d, "SystemMenuDown"},
+      {0, 0x90, "D-PadUp"},
+      {0, 0x91, "D-PadDown"},
+      {0, 0x92, "D-PadRight"},
+      {0, 0x93, "D-PadLeft"},
+  {  2, 0, "Simulation" },
+      {0, 0xb0, "Aileron"},
+      {0, 0xb1, "AileronTrim"},
+      {0, 0xb2, "Anti-Torque"},
+      {0, 0xb3, "Autopilot"},
+      {0, 0xb4, "Chaff"},
+      {0, 0xb5, "Collective"},
+      {0, 0xb6, "DiveBrake"},
+      {0, 0xb7, "ElectronicCountermeasures"},
+      {0, 0xb8, "Elevator"},
+      {0, 0xb9, "ElevatorTrim"},
+      {0, 0xba, "Rudder"},
+      {0, 0xbb, "Throttle"},
+      {0, 0xbc, "FlightCommunications"},
+      {0, 0xbd, "FlareRelease"},
+      {0, 0xbe, "LandingGear"},
+      {0, 0xbf, "ToeBrake"},
+  {  7, 0, "Keyboard" },
+  {  8, 0, "LED" },
+      {0, 0x01, "NumLock"},
+      {0, 0x02, "CapsLock"},
+      {0, 0x03, "ScrollLock"},
+      {0, 0x04, "Compose"},
+      {0, 0x05, "Kana"},
+      {0, 0x4b, "GenericIndicator"},
+  {  9, 0, "Button" },
+  { 10, 0, "Ordinal" },
+  { 12, 0, "Consumer" },
+      {0, 0x238, "HorizontalWheel"},
+  { 13, 0, "Digitizers" },
+    {0, 0x01, "Digitizer"},
+    {0, 0x02, "Pen"},
+    {0, 0x03, "LightPen"},
+    {0, 0x04, "TouchScreen"},
+    {0, 0x05, "TouchPad"},
+    {0, 0x20, "Stylus"},
+    {0, 0x21, "Puck"},
+    {0, 0x22, "Finger"},
+    {0, 0x30, "TipPressure"},
+    {0, 0x31, "BarrelPressure"},
+    {0, 0x32, "InRange"},
+    {0, 0x33, "Touch"},
+    {0, 0x34, "UnTouch"},
+    {0, 0x35, "Tap"},
+    {0, 0x39, "TabletFunctionKey"},
+    {0, 0x3a, "ProgramChangeKey"},
+    {0, 0x3c, "Invert"},
+    {0, 0x42, "TipSwitch"},
+    {0, 0x43, "SecondaryTipSwitch"},
+    {0, 0x44, "BarrelSwitch"},
+    {0, 0x45, "Eraser"},
+    {0, 0x46, "TabletPick"},
+  { 15, 0, "PhysicalInterfaceDevice" },
+    {0, 0x00, "Undefined"},
+    {0, 0x01, "Physical_Interface_Device"},
+      {0, 0x20, "Normal"},
+    {0, 0x21, "Set_Effect_Report"},
+      {0, 0x22, "Effect_Block_Index"},
+      {0, 0x23, "Parameter_Block_Offset"},
+      {0, 0x24, "ROM_Flag"},
+      {0, 0x25, "Effect_Type"},
+        {0, 0x26, "ET_Constant_Force"},
+        {0, 0x27, "ET_Ramp"},
+        {0, 0x28, "ET_Custom_Force_Data"},
+        {0, 0x30, "ET_Square"},
+        {0, 0x31, "ET_Sine"},
+        {0, 0x32, "ET_Triangle"},
+        {0, 0x33, "ET_Sawtooth_Up"},
+        {0, 0x34, "ET_Sawtooth_Down"},
+        {0, 0x40, "ET_Spring"},
+        {0, 0x41, "ET_Damper"},
+        {0, 0x42, "ET_Inertia"},
+        {0, 0x43, "ET_Friction"},
+      {0, 0x50, "Duration"},
+      {0, 0x51, "Sample_Period"},
+      {0, 0x52, "Gain"},
+      {0, 0x53, "Trigger_Button"},
+      {0, 0x54, "Trigger_Repeat_Interval"},
+      {0, 0x55, "Axes_Enable"},
+        {0, 0x56, "Direction_Enable"},
+      {0, 0x57, "Direction"},
+      {0, 0x58, "Type_Specific_Block_Offset"},
+        {0, 0x59, "Block_Type"},
+        {0, 0x5A, "Set_Envelope_Report"},
+          {0, 0x5B, "Attack_Level"},
+          {0, 0x5C, "Attack_Time"},
+          {0, 0x5D, "Fade_Level"},
+          {0, 0x5E, "Fade_Time"},
+        {0, 0x5F, "Set_Condition_Report"},
+        {0, 0x60, "CP_Offset"},
+        {0, 0x61, "Positive_Coefficient"},
+        {0, 0x62, "Negative_Coefficient"},
+        {0, 0x63, "Positive_Saturation"},
+        {0, 0x64, "Negative_Saturation"},
+        {0, 0x65, "Dead_Band"},
+      {0, 0x66, "Download_Force_Sample"},
+      {0, 0x67, "Isoch_Custom_Force_Enable"},
+      {0, 0x68, "Custom_Force_Data_Report"},
+        {0, 0x69, "Custom_Force_Data"},
+        {0, 0x6A, "Custom_Force_Vendor_Defined_Data"},
+      {0, 0x6B, "Set_Custom_Force_Report"},
+        {0, 0x6C, "Custom_Force_Data_Offset"},
+        {0, 0x6D, "Sample_Count"},
+      {0, 0x6E, "Set_Periodic_Report"},
+        {0, 0x6F, "Offset"},
+        {0, 0x70, "Magnitude"},
+        {0, 0x71, "Phase"},
+        {0, 0x72, "Period"},
+      {0, 0x73, "Set_Constant_Force_Report"},
+        {0, 0x74, "Set_Ramp_Force_Report"},
+        {0, 0x75, "Ramp_Start"},
+        {0, 0x76, "Ramp_End"},
+      {0, 0x77, "Effect_Operation_Report"},
+        {0, 0x78, "Effect_Operation"},
+          {0, 0x79, "Op_Effect_Start"},
+          {0, 0x7A, "Op_Effect_Start_Solo"},
+          {0, 0x7B, "Op_Effect_Stop"},
+          {0, 0x7C, "Loop_Count"},
+      {0, 0x7D, "Device_Gain_Report"},
+        {0, 0x7E, "Device_Gain"},
+    {0, 0x7F, "PID_Pool_Report"},
+      {0, 0x80, "RAM_Pool_Size"},
+      {0, 0x81, "ROM_Pool_Size"},
+      {0, 0x82, "ROM_Effect_Block_Count"},
+      {0, 0x83, "Simultaneous_Effects_Max"},
+      {0, 0x84, "Pool_Alignment"},
+    {0, 0x85, "PID_Pool_Move_Report"},
+      {0, 0x86, "Move_Source"},
+      {0, 0x87, "Move_Destination"},
+      {0, 0x88, "Move_Length"},
+    {0, 0x89, "PID_Block_Load_Report"},
+      {0, 0x8B, "Block_Load_Status"},
+      {0, 0x8C, "Block_Load_Success"},
+      {0, 0x8D, "Block_Load_Full"},
+      {0, 0x8E, "Block_Load_Error"},
+      {0, 0x8F, "Block_Handle"},
+      {0, 0x90, "PID_Block_Free_Report"},
+      {0, 0x91, "Type_Specific_Block_Handle"},
+    {0, 0x92, "PID_State_Report"},
+      {0, 0x94, "Effect_Playing"},
+      {0, 0x95, "PID_Device_Control_Report"},
+        {0, 0x96, "PID_Device_Control"},
+        {0, 0x97, "DC_Enable_Actuators"},
+        {0, 0x98, "DC_Disable_Actuators"},
+        {0, 0x99, "DC_Stop_All_Effects"},
+        {0, 0x9A, "DC_Device_Reset"},
+        {0, 0x9B, "DC_Device_Pause"},
+        {0, 0x9C, "DC_Device_Continue"},
+      {0, 0x9F, "Device_Paused"},
+      {0, 0xA0, "Actuators_Enabled"},
+      {0, 0xA4, "Safety_Switch"},
+      {0, 0xA5, "Actuator_Override_Switch"},
+      {0, 0xA6, "Actuator_Power"},
+    {0, 0xA7, "Start_Delay"},
+    {0, 0xA8, "Parameter_Block_Size"},
+    {0, 0xA9, "Device_Managed_Pool"},
+    {0, 0xAA, "Shared_Parameter_Blocks"},
+    {0, 0xAB, "Create_New_Effect_Report"},
+    {0, 0xAC, "RAM_Pool_Available"},
+  { 0x84, 0, "Power Device" },
+    { 0x84, 0x02, "PresentStatus" },
+    { 0x84, 0x03, "ChangeStatus" },
+    { 0x84, 0x04, "UPS" },
+    { 0x84, 0x05, "PowerSupply" },
+    { 0x84, 0x10, "BatterySystem" },
+    { 0x84, 0x11, "BatterySystemID" },
+    { 0x84, 0x12, "Battery" },
+    { 0x84, 0x13, "BatteryID" },
+    { 0x84, 0x14, "Charger" },
+    { 0x84, 0x15, "ChargerID" },
+    { 0x84, 0x16, "PowerConverter" },
+    { 0x84, 0x17, "PowerConverterID" },
+    { 0x84, 0x18, "OutletSystem" },
+    { 0x84, 0x19, "OutletSystemID" },
+    { 0x84, 0x1a, "Input" },
+    { 0x84, 0x1b, "InputID" },
+    { 0x84, 0x1c, "Output" },
+    { 0x84, 0x1d, "OutputID" },
+    { 0x84, 0x1e, "Flow" },
+    { 0x84, 0x1f, "FlowID" },
+    { 0x84, 0x20, "Outlet" },
+    { 0x84, 0x21, "OutletID" },
+    { 0x84, 0x22, "Gang" },
+    { 0x84, 0x24, "PowerSummary" },
+    { 0x84, 0x25, "PowerSummaryID" },
+    { 0x84, 0x30, "Voltage" },
+    { 0x84, 0x31, "Current" },
+    { 0x84, 0x32, "Frequency" },
+    { 0x84, 0x33, "ApparentPower" },
+    { 0x84, 0x35, "PercentLoad" },
+    { 0x84, 0x40, "ConfigVoltage" },
+    { 0x84, 0x41, "ConfigCurrent" },
+    { 0x84, 0x43, "ConfigApparentPower" },
+    { 0x84, 0x53, "LowVoltageTransfer" },
+    { 0x84, 0x54, "HighVoltageTransfer" },
+    { 0x84, 0x56, "DelayBeforeStartup" },
+    { 0x84, 0x57, "DelayBeforeShutdown" },
+    { 0x84, 0x58, "Test" },
+    { 0x84, 0x5a, "AudibleAlarmControl" },
+    { 0x84, 0x60, "Present" },
+    { 0x84, 0x61, "Good" },
+    { 0x84, 0x62, "InternalFailure" },
+    { 0x84, 0x65, "Overload" },
+    { 0x84, 0x66, "OverCharged" },
+    { 0x84, 0x67, "OverTemperature" },
+    { 0x84, 0x68, "ShutdownRequested" },
+    { 0x84, 0x69, "ShutdownImminent" },
+    { 0x84, 0x6b, "SwitchOn/Off" },
+    { 0x84, 0x6c, "Switchable" },
+    { 0x84, 0x6d, "Used" },
+    { 0x84, 0x6e, "Boost" },
+    { 0x84, 0x73, "CommunicationLost" },
+    { 0x84, 0xfd, "iManufacturer" },
+    { 0x84, 0xfe, "iProduct" },
+    { 0x84, 0xff, "iSerialNumber" },
+  { 0x85, 0, "Battery System" },
+    { 0x85, 0x01, "SMBBatteryMode" },
+    { 0x85, 0x02, "SMBBatteryStatus" },
+    { 0x85, 0x03, "SMBAlarmWarning" },
+    { 0x85, 0x04, "SMBChargerMode" },
+    { 0x85, 0x05, "SMBChargerStatus" },
+    { 0x85, 0x06, "SMBChargerSpecInfo" },
+    { 0x85, 0x07, "SMBSelectorState" },
+    { 0x85, 0x08, "SMBSelectorPresets" },
+    { 0x85, 0x09, "SMBSelectorInfo" },
+    { 0x85, 0x29, "RemainingCapacityLimit" },
+    { 0x85, 0x2c, "CapacityMode" },
+    { 0x85, 0x42, "BelowRemainingCapacityLimit" },
+    { 0x85, 0x44, "Charging" },
+    { 0x85, 0x45, "Discharging" },
+    { 0x85, 0x4b, "NeedReplacement" },
+    { 0x85, 0x66, "RemainingCapacity" },
+    { 0x85, 0x68, "RunTimeToEmpty" },
+    { 0x85, 0x6a, "AverageTimeToFull" },
+    { 0x85, 0x83, "DesignCapacity" },
+    { 0x85, 0x85, "ManufacturerDate" },
+    { 0x85, 0x89, "iDeviceChemistry" },
+    { 0x85, 0x8b, "Rechargable" },
+    { 0x85, 0x8f, "iOEMInformation" },
+    { 0x85, 0x8d, "CapacityGranularity1" },
+    { 0x85, 0xd0, "ACPresent" },
+  /* pages 0xff00 to 0xffff are vendor-specific */
+  { 0xffff, 0, "Vendor-specific-FF" },
+  { 0, 0, NULL }
+};
+
+static void resolv_usage_page(unsigned page) {
+        const struct hid_usage_entry *p;
+
+        for (p = hid_usage_table; p->description; p++)
+                if (p->page == page) {
+                        printk("%s", p->description);
+                        return;
+                }
+        printk("%04x", page);
+}
+
+static void resolv_usage(unsigned usage) {
+        const struct hid_usage_entry *p;
+
+        resolv_usage_page(usage >> 16);
+        printk(".");
+        for (p = hid_usage_table; p->description; p++)
+                if (p->page == (usage >> 16)) {
+                        for(++p; p->description && p->usage != 0; p++)
+                                if (p->usage == (usage & 0xffff)) {
+                                        printk("%s", p->description);
+                                        return;
+                                }
+                        break;
+                }
+        printk("%04x", usage & 0xffff);
+}
+
+__inline__ static void tab(int n) {
+        while (n--) printk(" ");
+}
+
+static void hid_dump_field(struct hid_field *field, int n) {
+        int j;
+
+        if (field->physical) {
+                tab(n);
+                printk("Physical(");
+                resolv_usage(field->physical); printk(")\n");
+        }
+        if (field->logical) {
+                tab(n);
+                printk("Logical(");
+                resolv_usage(field->logical); printk(")\n");
+        }
+        tab(n); printk("Usage(%d)\n", field->maxusage);
+        for (j = 0; j < field->maxusage; j++) {
+                tab(n+2);resolv_usage(field->usage[j].hid); printk("\n");
+        }
+        if (field->logical_minimum != field->logical_maximum) {
+                tab(n); printk("Logical Minimum(%d)\n", field->logical_minimum);
+                tab(n); printk("Logical Maximum(%d)\n", field->logical_maximum);
+        }
+        if (field->physical_minimum != field->physical_maximum) {
+                tab(n); printk("Physical Minimum(%d)\n", field->physical_minimum);
+                tab(n); printk("Physical Maximum(%d)\n", field->physical_maximum);
+        }
+        if (field->unit_exponent) {
+                tab(n); printk("Unit Exponent(%d)\n", field->unit_exponent);
+        }
+        if (field->unit) {
+                char *systems[5] = { "None", "SI Linear", "SI Rotation", "English Linear", "English Rotation" };
+                char *units[5][8] = {
+                        { "None", "None", "None", "None", "None", "None", "None", "None" },
+                        { "None", "Centimeter", "Gram", "Seconds", "Kelvin",     "Ampere", "Candela", "None" },
+                        { "None", "Radians",    "Gram", "Seconds", "Kelvin",     "Ampere", "Candela", "None" },
+                        { "None", "Inch",       "Slug", "Seconds", "Fahrenheit", "Ampere", "Candela", "None" },
+                        { "None", "Degrees",    "Slug", "Seconds", "Fahrenheit", "Ampere", "Candela", "None" }
+                };
+
+                int i;
+                int sys;
+                __u32 data = field->unit;
+
+                /* First nibble tells us which system we're in. */
+                sys = data & 0xf;
+                data >>= 4;
+
+                if(sys > 4) {
+                        tab(n); printk("Unit(Invalid)\n");
+                }
+                else {
+                        int earlier_unit = 0;
+
+                        tab(n); printk("Unit(%s : ", systems[sys]);
+
+                        for (i=1 ; i<sizeof(__u32)*2 ; i++) {
+                                char nibble = data & 0xf;
+                                data >>= 4;
+                                if (nibble != 0) {
+                                        if(earlier_unit++ > 0)
+                                                printk("*");
+                                        printk("%s", units[sys][i]);
+                                        if(nibble != 1) {
+                                                /* This is a _signed_ nibble(!) */
+
+                                                int val = nibble & 0x7;
+                                                if(nibble & 0x08)
+                                                        val = -((0x7 & ~val) +1);
+                                                printk("^%d", val);
+                                        }
+                                }
+                        }
+                        printk(")\n");
+                }
+        }
+        tab(n); printk("Report Size(%u)\n", field->report_size);
+        tab(n); printk("Report Count(%u)\n", field->report_count);
+        tab(n); printk("Report Offset(%u)\n", field->report_offset);
+
+        tab(n); printk("Flags( ");
+        j = field->flags;
+        printk("%s", HID_MAIN_ITEM_CONSTANT & j ? "Constant " : "");
+        printk("%s", HID_MAIN_ITEM_VARIABLE & j ? "Variable " : "Array ");
+        printk("%s", HID_MAIN_ITEM_RELATIVE & j ? "Relative " : "Absolute ");
+        printk("%s", HID_MAIN_ITEM_WRAP & j ? "Wrap " : "");
+        printk("%s", HID_MAIN_ITEM_NONLINEAR & j ? "NonLinear " : "");
+        printk("%s", HID_MAIN_ITEM_NO_PREFERRED & j ? "NoPrefferedState " : "");
+        printk("%s", HID_MAIN_ITEM_NULL_STATE & j ? "NullState " : "");
+        printk("%s", HID_MAIN_ITEM_VOLATILE & j ? "Volatile " : "");
+        printk("%s", HID_MAIN_ITEM_BUFFERED_BYTE & j ? "BufferedByte " : "");
+        printk(")\n");
+}
+
+static void __attribute__((unused)) hid_dump_device(struct hid_device *device) {
+        struct hid_report_enum *report_enum;
+        struct hid_report *report;
+        struct list_head *list;
+        unsigned i,k;
+        static char *table[] = {"INPUT", "OUTPUT", "FEATURE"};
+
+        for (i = 0; i < HID_REPORT_TYPES; i++) {
+                report_enum = device->report_enum + i;
+                list = report_enum->report_list.next;
+                while (list != &report_enum->report_list) {
+                        report = (struct hid_report *) list;
+                        tab(2);
+                        printk("%s", table[i]);
+                        if (report->id)
+                                printk("(%d)", report->id);
+                        printk("[%s]", table[report->type]);
+                        printk("\n");
+                        for (k = 0; k < report->maxfield; k++) {
+                                tab(4);
+                                printk("Field(%d)\n", k);
+                                hid_dump_field(report->field[k], 6);
+                        }
+                        list = list->next;
+                }
+        }
+}
+
+static void __attribute__((unused)) hid_dump_input(struct hid_usage *usage, __s32 value) {
+        printk("hid-debug: input ");
+        resolv_usage(usage->hid);
+        printk(" = %d\n", value);
+}
+
+
+static char *events[EV_MAX + 1] = {
+        [EV_SYN] = "Sync",                      [EV_KEY] = "Key",
+        [EV_REL] = "Relative",                  [EV_ABS] = "Absolute",
+        [EV_MSC] = "Misc",                      [EV_LED] = "LED",
+        [EV_SND] = "Sound",                     [EV_REP] = "Repeat",
+        [EV_FF] = "ForceFeedback",              [EV_PWR] = "Power",
+        [EV_FF_STATUS] = "ForceFeedbackStatus",
+};
+
+static char *syncs[2] = {
+        [SYN_REPORT] = "Report",                [SYN_CONFIG] = "Config",
+};
+static char *keys[KEY_MAX + 1] = {
+        [KEY_RESERVED] = "Reserved",            [KEY_ESC] = "Esc",
+        [KEY_1] = "1",                          [KEY_2] = "2",
+        [KEY_3] = "3",                          [KEY_4] = "4",
+        [KEY_5] = "5",                          [KEY_6] = "6",
+        [KEY_7] = "7",                          [KEY_8] = "8",
+        [KEY_9] = "9",                          [KEY_0] = "0",
+        [KEY_MINUS] = "Minus",                  [KEY_EQUAL] = "Equal",
+        [KEY_BACKSPACE] = "Backspace",          [KEY_TAB] = "Tab",
+        [KEY_Q] = "Q",                          [KEY_W] = "W",
+        [KEY_E] = "E",                          [KEY_R] = "R",
+        [KEY_T] = "T",                          [KEY_Y] = "Y",
+        [KEY_U] = "U",                          [KEY_I] = "I",
+        [KEY_O] = "O",                          [KEY_P] = "P",
+        [KEY_LEFTBRACE] = "LeftBrace",          [KEY_RIGHTBRACE] = "RightBrace",
+        [KEY_ENTER] = "Enter",                  [KEY_LEFTCTRL] = "LeftControl",
+        [KEY_A] = "A",                          [KEY_S] = "S",
+        [KEY_D] = "D",                          [KEY_F] = "F",
+        [KEY_G] = "G",                          [KEY_H] = "H",
+        [KEY_J] = "J",                          [KEY_K] = "K",
+        [KEY_L] = "L",                          [KEY_SEMICOLON] = "Semicolon",
+        [KEY_APOSTROPHE] = "Apostrophe",        [KEY_GRAVE] = "Grave",
+        [KEY_LEFTSHIFT] = "LeftShift",          [KEY_BACKSLASH] = "BackSlash",
+        [KEY_Z] = "Z",                          [KEY_X] = "X",
+        [KEY_C] = "C",                          [KEY_V] = "V",
+        [KEY_B] = "B",                          [KEY_N] = "N",
+        [KEY_M] = "M",                          [KEY_COMMA] = "Comma",
+        [KEY_DOT] = "Dot",                      [KEY_SLASH] = "Slash",
+        [KEY_RIGHTSHIFT] = "RightShift",        [KEY_KPASTERISK] = "KPAsterisk",
+        [KEY_LEFTALT] = "LeftAlt",              [KEY_SPACE] = "Space",
+        [KEY_CAPSLOCK] = "CapsLock",            [KEY_F1] = "F1",
+        [KEY_F2] = "F2",                        [KEY_F3] = "F3",
+        [KEY_F4] = "F4",                        [KEY_F5] = "F5",
+        [KEY_F6] = "F6",                        [KEY_F7] = "F7",
+        [KEY_F8] = "F8",                        [KEY_F9] = "F9",
+        [KEY_F10] = "F10",                      [KEY_NUMLOCK] = "NumLock",
+        [KEY_SCROLLLOCK] = "ScrollLock",        [KEY_KP7] = "KP7",
+        [KEY_KP8] = "KP8",                      [KEY_KP9] = "KP9",
+        [KEY_KPMINUS] = "KPMinus",              [KEY_KP4] = "KP4",
+        [KEY_KP5] = "KP5",                      [KEY_KP6] = "KP6",
+        [KEY_KPPLUS] = "KPPlus",                [KEY_KP1] = "KP1",
+        [KEY_KP2] = "KP2",                      [KEY_KP3] = "KP3",
+        [KEY_KP0] = "KP0",                      [KEY_KPDOT] = "KPDot",
+        [KEY_ZENKAKUHANKAKU] = "Zenkaku/Hankaku", [KEY_102ND] = "102nd",
+        [KEY_F11] = "F11",                      [KEY_F12] = "F12",
+        [KEY_RO] = "RO",                        [KEY_KATAKANA] = "Katakana",
+        [KEY_HIRAGANA] = "HIRAGANA",            [KEY_HENKAN] = "Henkan",
+        [KEY_KATAKANAHIRAGANA] = "Katakana/Hiragana", [KEY_MUHENKAN] = "Muhenkan",
+        [KEY_KPJPCOMMA] = "KPJpComma",          [KEY_KPENTER] = "KPEnter",
+        [KEY_RIGHTCTRL] = "RightCtrl",          [KEY_KPSLASH] = "KPSlash",
+        [KEY_SYSRQ] = "SysRq",                  [KEY_RIGHTALT] = "RightAlt",
+        [KEY_LINEFEED] = "LineFeed",            [KEY_HOME] = "Home",
+        [KEY_UP] = "Up",                        [KEY_PAGEUP] = "PageUp",
+        [KEY_LEFT] = "Left",                    [KEY_RIGHT] = "Right",
+        [KEY_END] = "End",                      [KEY_DOWN] = "Down",
+        [KEY_PAGEDOWN] = "PageDown",            [KEY_INSERT] = "Insert",
+        [KEY_DELETE] = "Delete",                [KEY_MACRO] = "Macro",
+        [KEY_MUTE] = "Mute",                    [KEY_VOLUMEDOWN] = "VolumeDown",
+        [KEY_VOLUMEUP] = "VolumeUp",            [KEY_POWER] = "Power",
+        [KEY_KPEQUAL] = "KPEqual",              [KEY_KPPLUSMINUS] = "KPPlusMinus",
+        [KEY_PAUSE] = "Pause",                  [KEY_KPCOMMA] = "KPComma",
+        [KEY_HANGUEL] = "Hangeul",              [KEY_HANJA] = "Hanja",
+        [KEY_YEN] = "Yen",                      [KEY_LEFTMETA] = "LeftMeta",
+        [KEY_RIGHTMETA] = "RightMeta",          [KEY_COMPOSE] = "Compose",
+        [KEY_STOP] = "Stop",                    [KEY_AGAIN] = "Again",
+        [KEY_PROPS] = "Props",                  [KEY_UNDO] = "Undo",
+        [KEY_FRONT] = "Front",                  [KEY_COPY] = "Copy",
+        [KEY_OPEN] = "Open",                    [KEY_PASTE] = "Paste",
+        [KEY_FIND] = "Find",                    [KEY_CUT] = "Cut",
+        [KEY_HELP] = "Help",                    [KEY_MENU] = "Menu",
+        [KEY_CALC] = "Calc",                    [KEY_SETUP] = "Setup",
+        [KEY_SLEEP] = "Sleep",                  [KEY_WAKEUP] = "WakeUp",
+        [KEY_FILE] = "File",                    [KEY_SENDFILE] = "SendFile",
+        [KEY_DELETEFILE] = "DeleteFile",        [KEY_XFER] = "X-fer",
+        [KEY_PROG1] = "Prog1",                  [KEY_PROG2] = "Prog2",
+        [KEY_WWW] = "WWW",                      [KEY_MSDOS] = "MSDOS",
+        [KEY_COFFEE] = "Coffee",                [KEY_DIRECTION] = "Direction",
+        [KEY_CYCLEWINDOWS] = "CycleWindows",    [KEY_MAIL] = "Mail",
+        [KEY_BOOKMARKS] = "Bookmarks",          [KEY_COMPUTER] = "Computer",
+        [KEY_BACK] = "Back",                    [KEY_FORWARD] = "Forward",
+        [KEY_CLOSECD] = "CloseCD",              [KEY_EJECTCD] = "EjectCD",
+        [KEY_EJECTCLOSECD] = "EjectCloseCD",    [KEY_NEXTSONG] = "NextSong",
+        [KEY_PLAYPAUSE] = "PlayPause",          [KEY_PREVIOUSSONG] = "PreviousSong",
+        [KEY_STOPCD] = "StopCD",                [KEY_RECORD] = "Record",
+        [KEY_REWIND] = "Rewind",                [KEY_PHONE] = "Phone",
+        [KEY_ISO] = "ISOKey",                   [KEY_CONFIG] = "Config",
+        [KEY_HOMEPAGE] = "HomePage",            [KEY_REFRESH] = "Refresh",
+        [KEY_EXIT] = "Exit",                    [KEY_MOVE] = "Move",
+        [KEY_EDIT] = "Edit",                    [KEY_SCROLLUP] = "ScrollUp",
+        [KEY_SCROLLDOWN] = "ScrollDown",        [KEY_KPLEFTPAREN] = "KPLeftParenthesis",
+        [KEY_KPRIGHTPAREN] = "KPRightParenthesis", [KEY_NEW] = "New",
+        [KEY_REDO] = "Redo",                    [KEY_F13] = "F13",
+        [KEY_F14] = "F14",                      [KEY_F15] = "F15",
+        [KEY_F16] = "F16",                      [KEY_F17] = "F17",
+        [KEY_F18] = "F18",                      [KEY_F19] = "F19",
+        [KEY_F20] = "F20",                      [KEY_F21] = "F21",
+        [KEY_F22] = "F22",                      [KEY_F23] = "F23",
+        [KEY_F24] = "F24",                      [KEY_PLAYCD] = "PlayCD",
+        [KEY_PAUSECD] = "PauseCD",              [KEY_PROG3] = "Prog3",
+        [KEY_PROG4] = "Prog4",                  [KEY_SUSPEND] = "Suspend",
+        [KEY_CLOSE] = "Close",                  [KEY_PLAY] = "Play",
+        [KEY_FASTFORWARD] = "FastForward",      [KEY_BASSBOOST] = "BassBoost",
+        [KEY_PRINT] = "Print",                  [KEY_HP] = "HP",
+        [KEY_CAMERA] = "Camera",                [KEY_SOUND] = "Sound",
+        [KEY_QUESTION] = "Question",            [KEY_EMAIL] = "Email",
+        [KEY_CHAT] = "Chat",                    [KEY_SEARCH] = "Search",
+        [KEY_CONNECT] = "Connect",              [KEY_FINANCE] = "Finance",
+        [KEY_SPORT] = "Sport",                  [KEY_SHOP] = "Shop",
+        [KEY_ALTERASE] = "AlternateErase",      [KEY_CANCEL] = "Cancel",
+        [KEY_BRIGHTNESSDOWN] = "BrightnessDown", [KEY_BRIGHTNESSUP] = "BrightnessUp",
+        [KEY_MEDIA] = "Media",                  [KEY_UNKNOWN] = "Unknown",
+        [BTN_0] = "Btn0",                       [BTN_1] = "Btn1",
+        [BTN_2] = "Btn2",                       [BTN_3] = "Btn3",
+        [BTN_4] = "Btn4",                       [BTN_5] = "Btn5",
+        [BTN_6] = "Btn6",                       [BTN_7] = "Btn7",
+        [BTN_8] = "Btn8",                       [BTN_9] = "Btn9",
+        [BTN_LEFT] = "LeftBtn",                 [BTN_RIGHT] = "RightBtn",
+        [BTN_MIDDLE] = "MiddleBtn",             [BTN_SIDE] = "SideBtn",
+        [BTN_EXTRA] = "ExtraBtn",               [BTN_FORWARD] = "ForwardBtn",
+        [BTN_BACK] = "BackBtn",                 [BTN_TASK] = "TaskBtn",
+        [BTN_TRIGGER] = "Trigger",              [BTN_THUMB] = "ThumbBtn",
+        [BTN_THUMB2] = "ThumbBtn2",             [BTN_TOP] = "TopBtn",
+        [BTN_TOP2] = "TopBtn2",                 [BTN_PINKIE] = "PinkieBtn",
+        [BTN_BASE] = "BaseBtn",                 [BTN_BASE2] = "BaseBtn2",
+        [BTN_BASE3] = "BaseBtn3",               [BTN_BASE4] = "BaseBtn4",
+        [BTN_BASE5] = "BaseBtn5",               [BTN_BASE6] = "BaseBtn6",
+        [BTN_DEAD] = "BtnDead",                 [BTN_A] = "BtnA",
+        [BTN_B] = "BtnB",                       [BTN_C] = "BtnC",
+        [BTN_X] = "BtnX",                       [BTN_Y] = "BtnY",
+        [BTN_Z] = "BtnZ",                       [BTN_TL] = "BtnTL",
+        [BTN_TR] = "BtnTR",                     [BTN_TL2] = "BtnTL2",
+        [BTN_TR2] = "BtnTR2",                   [BTN_SELECT] = "BtnSelect",
+        [BTN_START] = "BtnStart",               [BTN_MODE] = "BtnMode",
+        [BTN_THUMBL] = "BtnThumbL",             [BTN_THUMBR] = "BtnThumbR",
+        [BTN_TOOL_PEN] = "ToolPen",             [BTN_TOOL_RUBBER] = "ToolRubber",
+        [BTN_TOOL_BRUSH] = "ToolBrush",         [BTN_TOOL_PENCIL] = "ToolPencil",
+        [BTN_TOOL_AIRBRUSH] = "ToolAirbrush",   [BTN_TOOL_FINGER] = "ToolFinger",
+        [BTN_TOOL_MOUSE] = "ToolMouse",         [BTN_TOOL_LENS] = "ToolLens",
+        [BTN_TOUCH] = "Touch",                  [BTN_STYLUS] = "Stylus",
+        [BTN_STYLUS2] = "Stylus2",              [BTN_TOOL_DOUBLETAP] = "ToolDoubleTap",
+        [BTN_TOOL_TRIPLETAP] = "ToolTripleTap", [BTN_GEAR_DOWN] = "WheelBtn",
+        [BTN_GEAR_UP] = "Gear up",              [KEY_OK] = "Ok",
+        [KEY_SELECT] = "Select",                [KEY_GOTO] = "Goto",
+        [KEY_CLEAR] = "Clear",                  [KEY_POWER2] = "Power2",
+        [KEY_OPTION] = "Option",                [KEY_INFO] = "Info",
+        [KEY_TIME] = "Time",                    [KEY_VENDOR] = "Vendor",
+        [KEY_ARCHIVE] = "Archive",              [KEY_PROGRAM] = "Program",
+        [KEY_CHANNEL] = "Channel",              [KEY_FAVORITES] = "Favorites",
+        [KEY_EPG] = "EPG",                      [KEY_PVR] = "PVR",
+        [KEY_MHP] = "MHP",                      [KEY_LANGUAGE] = "Language",
+        [KEY_TITLE] = "Title",                  [KEY_SUBTITLE] = "Subtitle",
+        [KEY_ANGLE] = "Angle",                  [KEY_ZOOM] = "Zoom",
+        [KEY_MODE] = "Mode",                    [KEY_KEYBOARD] = "Keyboard",
+        [KEY_SCREEN] = "Screen",                [KEY_PC] = "PC",
+        [KEY_TV] = "TV",                        [KEY_TV2] = "TV2",
+        [KEY_VCR] = "VCR",                      [KEY_VCR2] = "VCR2",
+        [KEY_SAT] = "Sat",                      [KEY_SAT2] = "Sat2",
+        [KEY_CD] = "CD",                        [KEY_TAPE] = "Tape",
+        [KEY_RADIO] = "Radio",                  [KEY_TUNER] = "Tuner",
+        [KEY_PLAYER] = "Player",                [KEY_TEXT] = "Text",
+        [KEY_DVD] = "DVD",                      [KEY_AUX] = "Aux",
+        [KEY_MP3] = "MP3",                      [KEY_AUDIO] = "Audio",
+        [KEY_VIDEO] = "Video",                  [KEY_DIRECTORY] = "Directory",
+        [KEY_LIST] = "List",                    [KEY_MEMO] = "Memo",
+        [KEY_CALENDAR] = "Calendar",            [KEY_RED] = "Red",
+        [KEY_GREEN] = "Green",                  [KEY_YELLOW] = "Yellow",
+        [KEY_BLUE] = "Blue",                    [KEY_CHANNELUP] = "ChannelUp",
+        [KEY_CHANNELDOWN] = "ChannelDown",      [KEY_FIRST] = "First",
+        [KEY_LAST] = "Last",                    [KEY_AB] = "AB",
+        [KEY_NEXT] = "Next",                    [KEY_RESTART] = "Restart",
+        [KEY_SLOW] = "Slow",                    [KEY_SHUFFLE] = "Shuffle",
+        [KEY_BREAK] = "Break",                  [KEY_PREVIOUS] = "Previous",
+        [KEY_DIGITS] = "Digits",                [KEY_TEEN] = "TEEN",
+        [KEY_TWEN] = "TWEN",                    [KEY_DEL_EOL] = "DeleteEOL",
+        [KEY_DEL_EOS] = "DeleteEOS",            [KEY_INS_LINE] = "InsertLine",
+        [KEY_DEL_LINE] = "DeleteLine",
+        [KEY_SEND] = "Send",                    [KEY_REPLY] = "Reply",
+        [KEY_FORWARDMAIL] = "ForwardMail",      [KEY_SAVE] = "Save",
+        [KEY_DOCUMENTS] = "Documents",
+        [KEY_FN] = "Fn",                        [KEY_FN_ESC] = "Fn+ESC",
+        [KEY_FN_1] = "Fn+1",                    [KEY_FN_2] = "Fn+2",
+        [KEY_FN_B] = "Fn+B",                    [KEY_FN_D] = "Fn+D",
+        [KEY_FN_E] = "Fn+E",                    [KEY_FN_F] = "Fn+F",
+        [KEY_FN_S] = "Fn+S",
+        [KEY_FN_F1] = "Fn+F1",                  [KEY_FN_F2] = "Fn+F2",
+        [KEY_FN_F3] = "Fn+F3",                  [KEY_FN_F4] = "Fn+F4",
+        [KEY_FN_F5] = "Fn+F5",                  [KEY_FN_F6] = "Fn+F6",
+        [KEY_FN_F7] = "Fn+F7",                  [KEY_FN_F8] = "Fn+F8",
+        [KEY_FN_F9] = "Fn+F9",                  [KEY_FN_F10] = "Fn+F10",
+        [KEY_FN_F11] = "Fn+F11",                [KEY_FN_F12] = "Fn+F12",
+        [KEY_KBDILLUMTOGGLE] = "KbdIlluminationToggle",
+        [KEY_KBDILLUMDOWN] = "KbdIlluminationDown",
+        [KEY_KBDILLUMUP] = "KbdIlluminationUp",
+        [KEY_SWITCHVIDEOMODE] = "SwitchVideoMode",
+};
+
+static char *relatives[REL_MAX + 1] = {
+        [REL_X] = "X",                  [REL_Y] = "Y",
+        [REL_Z] = "Z",                  [REL_HWHEEL] = "HWheel",
+        [REL_DIAL] = "Dial",            [REL_WHEEL] = "Wheel",
+        [REL_MISC] = "Misc",
+};
+
+static char *absolutes[ABS_MAX + 1] = {
+        [ABS_X] = "X",                  [ABS_Y] = "Y",
+        [ABS_Z] = "Z",                  [ABS_RX] = "Rx",
+        [ABS_RY] = "Ry",                [ABS_RZ] = "Rz",
+        [ABS_THROTTLE] = "Throttle",    [ABS_RUDDER] = "Rudder",
+        [ABS_WHEEL] = "Wheel",          [ABS_GAS] = "Gas",
+        [ABS_BRAKE] = "Brake",          [ABS_HAT0X] = "Hat0X",
+        [ABS_HAT0Y] = "Hat0Y",          [ABS_HAT1X] = "Hat1X",
+        [ABS_HAT1Y] = "Hat1Y",          [ABS_HAT2X] = "Hat2X",
+        [ABS_HAT2Y] = "Hat2Y",          [ABS_HAT3X] = "Hat3X",
+        [ABS_HAT3Y] = "Hat 3Y",         [ABS_PRESSURE] = "Pressure",
+        [ABS_DISTANCE] = "Distance",    [ABS_TILT_X] = "XTilt",
+        [ABS_TILT_Y] = "YTilt",         [ABS_TOOL_WIDTH] = "Tool Width",
+        [ABS_VOLUME] = "Volume",        [ABS_MISC] = "Misc",
+};
+
+static char *misc[MSC_MAX + 1] = {
+        [MSC_SERIAL] = "Serial",        [MSC_PULSELED] = "Pulseled",
+        [MSC_GESTURE] = "Gesture",      [MSC_RAW] = "RawData"
+};
+
+static char *leds[LED_MAX + 1] = {
+        [LED_NUML] = "NumLock",         [LED_CAPSL] = "CapsLock",
+        [LED_SCROLLL] = "ScrollLock",   [LED_COMPOSE] = "Compose",
+        [LED_KANA] = "Kana",            [LED_SLEEP] = "Sleep",
+        [LED_SUSPEND] = "Suspend",      [LED_MUTE] = "Mute",
+        [LED_MISC] = "Misc",
+};
+
+static char *repeats[REP_MAX + 1] = {
+        [REP_DELAY] = "Delay",          [REP_PERIOD] = "Period"
+};
+
+static char *sounds[SND_MAX + 1] = {
+        [SND_CLICK] = "Click",          [SND_BELL] = "Bell",
+        [SND_TONE] = "Tone"
+};
+
+static char **names[EV_MAX + 1] = {
+        [EV_SYN] = syncs,                       [EV_KEY] = keys,
+        [EV_REL] = relatives,                   [EV_ABS] = absolutes,
+        [EV_MSC] = misc,                        [EV_LED] = leds,
+        [EV_SND] = sounds,                      [EV_REP] = repeats,
+};
+
+static void __attribute__((unused)) resolv_event(__u8 type, __u16 code) {
+
+        printk("%s.%s", events[type] ? events[type] : "?",
+                names[type] ? (names[type][code] ? names[type][code] : "?") : "?");
+}
diff --git a/include/linux/hid.h b/include/linux/hid.h
new file mode 100644
index 00000000000..770120add15
--- /dev/null
+++ b/include/linux/hid.h
@@ -0,0 +1,528 @@
+#ifndef __HID_H
+#define __HID_H
+
+/*
+ * $Id: hid.h,v 1.24 2001/12/27 10:37:41 vojtech Exp $
+ *
+ *  Copyright (c) 1999 Andreas Gal
+ *  Copyright (c) 2000-2001 Vojtech Pavlik
+ *  Copyright (c) 2006 Jiri Kosina
+ */
+
+/*
+ * 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
+ *
+ * Should you need to contact me, the author, you can do so either by
+ * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
+ * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
+ */
+
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
+#include <linux/input.h>
+
+/*
+ * USB HID (Human Interface Device) interface class code
+ */
+
+#define USB_INTERFACE_CLASS_HID         3
+
+/*
+ * USB HID interface subclass and protocol codes
+ */
+
+#define USB_INTERFACE_SUBCLASS_BOOT     1
+#define USB_INTERFACE_PROTOCOL_KEYBOARD 1
+#define USB_INTERFACE_PROTOCOL_MOUSE    2
+
+/*
+ * HID class requests
+ */
+
+#define HID_REQ_GET_REPORT              0x01
+#define HID_REQ_GET_IDLE                0x02
+#define HID_REQ_GET_PROTOCOL            0x03
+#define HID_REQ_SET_REPORT              0x09
+#define HID_REQ_SET_IDLE                0x0A
+#define HID_REQ_SET_PROTOCOL            0x0B
+
+/*
+ * HID class descriptor types
+ */
+
+#define HID_DT_HID                      (USB_TYPE_CLASS | 0x01)
+#define HID_DT_REPORT                   (USB_TYPE_CLASS | 0x02)
+#define HID_DT_PHYSICAL                 (USB_TYPE_CLASS | 0x03)
+
+/*
+ * We parse each description item into this structure. Short items data
+ * values are expanded to 32-bit signed int, long items contain a pointer
+ * into the data area.
+ */
+
+struct hid_item {
+        unsigned  format;
+        __u8      size;
+        __u8      type;
+        __u8      tag;
+        union {
+            __u8   u8;
+            __s8   s8;
+            __u16  u16;
+            __s16  s16;
+            __u32  u32;
+            __s32  s32;
+            __u8  *longdata;
+        } data;
+};
+
+/*
+ * HID report item format
+ */
+
+#define HID_ITEM_FORMAT_SHORT   0
+#define HID_ITEM_FORMAT_LONG    1
+
+/*
+ * Special tag indicating long items
+ */
+
+#define HID_ITEM_TAG_LONG       15
+
+/*
+ * HID report descriptor item type (prefix bit 2,3)
+ */
+
+#define HID_ITEM_TYPE_MAIN              0
+#define HID_ITEM_TYPE_GLOBAL            1
+#define HID_ITEM_TYPE_LOCAL             2
+#define HID_ITEM_TYPE_RESERVED          3
+
+/*
+ * HID report descriptor main item tags
+ */
+
+#define HID_MAIN_ITEM_TAG_INPUT                 8
+#define HID_MAIN_ITEM_TAG_OUTPUT                9
+#define HID_MAIN_ITEM_TAG_FEATURE               11
+#define HID_MAIN_ITEM_TAG_BEGIN_COLLECTION      10
+#define HID_MAIN_ITEM_TAG_END_COLLECTION        12
+
+/*
+ * HID report descriptor main item contents
+ */
+
+#define HID_MAIN_ITEM_CONSTANT          0x001
+#define HID_MAIN_ITEM_VARIABLE          0x002
+#define HID_MAIN_ITEM_RELATIVE          0x004
+#define HID_MAIN_ITEM_WRAP              0x008
+#define HID_MAIN_ITEM_NONLINEAR         0x010
+#define HID_MAIN_ITEM_NO_PREFERRED      0x020
+#define HID_MAIN_ITEM_NULL_STATE        0x040
+#define HID_MAIN_ITEM_VOLATILE          0x080
+#define HID_MAIN_ITEM_BUFFERED_BYTE     0x100
+
+/*
+ * HID report descriptor collection item types
+ */
+
+#define HID_COLLECTION_PHYSICAL         0
+#define HID_COLLECTION_APPLICATION      1
+#define HID_COLLECTION_LOGICAL          2
+
+/*
+ * HID report descriptor global item tags
+ */
+
+#define HID_GLOBAL_ITEM_TAG_USAGE_PAGE          0
+#define HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM     1
+#define HID_GLOBAL_ITEM_TAG_LOGICAL_MAXIMUM     2
+#define HID_GLOBAL_ITEM_TAG_PHYSICAL_MINIMUM    3
+#define HID_GLOBAL_ITEM_TAG_PHYSICAL_MAXIMUM    4
+#define HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT       5
+#define HID_GLOBAL_ITEM_TAG_UNIT                6
+#define HID_GLOBAL_ITEM_TAG_REPORT_SIZE         7
+#define HID_GLOBAL_ITEM_TAG_REPORT_ID           8
+#define HID_GLOBAL_ITEM_TAG_REPORT_COUNT        9
+#define HID_GLOBAL_ITEM_TAG_PUSH                10
+#define HID_GLOBAL_ITEM_TAG_POP                 11
+
+/*
+ * HID report descriptor local item tags
+ */
+
+#define HID_LOCAL_ITEM_TAG_USAGE                0
+#define HID_LOCAL_ITEM_TAG_USAGE_MINIMUM        1
+#define HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM        2
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_INDEX     3
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_MINIMUM   4
+#define HID_LOCAL_ITEM_TAG_DESIGNATOR_MAXIMUM   5
+#define HID_LOCAL_ITEM_TAG_STRING_INDEX         7
+#define HID_LOCAL_ITEM_TAG_STRING_MINIMUM       8
+#define HID_LOCAL_ITEM_TAG_STRING_MAXIMUM       9
+#define HID_LOCAL_ITEM_TAG_DELIMITER            10
+
+/*
+ * HID usage tables
+ */
+
+#define HID_USAGE_PAGE          0xffff0000
+
+#define HID_UP_UNDEFINED        0x00000000
+#define HID_UP_GENDESK          0x00010000
+#define HID_UP_SIMULATION       0x00020000
+#define HID_UP_KEYBOARD         0x00070000
+#define HID_UP_LED              0x00080000
+#define HID_UP_BUTTON           0x00090000
+#define HID_UP_ORDINAL          0x000a0000
+#define HID_UP_CONSUMER         0x000c0000
+#define HID_UP_DIGITIZER        0x000d0000
+#define HID_UP_PID              0x000f0000
+#define HID_UP_HPVENDOR         0xff7f0000
+#define HID_UP_MSVENDOR         0xff000000
+#define HID_UP_CUSTOM           0x00ff0000
+#define HID_UP_LOGIVENDOR       0xffbc0000
+
+#define HID_USAGE               0x0000ffff
+
+#define HID_GD_POINTER          0x00010001
+#define HID_GD_MOUSE            0x00010002
+#define HID_GD_JOYSTICK         0x00010004
+#define HID_GD_GAMEPAD          0x00010005
+#define HID_GD_KEYBOARD         0x00010006
+#define HID_GD_KEYPAD           0x00010007
+#define HID_GD_MULTIAXIS        0x00010008
+#define HID_GD_X                0x00010030
+#define HID_GD_Y                0x00010031
+#define HID_GD_Z                0x00010032
+#define HID_GD_RX               0x00010033
+#define HID_GD_RY               0x00010034
+#define HID_GD_RZ               0x00010035
+#define HID_GD_SLIDER           0x00010036
+#define HID_GD_DIAL             0x00010037
+#define HID_GD_WHEEL            0x00010038
+#define HID_GD_HATSWITCH        0x00010039
+#define HID_GD_BUFFER           0x0001003a
+#define HID_GD_BYTECOUNT        0x0001003b
+#define HID_GD_MOTION           0x0001003c
+#define HID_GD_START            0x0001003d
+#define HID_GD_SELECT           0x0001003e
+#define HID_GD_VX               0x00010040
+#define HID_GD_VY               0x00010041
+#define HID_GD_VZ               0x00010042
+#define HID_GD_VBRX             0x00010043
+#define HID_GD_VBRY             0x00010044
+#define HID_GD_VBRZ             0x00010045
+#define HID_GD_VNO              0x00010046
+#define HID_GD_FEATURE          0x00010047
+#define HID_GD_UP               0x00010090
+#define HID_GD_DOWN             0x00010091
+#define HID_GD_RIGHT            0x00010092
+#define HID_GD_LEFT             0x00010093
+
+/*
+ * HID report types --- Ouch! HID spec says 1 2 3!
+ */
+
+#define HID_INPUT_REPORT        0
+#define HID_OUTPUT_REPORT       1
+#define HID_FEATURE_REPORT      2
+
+/*
+ * HID device quirks.
+ */
+
+#define HID_QUIRK_INVERT                        0x00000001
+#define HID_QUIRK_NOTOUCH                       0x00000002
+#define HID_QUIRK_IGNORE                        0x00000004
+#define HID_QUIRK_NOGET                         0x00000008
+#define HID_QUIRK_HIDDEV                        0x00000010
+#define HID_QUIRK_BADPAD                        0x00000020
+#define HID_QUIRK_MULTI_INPUT                   0x00000040
+#define HID_QUIRK_2WHEEL_MOUSE_HACK_7           0x00000080
+#define HID_QUIRK_2WHEEL_MOUSE_HACK_5           0x00000100
+#define HID_QUIRK_2WHEEL_MOUSE_HACK_ON          0x00000200
+#define HID_QUIRK_MIGHTYMOUSE                   0x00000400
+#define HID_QUIRK_CYMOTION                      0x00000800
+#define HID_QUIRK_POWERBOOK_HAS_FN              0x00001000
+#define HID_QUIRK_POWERBOOK_FN_ON               0x00002000
+#define HID_QUIRK_INVERT_HWHEEL                 0x00004000
+#define HID_QUIRK_POWERBOOK_ISO_KEYBOARD        0x00008000
+#define HID_QUIRK_BAD_RELATIVE_KEYS             0x00010000
+
+/*
+ * This is the global environment of the parser. This information is
+ * persistent for main-items. The global environment can be saved and
+ * restored with PUSH/POP statements.
+ */
+
+struct hid_global {
+        unsigned usage_page;
+        __s32    logical_minimum;
+        __s32    logical_maximum;
+        __s32    physical_minimum;
+        __s32    physical_maximum;
+        __s32    unit_exponent;
+        unsigned unit;
+        unsigned report_id;
+        unsigned report_size;
+        unsigned report_count;
+};
+
+/*
+ * This is the local environment. It is persistent up the next main-item.
+ */
+
+#define HID_MAX_DESCRIPTOR_SIZE         4096
+#define HID_MAX_USAGES                  1024
+#define HID_DEFAULT_NUM_COLLECTIONS     16
+
+struct hid_local {
+        unsigned usage[HID_MAX_USAGES]; /* usage array */
+        unsigned collection_index[HID_MAX_USAGES]; /* collection index array */
+        unsigned usage_index;
+        unsigned usage_minimum;
+        unsigned delimiter_depth;
+        unsigned delimiter_branch;
+};
+
+/*
+ * This is the collection stack. We climb up the stack to determine
+ * application and function of each field.
+ */
+
+struct hid_collection {
+        unsigned type;
+        unsigned usage;
+        unsigned level;
+};
+
+struct hid_usage {
+        unsigned  hid;                  /* hid usage code */
+        unsigned  collection_index;     /* index into collection array */
+        /* hidinput data */
+        __u16     code;                 /* input driver code */
+        __u8      type;                 /* input driver type */
+        __s8      hat_min;              /* hat switch fun */
+        __s8      hat_max;              /* ditto */
+        __s8      hat_dir;              /* ditto */
+};
+
+struct hid_input;
+
+struct hid_field {
+        unsigned  physical;             /* physical usage for this field */
+        unsigned  logical;              /* logical usage for this field */
+        unsigned  application;          /* application usage for this field */
+        struct hid_usage *usage;        /* usage table for this function */
+        unsigned  maxusage;             /* maximum usage index */
+        unsigned  flags;                /* main-item flags (i.e. volatile,array,constant) */
+        unsigned  report_offset;        /* bit offset in the report */
+        unsigned  report_size;          /* size of this field in the report */
+        unsigned  report_count;         /* number of this field in the report */
+        unsigned  report_type;          /* (input,output,feature) */
+        __s32    *value;                /* last known value(s) */
+        __s32     logical_minimum;
+        __s32     logical_maximum;
+        __s32     physical_minimum;
+        __s32     physical_maximum;
+        __s32     unit_exponent;
+        unsigned  unit;
+        struct hid_report *report;      /* associated report */
+        unsigned index;                 /* index into report->field[] */
+        /* hidinput data */
+        struct hid_input *hidinput;     /* associated input structure */
+        __u16 dpad;                     /* dpad input code */
+};
+
+#define HID_MAX_FIELDS 64
+
+struct hid_report {
+        struct list_head list;
+        unsigned id;                                    /* id of this report */
+        unsigned type;                                  /* report type */
+        struct hid_field *field[HID_MAX_FIELDS];        /* fields of the report */
+        unsigned maxfield;                              /* maximum valid field index */
+        unsigned size;                                  /* size of the report (bits) */
+        struct hid_device *device;                      /* associated device */
+};
+
+struct hid_report_enum {
+        unsigned numbered;
+        struct list_head report_list;
+        struct hid_report *report_id_hash[256];
+};
+
+#define HID_REPORT_TYPES 3
+
+#define HID_MIN_BUFFER_SIZE     64              /* make sure there is at least a packet size of space */
+#define HID_MAX_BUFFER_SIZE     4096            /* 4kb */
+#define HID_CONTROL_FIFO_SIZE   256             /* to init devices with >100 reports */
+#define HID_OUTPUT_FIFO_SIZE    64
+
+struct hid_control_fifo {
+        unsigned char dir;
+        struct hid_report *report;
+};
+
+#define HID_CLAIMED_INPUT       1
+#define HID_CLAIMED_HIDDEV      2
+
+#define HID_CTRL_RUNNING        1
+#define HID_OUT_RUNNING         2
+#define HID_IN_RUNNING          3
+#define HID_RESET_PENDING       4
+#define HID_SUSPENDED           5
+#define HID_CLEAR_HALT          6
+
+struct hid_input {
+        struct list_head list;
+        struct hid_report *report;
+        struct input_dev *input;
+};
+
+struct hid_device {                                                     /* device report descriptor */
+         __u8 *rdesc;
+        unsigned rsize;
+        struct hid_collection *collection;                              /* List of HID collections */
+        unsigned collection_size;                                       /* Number of allocated hid_collections */
+        unsigned maxcollection;                                         /* Number of parsed collections */
+        unsigned maxapplication;                                        /* Number of applications */
+        unsigned short bus;                                             /* BUS ID */
+        unsigned short vendor;                                          /* Vendor ID */
+        unsigned short product;                                         /* Product ID */
+        unsigned version;                                               /* HID version */
+        unsigned country;                                               /* HID country */
+        struct hid_report_enum report_enum[HID_REPORT_TYPES];
+
+        struct device *dev;                                             /* device */
+
+        unsigned claimed;                                               /* Claimed by hidinput, hiddev? */
+        unsigned quirks;                                                /* Various quirks the device can pull on us */
+
+        struct list_head inputs;                                        /* The list of inputs */
+        void *hiddev;                                                   /* The hiddev structure */
+        int minor;                                                      /* Hiddev minor number */
+
+        wait_queue_head_t wait;                                         /* For sleeping */
+
+        int open;                                                       /* is the device open by anyone? */
+        char name[128];                                                 /* Device name */
+        char phys[64];                                                  /* Device physical location */
+        char uniq[64];                                                  /* Device unique identifier (serial #) */
+
+        void *driver_data;
+
+        /* device-specific function pointers */
+        int (*hidinput_input_event) (struct input_dev *, unsigned int, unsigned int, int);
+        int (*hidinput_open) (struct input_dev *);
+        void (*hidinput_close) (struct input_dev *);
+
+        /* hiddev event handler */
+        void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field,
+                                  struct hid_usage *, __s32);
+        void (*hiddev_report_event) (struct hid_device *, struct hid_report *);
+#ifdef CONFIG_USB_HIDINPUT_POWERBOOK
+        unsigned int  pb_fnmode;
+        unsigned long pb_pressed_fn[NBITS(KEY_MAX)];
+        unsigned long pb_pressed_numlock[NBITS(KEY_MAX)];
+#endif
+};
+
+#define HID_GLOBAL_STACK_SIZE 4
+#define HID_COLLECTION_STACK_SIZE 4
+
+struct hid_parser {
+        struct hid_global     global;
+        struct hid_global     global_stack[HID_GLOBAL_STACK_SIZE];
+        unsigned              global_stack_ptr;
+        struct hid_local      local;
+        unsigned              collection_stack[HID_COLLECTION_STACK_SIZE];
+        unsigned              collection_stack_ptr;
+        struct hid_device    *device;
+};
+
+struct hid_class_descriptor {
+        __u8  bDescriptorType;
+        __u16 wDescriptorLength;
+} __attribute__ ((packed));
+
+struct hid_descriptor {
+        __u8  bLength;
+        __u8  bDescriptorType;
+        __u16 bcdHID;
+        __u8  bCountryCode;
+        __u8  bNumDescriptors;
+
+        struct hid_class_descriptor desc[1];
+} __attribute__ ((packed));
+
+#ifdef DEBUG
+#include "hid-debug.h"
+#else
+#define hid_dump_input(a,b)     do { } while (0)
+#define hid_dump_device(c)      do { } while (0)
+#define hid_dump_field(a,b)     do { } while (0)
+#define resolv_usage(a)         do { } while (0)
+#define resolv_event(a,b)       do { } while (0)
+#endif
+
+/* Applications from HID Usage Tables 4/8/99 Version 1.1 */
+/* We ignore a few input applications that are not widely used */
+#define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001))
+
+/* HID core API */
+extern void hidinput_hid_event(struct hid_device *, struct hid_field *, struct hid_usage *, __s32);
+extern void hidinput_report_event(struct hid_device *hid, struct hid_report *report);
+extern int hidinput_connect(struct hid_device *);
+extern void hidinput_disconnect(struct hid_device *);
+
+int hid_set_field(struct hid_field *, unsigned, __s32);
+int hid_input_report(struct hid_device *, int type, u8 *, int, int);
+int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field);
+void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt);
+void hid_output_report(struct hid_report *report, __u8 *data);
+void hid_free_device(struct hid_device *device);
+struct hid_device *hid_parse_report(__u8 *start, unsigned size);
+
+#ifdef CONFIG_HID_FF
+int hid_ff_init(struct hid_device *hid);
+
+int hid_lgff_init(struct hid_device *hid);
+int hid_tmff_init(struct hid_device *hid);
+int hid_zpff_init(struct hid_device *hid);
+#ifdef CONFIG_HID_PID
+int hid_pidff_init(struct hid_device *hid);
+#else
+static inline int hid_pidff_init(struct hid_device *hid) { return -ENODEV; }
+#endif
+
+#else
+static inline int hid_ff_init(struct hid_device *hid) { return -1; }
+#endif
+#ifdef DEBUG
+#define dbg(format, arg...) printk(KERN_DEBUG "%s: " format "\n" , \
+                __FILE__ , ## arg)
+#else
+#define dbg(format, arg...) do {} while (0)
+#endif
+
+#define err(format, arg...) printk(KERN_ERR "%s: " format "\n" , \
+                __FILE__ , ## arg)
+#endif
+
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index fd7d12daa94..645d440807c 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -3,11 +3,12 @@
 
 #include <linux/fs.h>
 #include <linux/mm.h>
+#include <linux/uaccess.h>
 
 #include <asm/cacheflush.h>
 
 #ifndef ARCH_HAS_FLUSH_ANON_PAGE
-static inline void flush_anon_page(struct page *page, unsigned long vmaddr)
+static inline void flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long vmaddr)
 {
 }
 #endif
@@ -41,9 +42,10 @@ static inline void *kmap(struct page *page)
 
 #define kunmap(page) do { (void) (page); } while (0)
 
-#define kmap_atomic(page, idx)          page_address(page)
-#define kunmap_atomic(addr, idx)        do { } while (0)
-#define kmap_atomic_pfn(pfn, idx)       page_address(pfn_to_page(pfn))
+#define kmap_atomic(page, idx) \
+        ({ pagefault_disable(); page_address(page); })
+#define kunmap_atomic(addr, idx)        do { pagefault_enable(); } while (0)
+#define kmap_atomic_pfn(pfn, idx)       kmap_atomic(pfn_to_page(pfn), (idx))
 #define kmap_atomic_to_page(ptr)        virt_to_page(ptr)
 #endif
 
@@ -94,7 +96,10 @@ static inline void memclear_highpage_flush(struct page *page, unsigned int offse
         kunmap_atomic(kaddr, KM_USER0);
 }
 
-static inline void copy_user_highpage(struct page *to, struct page *from, unsigned long vaddr)
+#ifndef __HAVE_ARCH_COPY_USER_HIGHPAGE
+
+static inline void copy_user_highpage(struct page *to, struct page *from,
+        unsigned long vaddr, struct vm_area_struct *vma)
 {
         char *vfrom, *vto;
 
@@ -107,6 +112,8 @@ static inline void copy_user_highpage(struct page *to, struct page *from, unsign
         smp_wmb();
 }
 
+#endif
+
 static inline void copy_highpage(struct page *to, struct page *from)
 {
         char *vfrom, *vto;
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index ace64e57e17..a60995afe33 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -35,6 +35,7 @@ extern int sysctl_hugetlb_shm_group;
 
 pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr);
 pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr);
+int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep);
 struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address,
                               int write);
 struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
diff --git a/include/linux/i2c-algo-bit.h b/include/linux/i2c-algo-bit.h
index c8f8df25c7e..937da70cb4c 100644
--- a/include/linux/i2c-algo-bit.h
+++ b/include/linux/i2c-algo-bit.h
@@ -26,9 +26,9 @@
 
 /* --- Defines for bit-adapters --------------------------------------- */
 /*
- * This struct contains the hw-dependent functions of bit-style adapters to 
+ * This struct contains the hw-dependent functions of bit-style adapters to
  * manipulate the line states, and to init any hw-specific features. This is
- * only used if you have more than one hw-type of adapter running. 
+ * only used if you have more than one hw-type of adapter running.
  */
 struct i2c_algo_bit_data {
         void *data;             /* private data for lowlevel routines */
@@ -44,6 +44,5 @@ struct i2c_algo_bit_data {
 };
 
 int i2c_bit_add_bus(struct i2c_adapter *);
-int i2c_bit_del_bus(struct i2c_adapter *);
 
 #endif /* _LINUX_I2C_ALGO_BIT_H */
diff --git a/include/linux/i2c-algo-ite.h b/include/linux/i2c-algo-ite.h
deleted file mode 100644
index 0073fe96c76..00000000000
--- a/include/linux/i2c-algo-ite.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ------------------------------------------------------------------------- */
-/* i2c-algo-ite.h i2c driver algorithms for ITE IIC adapters                 */
-/* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995-97 Simon G. Vogl
-                   1998-99 Hans Berglund
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
-/* ------------------------------------------------------------------------- */
-
-/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
-   Frodo Looijaard <frodol@dds.nl> */
-
-/* Modifications by MontaVista Software, 2001
-   Changes made to support the ITE IIC peripheral */
-
-
-#ifndef I2C_ALGO_ITE_H
-#define I2C_ALGO_ITE_H 1
-
-#include <linux/types.h>
-
-/* Example of a sequential read request:
-        struct i2c_iic_msg s_msg; 
-
-        s_msg.addr=device_address;
-        s_msg.len=length;
-        s_msg.buf=buffer;
-        s_msg.waddr=word_address;
-        ioctl(file,I2C_SREAD, &s_msg);
- */
-#define I2C_SREAD       0x780   /* SREAD ioctl command */
-
-struct i2c_iic_msg {
-        __u16 addr;     /* device address */
-        __u16 waddr;    /* word address */
-        short len;      /* msg length */
-        char *buf;      /* pointer to msg data */
-};
-
-#ifdef __KERNEL__
-struct i2c_adapter;
-
-struct i2c_algo_iic_data {
-        void *data;             /* private data for lolevel routines    */
-        void (*setiic) (void *data, int ctl, int val);
-        int  (*getiic) (void *data, int ctl);
-        int  (*getown) (void *data);
-        int  (*getclock) (void *data);
-        void (*waitforpin) (void);     
-
-        /* local settings */
-        int udelay;
-        int mdelay;
-        int timeout;
-};
-
-int i2c_iic_add_bus(struct i2c_adapter *);
-int i2c_iic_del_bus(struct i2c_adapter *);
-#endif /* __KERNEL__ */
-#endif /* I2C_ALGO_ITE_H */
diff --git a/include/linux/i2c-algo-pca.h b/include/linux/i2c-algo-pca.h
index 226693e0d88..fce47c051bb 100644
--- a/include/linux/i2c-algo-pca.h
+++ b/include/linux/i2c-algo-pca.h
@@ -10,6 +10,5 @@ struct i2c_algo_pca_data {
 };
 
 int i2c_pca_add_bus(struct i2c_adapter *);
-int i2c_pca_del_bus(struct i2c_adapter *);
 
 #endif /* _LINUX_I2C_ALGO_PCA_H */
diff --git a/include/linux/i2c-algo-pcf.h b/include/linux/i2c-algo-pcf.h
index 9908f3fc483..994eb86f882 100644
--- a/include/linux/i2c-algo-pcf.h
+++ b/include/linux/i2c-algo-pcf.h
@@ -31,7 +31,7 @@ struct i2c_algo_pcf_data {
         int  (*getpcf) (void *data, int ctl);
         int  (*getown) (void *data);
         int  (*getclock) (void *data);
-        void (*waitforpin) (void);     
+        void (*waitforpin) (void);
 
         /* local settings */
         int udelay;
@@ -39,6 +39,5 @@ struct i2c_algo_pcf_data {
 };
 
 int i2c_pcf_add_bus(struct i2c_adapter *);
-int i2c_pcf_del_bus(struct i2c_adapter *);
 
 #endif /* _LINUX_I2C_ALGO_PCF_H */
diff --git a/include/linux/i2c-algo-sgi.h b/include/linux/i2c-algo-sgi.h
index 4a0113d6406..3b7715024e6 100644
--- a/include/linux/i2c-algo-sgi.h
+++ b/include/linux/i2c-algo-sgi.h
@@ -22,6 +22,5 @@ struct i2c_algo_sgi_data {
 };
 
 int i2c_sgi_add_bus(struct i2c_adapter *);
-int i2c_sgi_del_bus(struct i2c_adapter *);
 
 #endif /* I2C_ALGO_SGI_H */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 0a8f750cbed..d38778f2fbe 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -1,7 +1,7 @@
 /* ------------------------------------------------------------------------- */
-/*                                                                           */
+/*                                                                           */
 /* i2c-id.h - identifier values for i2c drivers and adapters                 */
-/*                                                                           */
+/*                                                                           */
 /* ------------------------------------------------------------------------- */
 /*   Copyright (C) 1995-1999 Simon G. Vogl
 
@@ -40,10 +40,10 @@
 #define I2C_DRIVERID_SAA7120    11      /* video encoder                */
 #define I2C_DRIVERID_SAA7121    12      /* video encoder                */
 #define I2C_DRIVERID_SAA7185B   13      /* video encoder                */
-#define I2C_DRIVERID_CH7003     14      /* digital pc to tv encoder     */
+#define I2C_DRIVERID_CH7003     14      /* digital pc to tv encoder     */
 #define I2C_DRIVERID_PCF8574A   15      /* i2c expander - 8 bit in/out  */
 #define I2C_DRIVERID_PCF8582C   16      /* eeprom                       */
-#define I2C_DRIVERID_AT24Cxx    17      /* eeprom 1/2/4/8/16 K          */
+#define I2C_DRIVERID_AT24Cxx    17      /* eeprom 1/2/4/8/16 K          */
 #define I2C_DRIVERID_TEA6300    18      /* audio mixer                  */
 #define I2C_DRIVERID_BT829      19      /* pc to tv encoder             */
 #define I2C_DRIVERID_TDA9850    20      /* audio mixer                  */
@@ -82,9 +82,8 @@
 #define I2C_DRIVERID_STM41T00   52      /* real time clock              */
 #define I2C_DRIVERID_UDA1342    53      /* UDA1342 audio codec          */
 #define I2C_DRIVERID_ADV7170    54      /* video encoder                */
-#define I2C_DRIVERID_RADEON     55      /* I2C bus on Radeon boards     */
 #define I2C_DRIVERID_MAX1617    56      /* temp sensor                  */
-#define I2C_DRIVERID_SAA7191    57      /* video encoder                */
+#define I2C_DRIVERID_SAA7191    57      /* video decoder                */
 #define I2C_DRIVERID_INDYCAM    58      /* SGI IndyCam                  */
 #define I2C_DRIVERID_BT832      59      /* CMOS camera video processor  */
 #define I2C_DRIVERID_TDA9887    60      /* TDA988x IF-PLL demodulator   */
@@ -132,7 +131,6 @@
 #define I2C_DRIVERID_ADM1021 1008
 #define I2C_DRIVERID_ADM9240 1009
 #define I2C_DRIVERID_LTC1710 1010
-#define I2C_DRIVERID_ICSPLL 1012
 #define I2C_DRIVERID_BT869 1013
 #define I2C_DRIVERID_MAXILIFE 1014
 #define I2C_DRIVERID_MATORB 1015
@@ -144,7 +142,6 @@
 #define I2C_DRIVERID_MTP008 1023
 #define I2C_DRIVERID_DS1621 1024
 #define I2C_DRIVERID_ADM1024 1025
-#define I2C_DRIVERID_IT87 1026
 #define I2C_DRIVERID_CH700X 1027 /* single driver for CH7003-7009 digital pc to tv encoders */
 #define I2C_DRIVERID_FSCPOS 1028
 #define I2C_DRIVERID_FSCSCY 1029
@@ -159,12 +156,13 @@
 #define I2C_DRIVERID_ASB100 1043
 #define I2C_DRIVERID_FSCHER 1046
 #define I2C_DRIVERID_W83L785TS 1047
+#define I2C_DRIVERID_OV7670 1048        /* Omnivision 7670 camera */
 
 /*
  * ---- Adapter types ----------------------------------------------------
  */
 
-/* --- Bit algorithm adapters                                           */
+/* --- Bit algorithm adapters                                           */
 #define I2C_HW_B_LP             0x010000 /* Parallel port Philips style */
 #define I2C_HW_B_SER            0x010002 /* Serial line interface */
 #define I2C_HW_B_BT848          0x010005 /* BT848 video boards */
@@ -212,9 +210,6 @@
 /* --- MPC8xx PowerPC adapters                                          */
 #define I2C_HW_MPC8XX_EPON      0x110000 /* Eponymous MPC8xx I2C adapter */
 
-/* --- ITE based algorithms                                             */
-#define I2C_HW_I_IIC            0x080000 /* controller on the ITE */
-
 /* --- PowerPC on-chip adapters                                         */
 #define I2C_HW_OCP              0x120000 /* IBM on-chip I2C adapter */
 
@@ -250,6 +245,7 @@
 #define I2C_HW_SMBUS_OV518      0x04000f /* OV518(+) USB 1.1 webcam ICs */
 #define I2C_HW_SMBUS_OV519      0x040010 /* OV519 USB 1.1 webcam IC */
 #define I2C_HW_SMBUS_OVFX2      0x040011 /* Cypress/OmniVision FX2 webcam */
+#define I2C_HW_SMBUS_CAFE       0x040012 /* Marvell 88ALP01 "CAFE" cam  */
 
 /* --- ISA pseudo-adapter                                               */
 #define I2C_HW_ISA              0x050000
diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h
new file mode 100644
index 00000000000..e6e9c814da6
--- /dev/null
+++ b/include/linux/i2c-pnx.h
@@ -0,0 +1,43 @@
+/*
+ * Header file for I2C support on PNX010x/4008.
+ *
+ * Author: Dennis Kovalev <dkovalev@ru.mvista.com>
+ *
+ * 2004-2006 (c) MontaVista Software, Inc. 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 __I2C_PNX_H__
+#define __I2C_PNX_H__
+
+#include <asm/arch/i2c.h>
+
+struct i2c_pnx_mif {
+        int                     ret;            /* Return value */
+        int                     mode;           /* Interface mode */
+        struct completion       complete;       /* I/O completion */
+        struct timer_list       timer;          /* Timeout */
+        char *                  buf;            /* Data buffer */
+        int                     len;            /* Length of data buffer */
+};
+
+struct i2c_pnx_algo_data {
+        u32                     base;
+        u32                     ioaddr;
+        int                     irq;
+        struct i2c_pnx_mif      mif;
+        int                     last;
+};
+
+struct i2c_pnx_data {
+        int (*suspend) (struct platform_device *pdev, pm_message_t state);
+        int (*resume) (struct platform_device *pdev);
+        u32 (*calculate_input_freq) (struct platform_device *pdev);
+        int (*set_clock_run) (struct platform_device *pdev);
+        int (*set_clock_stop) (struct platform_device *pdev);
+        struct i2c_adapter *adapter;
+};
+
+#endif /* __I2C_PNX_H__ */
diff --git a/include/linux/i2c-pxa.h b/include/linux/i2c-pxa.h
index 5f3eaf80222..41dcdfe7f62 100644
--- a/include/linux/i2c-pxa.h
+++ b/include/linux/i2c-pxa.h
@@ -1,29 +1,6 @@
 #ifndef _LINUX_I2C_ALGO_PXA_H
 #define _LINUX_I2C_ALGO_PXA_H
 
-struct i2c_eeprom_emu_watcher {
-        void (*write)(void *, unsigned int addr, unsigned char newval);
-};
-
-struct i2c_eeprom_emu_watch {
-        struct list_head node;
-        unsigned int start;
-        unsigned int end;
-        struct i2c_eeprom_emu_watcher *ops;
-        void *data;
-};
-
-#define I2C_EEPROM_EMU_SIZE (256)
-
-struct i2c_eeprom_emu {
-        unsigned int size;
-        unsigned int ptr;
-        unsigned int seen_start;
-        struct list_head watch;
-
-        unsigned char bytes[I2C_EEPROM_EMU_SIZE];
-};
-
 typedef enum i2c_slave_event_e {
         I2C_SLAVE_EVENT_START_READ,
         I2C_SLAVE_EVENT_START_WRITE,
@@ -37,12 +14,4 @@ struct i2c_slave_client {
         void (*write)(void *ptr, unsigned int val);
 };
 
-extern int i2c_eeprom_emu_addwatcher(struct i2c_eeprom_emu *, void *data,
-                                     unsigned int addr, unsigned int size,
-                                     struct i2c_eeprom_emu_watcher *);
-
-extern void i2c_eeprom_emu_delwatcher(struct i2c_eeprom_emu *, void *data, struct i2c_eeprom_emu_watcher *watcher);
-
-extern struct i2c_eeprom_emu *i2c_pxa_get_eeprom(void);
-
 #endif /* _LINUX_I2C_ALGO_PXA_H */
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 9b5d04768c2..71e50d3e492 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -1,7 +1,7 @@
 /* ------------------------------------------------------------------------- */
-/*                                                                           */
+/*                                                                           */
 /* i2c.h - definitions for the i2c-bus interface                             */
-/*                                                                           */
+/*                                                                           */
 /* ------------------------------------------------------------------------- */
 /*   Copyright (C) 1995-2000 Simon G. Vogl
 
@@ -27,7 +27,7 @@
 #define _LINUX_I2C_H
 
 #include <linux/types.h>
-#ifdef __KERNEL__ 
+#ifdef __KERNEL__
 #include <linux/module.h>
 #include <linux/i2c-id.h>
 #include <linux/mod_devicetable.h>
@@ -53,8 +53,8 @@ union i2c_smbus_data;
 
 /*
  * The master routines are the ones normally used to transmit data to devices
- * on a bus (or read from them). Apart from two basic transfer functions to 
- * transmit one message at a time, a more complex version can be used to 
+ * on a bus (or read from them). Apart from two basic transfer functions to
+ * transmit one message at a time, a more complex version can be used to
  * transmit an arbitrary number of messages without interruption.
  */
 extern int i2c_master_send(struct i2c_client *,const char* ,int);
@@ -67,10 +67,10 @@ extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
 
 /* This is the very generalized SMBus access routine. You probably do not
    want to use this, though; one of the functions below may be much easier,
-   and probably just as fast. 
+   and probably just as fast.
    Note that we use i2c_adapter here, because you do not need a specific
    smbus adapter to call this function. */
-extern s32 i2c_smbus_xfer (struct i2c_adapter * adapter, u16 addr, 
+extern s32 i2c_smbus_xfer (struct i2c_adapter * adapter, u16 addr,
                            unsigned short flags,
                            char read_write, u8 command, int size,
                            union i2c_smbus_data * data);
@@ -112,14 +112,14 @@ struct i2c_driver {
 
         /* Notifies the driver that a new bus has appeared. This routine
          * can be used by the driver to test if the bus meets its conditions
-         * & seek for the presence of the chip(s) it supports. If found, it 
+         * & seek for the presence of the chip(s) it supports. If found, it
          * registers the client(s) that are on the bus to the i2c admin. via
          * i2c_attach_client.
          */
         int (*attach_adapter)(struct i2c_adapter *);
         int (*detach_adapter)(struct i2c_adapter *);
 
-        /* tells the driver that a client is about to be deleted & gives it 
+        /* tells the driver that a client is about to be deleted & gives it
          * the chance to remove its private data. Also, if the client struct
          * has been dynamically allocated by the driver in the function above,
          * it must be freed here.
@@ -139,13 +139,13 @@ struct i2c_driver {
 #define I2C_NAME_SIZE   50
 
 /*
- * i2c_client identifies a single device (i.e. chip) that is connected to an 
+ * i2c_client identifies a single device (i.e. chip) that is connected to an
  * i2c bus. The behaviour is defined by the routines of the driver. This
  * function is mainly used for lookup & other admin. functions.
  */
 struct i2c_client {
         unsigned int flags;             /* div., see below              */
-        unsigned short addr;            /* chip address - NOTE: 7bit    */
+        unsigned short addr;            /* chip address - NOTE: 7bit    */
                                         /* addresses are stored in the  */
                                         /* _LOWER_ 7 bits               */
         struct i2c_adapter *adapter;    /* the adapter we sit on        */
@@ -182,14 +182,14 @@ static inline void i2c_set_clientdata (struct i2c_client *dev, void *data)
  */
 struct i2c_algorithm {
         /* If an adapter algorithm can't do I2C-level access, set master_xfer
-           to NULL. If an adapter algorithm can do SMBus access, set 
+           to NULL. If an adapter algorithm can do SMBus access, set
            smbus_xfer. If set to NULL, the SMBus protocol is simulated
            using common I2C messages */
         /* master_xfer should return the number of messages successfully
            processed, or a negative value on error */
-        int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, 
+        int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs,
                            int num);
-        int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr, 
+        int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr,
                            unsigned short flags, char read_write,
                            u8 command, int size, union i2c_smbus_data * data);
 
@@ -216,6 +216,7 @@ struct i2c_adapter {
         int (*client_unregister)(struct i2c_client *);
 
         /* data fields that are valid for all devices   */
+        u8 level;                       /* nesting level for lockdep */
         struct mutex bus_lock;
         struct mutex clist_lock;
 
@@ -316,7 +317,7 @@ extern int i2c_check_addr (struct i2c_adapter *adapter, int addr);
  * It will only call found_proc if some client is connected at the
  * specific address (unless a 'force' matched);
  */
-extern int i2c_probe(struct i2c_adapter *adapter, 
+extern int i2c_probe(struct i2c_adapter *adapter,
                 struct i2c_client_address_data *address_data,
                 int (*found_proc) (struct i2c_adapter *, int, int));
 
@@ -352,15 +353,15 @@ static inline int i2c_adapter_id(struct i2c_adapter *adap)
  */
 struct i2c_msg {
         __u16 addr;     /* slave address                        */
-        __u16 flags;            
+        __u16 flags;
 #define I2C_M_TEN       0x10    /* we have a ten bit chip address       */
 #define I2C_M_RD        0x01
 #define I2C_M_NOSTART   0x4000
 #define I2C_M_REV_DIR_ADDR      0x2000
 #define I2C_M_IGNORE_NAK        0x1000
 #define I2C_M_NO_RD_ACK         0x0800
-        __u16 len;              /* msg length                           */
-        __u8 *buf;              /* pointer to msg data                  */
+        __u16 len;              /* msg length                           */
+        __u8 *buf;              /* pointer to msg data                  */
 };
 
 /* To determine what functionality is present */
@@ -370,16 +371,16 @@ struct i2c_msg {
 #define I2C_FUNC_PROTOCOL_MANGLING      0x00000004 /* I2C_M_{REV_DIR_ADDR,NOSTART,..} */
 #define I2C_FUNC_SMBUS_HWPEC_CALC       0x00000008 /* SMBus 2.0 */
 #define I2C_FUNC_SMBUS_BLOCK_PROC_CALL  0x00008000 /* SMBus 2.0 */
-#define I2C_FUNC_SMBUS_QUICK            0x00010000 
-#define I2C_FUNC_SMBUS_READ_BYTE        0x00020000 
-#define I2C_FUNC_SMBUS_WRITE_BYTE       0x00040000 
-#define I2C_FUNC_SMBUS_READ_BYTE_DATA   0x00080000 
-#define I2C_FUNC_SMBUS_WRITE_BYTE_DATA  0x00100000 
-#define I2C_FUNC_SMBUS_READ_WORD_DATA   0x00200000 
-#define I2C_FUNC_SMBUS_WRITE_WORD_DATA  0x00400000 
-#define I2C_FUNC_SMBUS_PROC_CALL        0x00800000 
-#define I2C_FUNC_SMBUS_READ_BLOCK_DATA  0x01000000 
-#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000 
+#define I2C_FUNC_SMBUS_QUICK            0x00010000
+#define I2C_FUNC_SMBUS_READ_BYTE        0x00020000
+#define I2C_FUNC_SMBUS_WRITE_BYTE       0x00040000
+#define I2C_FUNC_SMBUS_READ_BYTE_DATA   0x00080000
+#define I2C_FUNC_SMBUS_WRITE_BYTE_DATA  0x00100000
+#define I2C_FUNC_SMBUS_READ_WORD_DATA   0x00200000
+#define I2C_FUNC_SMBUS_WRITE_WORD_DATA  0x00400000
+#define I2C_FUNC_SMBUS_PROC_CALL        0x00800000
+#define I2C_FUNC_SMBUS_READ_BLOCK_DATA  0x01000000
+#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000
 #define I2C_FUNC_SMBUS_READ_I2C_BLOCK   0x04000000 /* I2C-like block xfer  */
 #define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK  0x08000000 /* w/ 1-byte reg. addr. */
 #define I2C_FUNC_SMBUS_READ_I2C_BLOCK_2  0x10000000 /* I2C-like block xfer  */
@@ -406,10 +407,10 @@ struct i2c_msg {
                              I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | \
                              I2C_FUNC_SMBUS_I2C_BLOCK)
 
-/* 
- * Data for SMBus Messages 
+/*
+ * Data for SMBus Messages
  */
-#define I2C_SMBUS_BLOCK_MAX     32      /* As specified in SMBus standard */    
+#define I2C_SMBUS_BLOCK_MAX     32      /* As specified in SMBus standard */
 union i2c_smbus_data {
         __u8 byte;
         __u16 word;
@@ -421,11 +422,11 @@ union i2c_smbus_data {
 #define I2C_SMBUS_READ  1
 #define I2C_SMBUS_WRITE 0
 
-/* SMBus transaction types (size parameter in the above functions) 
+/* SMBus transaction types (size parameter in the above functions)
    Note: these no longer correspond to the (arbitrary) PIIX4 internal codes! */
 #define I2C_SMBUS_QUICK             0
 #define I2C_SMBUS_BYTE              1
-#define I2C_SMBUS_BYTE_DATA         2 
+#define I2C_SMBUS_BYTE_DATA         2
 #define I2C_SMBUS_WORD_DATA         3
 #define I2C_SMBUS_PROC_CALL         4
 #define I2C_SMBUS_BLOCK_DATA        5
@@ -434,15 +435,15 @@ union i2c_smbus_data {
 
 
 /* ----- commands for the ioctl like i2c_command call:
- * note that additional calls are defined in the algorithm and hw 
- *      dependent layers - these can be listed here, or see the 
+ * note that additional calls are defined in the algorithm and hw
+ *      dependent layers - these can be listed here, or see the
  *      corresponding header files.
  */
                                 /* -> bit-adapter specific ioctls       */
 #define I2C_RETRIES     0x0701  /* number of times a device address      */
                                 /* should be polled when not            */
-                                /* acknowledging                        */
-#define I2C_TIMEOUT     0x0702  /* set timeout - call with int          */
+                                /* acknowledging                        */
+#define I2C_TIMEOUT     0x0702  /* set timeout - call with int          */
 
 
 /* this is for i2c-dev.c        */
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index c115e9e840b..52f53e2e70c 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -461,7 +461,7 @@ struct i2o_driver {
         int (*reply) (struct i2o_controller *, u32, struct i2o_message *);
 
         /* Event handler */
-        void (*event) (struct i2o_event *);
+        work_func_t event;
 
         struct workqueue_struct *event_queue;   /* Event queue */
 
@@ -490,7 +490,7 @@ struct i2o_dma {
  */
 struct i2o_pool {
         char *name;
-        kmem_cache_t *slab;
+        struct kmem_cache *slab;
         mempool_t *mempool;
 };
 
@@ -986,7 +986,8 @@ extern void i2o_driver_unregister(struct i2o_driver *);
 
 /**
  *      i2o_driver_notify_controller_add - Send notification of added controller
- *                                         to a single I2O driver
+ *      @drv: I2O driver
+ *      @c: I2O controller
  *
  *      Send notification of added controller to a single registered driver.
  */
@@ -998,8 +999,9 @@ static inline void i2o_driver_notify_controller_add(struct i2o_driver *drv,
 };
 
 /**
- *      i2o_driver_notify_controller_remove - Send notification of removed
- *                                            controller to a single I2O driver
+ *      i2o_driver_notify_controller_remove - Send notification of removed controller
+ *      @drv: I2O driver
+ *      @c: I2O controller
  *
  *      Send notification of removed controller to a single registered driver.
  */
@@ -1011,8 +1013,9 @@ static inline void i2o_driver_notify_controller_remove(struct i2o_driver *drv,
 };
 
 /**
- *      i2o_driver_notify_device_add - Send notification of added device to a
- *                                     single I2O driver
+ *      i2o_driver_notify_device_add - Send notification of added device
+ *      @drv: I2O driver
+ *      @i2o_dev: the added i2o_device
  *
  *      Send notification of added device to a single registered driver.
  */
@@ -1025,7 +1028,8 @@ static inline void i2o_driver_notify_device_add(struct i2o_driver *drv,
 
 /**
  *      i2o_driver_notify_device_remove - Send notification of removed device
- *                                        to a single I2O driver
+ *      @drv: I2O driver
+ *      @i2o_dev: the added i2o_device
  *
  *      Send notification of removed device to a single registered driver.
  */
@@ -1148,7 +1152,7 @@ static inline void i2o_msg_post(struct i2o_controller *c,
 /**
  *      i2o_msg_post_wait - Post and wait a message and wait until return
  *      @c: controller
- *      @m: message to post
+ *      @msg: message to post
  *      @timeout: time in seconds to wait
  *
  *      This API allows an OSM to post a message and then be told whether or
diff --git a/include/linux/icmp.h b/include/linux/icmp.h
index 878cfe4e587..24da4fbc1a2 100644
--- a/include/linux/icmp.h
+++ b/include/linux/icmp.h
@@ -68,7 +68,7 @@
 struct icmphdr {
   __u8          type;
   __u8          code;
-  __be16        checksum;
+  __sum16       checksum;
   union {
         struct {
                 __be16  id;
diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index c771a7db987..68d3526c3a0 100644
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -7,17 +7,17 @@ struct icmp6hdr {
 
         __u8            icmp6_type;
         __u8            icmp6_code;
-        __u16           icmp6_cksum;
+        __sum16         icmp6_cksum;
 
 
         union {
-                __u32                   un_data32[1];
-                __u16                   un_data16[2];
+                __be32                  un_data32[1];
+                __be16                  un_data16[2];
                 __u8                    un_data8[4];
 
                 struct icmpv6_echo {
-                        __u16           identifier;
-                        __u16           sequence;
+                        __be16          identifier;
+                        __be16          sequence;
                 } u_echo;
 
                 struct icmpv6_nd_advt {
@@ -53,7 +53,7 @@ struct icmp6hdr {
 #else
 #error  "Please fix <asm/byteorder.h>"
 #endif
-                        __u16           rt_lifetime;
+                        __be16          rt_lifetime;
                 } u_nd_ra;
 
         } icmp6_dataun;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 9c2050293f1..e26a03981a9 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -796,6 +796,7 @@ typedef struct hwif_s {
         unsigned        sg_mapped  : 1; /* sg_table and sg_nents are ready */
         unsigned        no_io_32bit : 1; /* 1 = can not do 32-bit IO ops */
         unsigned        err_stops_fifo : 1; /* 1=data FIFO is cleared by an error */
+        unsigned        atapi_irq_bogon : 1; /* Generates spurious DMA interrupts in PIO mode */
 
         struct device   gendev;
         struct completion gendev_rel_comp; /* To deal with device release() */
@@ -803,8 +804,6 @@ typedef struct hwif_s {
         void            *hwif_data;     /* extra hwif data */
 
         unsigned dma;
-
-        void (*led_act)(void *data, int rw);
 } ____cacheline_internodealigned_in_smp ide_hwif_t;
 
 /*
diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
index dbe8f6120a4..d557e4ce9b6 100644
--- a/include/linux/if_addr.h
+++ b/include/linux/if_addr.h
@@ -52,4 +52,10 @@ struct ifa_cacheinfo
         __u32   tstamp; /* updated timestamp, hundredths of seconds */
 };
 
+/* backwards compatibility for userspace */
+#ifndef __KERNEL__
+#define IFA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
+#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
+#endif
+
 #endif
diff --git a/include/linux/if_fddi.h b/include/linux/if_fddi.h
index e0a15004620..4aba6b0ad41 100644
--- a/include/linux/if_fddi.h
+++ b/include/linux/if_fddi.h
@@ -103,6 +103,8 @@ struct fddihdr
         } __attribute__ ((packed));
 
 #ifdef __KERNEL__
+#include <linux/netdevice.h>
+
 /* Define FDDI statistics structure */
 struct fddi_statistics {
 
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index e963a077e6f..35ed3b5467f 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -82,6 +82,12 @@ enum
 
 #define IFLA_MAX (__IFLA_MAX - 1)
 
+/* backwards compatibility for userspace */
+#ifndef __KERNEL__
+#define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
+#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
+#endif
+
 /* ifi_flags.
 
    IFF_* flags.
diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h
index b92558549d2..99393ef3af3 100644
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -1,17 +1,19 @@
 #ifndef __LINUX_IF_PACKET_H
 #define __LINUX_IF_PACKET_H
 
+#include <linux/types.h>
+
 struct sockaddr_pkt
 {
         unsigned short spkt_family;
         unsigned char spkt_device[14];
-        unsigned short spkt_protocol;
+        __be16 spkt_protocol;
 };
 
 struct sockaddr_ll
 {
         unsigned short  sll_family;
-        unsigned short  sll_protocol;
+        __be16          sll_protocol;
         int             sll_ifindex;
         unsigned short  sll_hatype;
         unsigned char   sll_pkttype;
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index bef9f8fd93b..8de079ba110 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -19,10 +19,10 @@ struct ip_tunnel_parm
 {
         char                    name[IFNAMSIZ];
         int                     link;
-        __u16                   i_flags;
-        __u16                   o_flags;
-        __u32                   i_key;
-        __u32                   o_key;
+        __be16                  i_flags;
+        __be16                  o_flags;
+        __be32                  i_key;
+        __be32                  o_key;
         struct iphdr            iph;
 };
 
diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 21dd5690527..9dbb525c517 100644
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -30,7 +30,7 @@ struct igmphdr
 {
         __u8 type;
         __u8 code;              /* For newer IGMP */
-        __be16 csum;
+        __sum16 csum;
         __be32 group;
 };
 
@@ -127,6 +127,7 @@ struct igmpv3_query {
 
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <linux/timer.h>
 #include <linux/in.h>
 
 extern int sysctl_igmp_max_memberships;
diff --git a/include/linux/in.h b/include/linux/in.h
index 2619859f6e1..1912e7c0bc2 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -45,6 +45,7 @@ enum {
 
   IPPROTO_COMP   = 108,                /* Compression Header protocol */
   IPPROTO_SCTP   = 132,         /* Stream Control Transport Protocol    */
+  IPPROTO_UDPLITE = 136,        /* UDP-Lite (RFC 3828)                  */
 
   IPPROTO_RAW    = 255,         /* Raw IP packets                       */
   IPPROTO_MAX
diff --git a/include/linux/in6.h b/include/linux/in6.h
index f28621f638e..4e8350ae886 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -54,7 +54,7 @@ extern const struct in6_addr in6addr_loopback;
 struct sockaddr_in6 {
         unsigned short int      sin6_family;    /* AF_INET6 */
         __be16                  sin6_port;      /* Transport layer port # */
-        __u32                   sin6_flowinfo;  /* IPv6 flow information */
+        __be32                  sin6_flowinfo;  /* IPv6 flow information */
         struct in6_addr         sin6_addr;      /* IPv6 address */
         __u32                   sin6_scope_id;  /* scope id (new in RFC2553) */
 };
@@ -72,7 +72,7 @@ struct ipv6_mreq {
 struct in6_flowlabel_req
 {
         struct in6_addr flr_dst;
-        __u32   flr_label;
+        __be32  flr_label;
         __u8    flr_action;
         __u8    flr_share;
         __u16   flr_flags;
diff --git a/include/linux/inet.h b/include/linux/inet.h
index b7c6da7d6d3..675a7dbe86f 100644
--- a/include/linux/inet.h
+++ b/include/linux/inet.h
@@ -46,7 +46,7 @@
 #include <linux/types.h>
 
 extern __be32 in_aton(const char *str);
-extern int in4_pton(const char *src, int srclen, u8 *dst, char delim, const char **end);
-extern int in6_pton(const char *src, int srclen, u8 *dst, char delim, const char **end);
+extern int in4_pton(const char *src, int srclen, u8 *dst, int delim, const char **end);
+extern int in6_pton(const char *src, int srclen, u8 *dst, int delim, const char **end);
 #endif
 #endif  /* _LINUX_INET_H */
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 5a0ab04627b..c0f7aec331c 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -124,12 +124,13 @@ static __inline__ int inet_ifa_match(__be32 addr, struct in_ifaddr *ifa)
  *      Check if a mask is acceptable.
  */
  
-static __inline__ int bad_mask(u32 mask, u32 addr)
+static __inline__ int bad_mask(__be32 mask, __be32 addr)
 {
+        __u32 hmask;
         if (addr & (mask = ~mask))
                 return 1;
-        mask = ntohl(mask);
-        if (mask & (mask+1))
+        hmask = ntohl(mask);
+        if (hmask & (hmask+1))
                 return 1;
         return 0;
 }
@@ -190,11 +191,12 @@ static __inline__ __be32 inet_make_mask(int logmask)
         return 0;
 }
 
-static __inline__ int inet_mask_len(__u32 mask)
+static __inline__ int inet_mask_len(__be32 mask)
 {
-        if (!(mask = ntohl(mask)))
+        __u32 hmask = ntohl(mask);
+        if (!hmask)
                 return 0;
-        return 32 - ffz(~mask);
+        return 32 - ffz(~hmask);
 }
 
 
diff --git a/include/linux/init.h b/include/linux/init.h
index 5eb5d24b768..5a593a1dec1 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -111,6 +111,7 @@ extern void setup_arch(char **);
 #define subsys_initcall_sync(fn)        __define_initcall("4s",fn,4s)
 #define fs_initcall(fn)                 __define_initcall("5",fn,5)
 #define fs_initcall_sync(fn)            __define_initcall("5s",fn,5s)
+#define rootfs_initcall(fn)             __define_initcall("rootfs",fn,rootfs)
 #define device_initcall(fn)             __define_initcall("6",fn,6)
 #define device_initcall_sync(fn)        __define_initcall("6s",fn,6s)
 #define late_initcall(fn)               __define_initcall("7",fn,7)
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 33c5daacc74..6383d2d83bb 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -7,16 +7,15 @@
 #include <linux/utsname.h>
 #include <linux/lockdep.h>
 #include <linux/ipc.h>
+#include <linux/pid_namespace.h>
 
 #define INIT_FDTABLE \
 {                                                       \
         .max_fds        = NR_OPEN_DEFAULT,              \
-        .max_fdset      = EMBEDDED_FD_SET_SIZE,         \
         .fd             = &init_files.fd_array[0],      \
         .close_on_exec  = (fd_set *)&init_files.close_on_exec_init, \
         .open_fds       = (fd_set *)&init_files.open_fds_init,  \
         .rcu            = RCU_HEAD_INIT,                \
-        .free_files     = NULL,                         \
         .next           = NULL,                         \
 }
 
@@ -57,25 +56,27 @@
         .cpu_vm_mask    = CPU_MASK_ALL,                         \
 }
 
-#define INIT_SIGNALS(sig) {     \
-        .count          = ATOMIC_INIT(1),               \
+#define INIT_SIGNALS(sig) {                                             \
+        .count          = ATOMIC_INIT(1),                               \
         .wait_chldexit  = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\
-        .shared_pending = {                             \
+        .shared_pending = {                                             \
                 .list = LIST_HEAD_INIT(sig.shared_pending.list),        \
-                .signal =  {{0}}}, \
+                .signal =  {{0}}},                                      \
         .posix_timers    = LIST_HEAD_INIT(sig.posix_timers),            \
         .cpu_timers     = INIT_CPU_TIMERS(sig.cpu_timers),              \
         .rlim           = INIT_RLIMITS,                                 \
         .pgrp           = 1,                                            \
-        .session        = 1,                                            \
+        .tty_old_pgrp   = 0,                                            \
+        { .__session      = 1},                                         \
 }
 
 extern struct nsproxy init_nsproxy;
 #define INIT_NSPROXY(nsproxy) {                                         \
+        .pid_ns         = &init_pid_ns,                                 \
         .count          = ATOMIC_INIT(1),                               \
-        .nslock         = SPIN_LOCK_UNLOCKED,                           \
+        .nslock         = __SPIN_LOCK_UNLOCKED(nsproxy.nslock),         \
         .uts_ns         = &init_uts_ns,                                 \
-        .namespace      = NULL,                                         \
+        .mnt_ns         = NULL,                                         \
         INIT_IPC_NS(ipc_ns)                                             \
 }
 
diff --git a/include/linux/input.h b/include/linux/input.h
index c38507ba38b..bde65c8a351 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -491,6 +491,21 @@ struct input_absinfo {
 #define KEY_DIGITS              0x19d
 #define KEY_TEEN                0x19e
 #define KEY_TWEN                0x19f
+#define KEY_VIDEOPHONE          0x1a0
+#define KEY_GAMES               0x1a1
+#define KEY_ZOOMIN              0x1a2
+#define KEY_ZOOMOUT             0x1a3
+#define KEY_ZOOMRESET           0x1a4
+#define KEY_WORDPROCESSOR       0x1a5
+#define KEY_EDITOR              0x1a6
+#define KEY_SPREADSHEET         0x1a7
+#define KEY_GRAPHICSEDITOR      0x1a8
+#define KEY_PRESENTATION        0x1a9
+#define KEY_DATABASE            0x1aa
+#define KEY_NEWS                0x1ab
+#define KEY_VOICEMAIL           0x1ac
+#define KEY_ADDRESSBOOK         0x1ad
+#define KEY_MESSENGER           0x1ae
 
 #define KEY_DEL_EOL             0x1c0
 #define KEY_DEL_EOS             0x1c1
@@ -663,7 +678,7 @@ struct input_absinfo {
 #define BUS_GSC                 0x1A
 
 /*
- * Values describing the status of an effect
+ * Values describing the status of a force-feedback effect
  */
 #define FF_STATUS_STOPPED       0x00
 #define FF_STATUS_PLAYING       0x01
@@ -680,7 +695,7 @@ struct input_absinfo {
  */
 
 /**
- * struct ff_replay - defines scheduling of the effect
+ * struct ff_replay - defines scheduling of the force-feedback effect
  * @length: duration of the effect
  * @delay: delay before effect should start playing
  */
@@ -690,7 +705,7 @@ struct ff_replay {
 };
 
 /**
- * struct ff_trigger - defines what triggers the effect
+ * struct ff_trigger - defines what triggers the force-feedback effect
  * @button: number of the button triggering the effect
  * @interval: controls how soon the effect can be re-triggered
  */
@@ -700,7 +715,7 @@ struct ff_trigger {
 };
 
 /**
- * struct ff_envelope - generic effect envelope
+ * struct ff_envelope - generic force-feedback effect envelope
  * @attack_length: duration of the attack (ms)
  * @attack_level: level at the beginning of the attack
  * @fade_length: duration of fade (ms)
@@ -719,7 +734,7 @@ struct ff_envelope {
 };
 
 /**
- * struct ff_constant_effect - defines parameters of a constant effect
+ * struct ff_constant_effect - defines parameters of a constant force-feedback effect
  * @level: strength of the effect; may be negative
  * @envelope: envelope data
  */
@@ -729,7 +744,7 @@ struct ff_constant_effect {
 };
 
 /**
- * struct ff_ramp_effect - defines parameters of a ramp effect
+ * struct ff_ramp_effect - defines parameters of a ramp force-feedback effect
  * @start_level: beginning strength of the effect; may be negative
  * @end_level: final strength of the effect; may be negative
  * @envelope: envelope data
@@ -741,7 +756,7 @@ struct ff_ramp_effect {
 };
 
 /**
- * struct ff_condition_effect - defines a spring or friction effect
+ * struct ff_condition_effect - defines a spring or friction force-feedback effect
  * @right_saturation: maximum level when joystick moved all way to the right
  * @left_saturation: same for the left side
  * @right_coeff: controls how fast the force grows when the joystick moves
@@ -762,7 +777,7 @@ struct ff_condition_effect {
 };
 
 /**
- * struct ff_periodic_effect - defines parameters of a periodic effect
+ * struct ff_periodic_effect - defines parameters of a periodic force-feedback effect
  * @waveform: kind of the effect (wave)
  * @period: period of the wave (ms)
  * @magnitude: peak value
@@ -793,7 +808,7 @@ struct ff_periodic_effect {
 };
 
 /**
- * struct ff_rumble_effect - defines parameters of a periodic effect
+ * struct ff_rumble_effect - defines parameters of a periodic force-feedback effect
  * @strong_magnitude: magnitude of the heavy motor
  * @weak_magnitude: magnitude of the light one
  *
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 5b83e7b5962..e36e86c869f 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -11,6 +11,7 @@
 #include <linux/hardirq.h>
 #include <linux/sched.h>
 #include <linux/irqflags.h>
+#include <linux/bottom_half.h>
 #include <asm/atomic.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
@@ -217,12 +218,6 @@ static inline void __deprecated save_and_cli(unsigned long *x)
 #define save_and_cli(x) save_and_cli(&x)
 #endif /* CONFIG_SMP */
 
-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);
-
 /* PLEASE, avoid to allocate new softirqs, if you need not _really_ high
    frequency threaded job scheduling. For almost all the purposes
    tasklets are more than enough. F.e. all serial device BHs et
@@ -236,7 +231,8 @@ enum
         NET_TX_SOFTIRQ,
         NET_RX_SOFTIRQ,
         BLOCK_SOFTIRQ,
-        TASKLET_SOFTIRQ
+        TASKLET_SOFTIRQ,
+        SCHED_SOFTIRQ,
 };
 
 /* softirq mask and active fields moved to irq_cpustat_t in
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index d42c8339907..15228d79c5b 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -89,6 +89,10 @@ struct resource_list {
 #define IORESOURCE_ROM_ENABLE           (1<<0)  /* ROM is enabled, same as PCI_ROM_ADDRESS_ENABLE */
 #define IORESOURCE_ROM_SHADOW           (1<<1)  /* ROM is copy at C000:0 */
 #define IORESOURCE_ROM_COPY             (1<<2)  /* ROM is alloc'd copy, resource field overlaid */
+#define IORESOURCE_ROM_BIOS_COPY        (1<<3)  /* ROM is BIOS copy, resource field overlaid */
+
+/* PCI control bits.  Shares IORESOURCE_BITS with above PCI ROM.  */
+#define IORESOURCE_PCI_FIXED            (1<<4)  /* Do not move resource */
 
 /* PC/ISA/whatever - the normal PC address spaces: IO and memory */
 extern struct resource ioport_resource;
diff --git a/include/linux/ip.h b/include/linux/ip.h
index ecee9bb27d0..1d36b971a8b 100644
--- a/include/linux/ip.h
+++ b/include/linux/ip.h
@@ -98,7 +98,7 @@ struct iphdr {
         __be16  frag_off;
         __u8    ttl;
         __u8    protocol;
-        __be16  check;
+        __sum16 check;
         __be32  saddr;
         __be32  daddr;
         /*The options start here. */
diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h
index 5c23aeb104c..af3f4a70f3d 100644
--- a/include/linux/ip6_tunnel.h
+++ b/include/linux/ip6_tunnel.h
@@ -25,7 +25,7 @@ struct ip6_tnl_parm {
         __u8 proto;             /* tunnel protocol */
         __u8 encap_limit;       /* encapsulation limit for tunnel */
         __u8 hop_limit;         /* hop limit for tunnel */
-        __u32 flowinfo;         /* traffic class and flowlabel for tunnel */
+        __be32 flowinfo;        /* traffic class and flowlabel for tunnel */
         __u32 flags;            /* tunnel flags */
         struct in6_addr laddr;  /* local tunnel end-point address */
         struct in6_addr raddr;  /* remote tunnel end-point address */
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index 796ca009fd4..7a9db390c56 100644
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -208,6 +208,15 @@ struct kernel_ipmi_msg
    code as the first byte of the incoming data, unlike a response. */
 
 
+/*
+ * Modes for ipmi_set_maint_mode() and the userland IOCTL.  The AUTO
+ * setting is the default and means it will be set on certain
+ * commands.  Hard setting it on and off will override automatic
+ * operation.
+ */
+#define IPMI_MAINTENANCE_MODE_AUTO      0
+#define IPMI_MAINTENANCE_MODE_OFF       1
+#define IPMI_MAINTENANCE_MODE_ON        2
 
 #ifdef __KERNEL__
 
@@ -374,6 +383,35 @@ int ipmi_unregister_for_cmd(ipmi_user_t   user,
                             unsigned int  chans);
 
 /*
+ * Go into a mode where the driver will not autonomously attempt to do
+ * things with the interface.  It will still respond to attentions and
+ * interrupts, and it will expect that commands will complete.  It
+ * will not automatcially check for flags, events, or things of that
+ * nature.
+ *
+ * This is primarily used for firmware upgrades.  The idea is that
+ * when you go into firmware upgrade mode, you do this operation
+ * and the driver will not attempt to do anything but what you tell
+ * it or what the BMC asks for.
+ *
+ * Note that if you send a command that resets the BMC, the driver
+ * will still expect a response from that command.  So the BMC should
+ * reset itself *after* the response is sent.  Resetting before the
+ * response is just silly.
+ *
+ * If in auto maintenance mode, the driver will automatically go into
+ * maintenance mode for 30 seconds if it sees a cold reset, a warm
+ * reset, or a firmware NetFN.  This means that code that uses only
+ * firmware NetFN commands to do upgrades will work automatically
+ * without change, assuming it sends a message every 30 seconds or
+ * less.
+ *
+ * See the IPMI_MAINTENANCE_MODE_xxx defines for what the mode means.
+ */
+int ipmi_get_maintenance_mode(ipmi_user_t user);
+int ipmi_set_maintenance_mode(ipmi_user_t user, int mode);
+
+/*
  * Allow run-to-completion mode to be set for the interface of
  * a specific user.
  */
@@ -656,4 +694,11 @@ struct ipmi_timing_parms
 #define IPMICTL_GET_TIMING_PARMS_CMD    _IOR(IPMI_IOC_MAGIC, 23, \
                                              struct ipmi_timing_parms)
 
+/*
+ * Set the maintenance mode.  See ipmi_set_maintenance_mode() above
+ * for a description of what this does.
+ */
+#define IPMICTL_GET_MAINTENANCE_MODE_CMD        _IOR(IPMI_IOC_MAGIC, 30, int)
+#define IPMICTL_SET_MAINTENANCE_MODE_CMD        _IOW(IPMI_IOC_MAGIC, 31, int)
+
 #endif /* __LINUX_IPMI_H */
diff --git a/include/linux/ipmi_msgdefs.h b/include/linux/ipmi_msgdefs.h
index 4d04d8b58a0..b56a158d587 100644
--- a/include/linux/ipmi_msgdefs.h
+++ b/include/linux/ipmi_msgdefs.h
@@ -46,6 +46,8 @@
 #define IPMI_NETFN_APP_REQUEST                  0x06
 #define IPMI_NETFN_APP_RESPONSE                 0x07
 #define IPMI_GET_DEVICE_ID_CMD          0x01
+#define IPMI_COLD_RESET_CMD             0x02
+#define IPMI_WARM_RESET_CMD             0x03
 #define IPMI_CLEAR_MSG_FLAGS_CMD        0x30
 #define IPMI_GET_DEVICE_GUID_CMD        0x08
 #define IPMI_GET_MSG_FLAGS_CMD          0x31
@@ -60,20 +62,27 @@
 #define IPMI_NETFN_STORAGE_RESPONSE             0x0b
 #define IPMI_ADD_SEL_ENTRY_CMD          0x44
 
+#define IPMI_NETFN_FIRMWARE_REQUEST             0x08
+#define IPMI_NETFN_FIRMWARE_RESPONSE            0x09
+
 /* The default slave address */
 #define IPMI_BMC_SLAVE_ADDR     0x20
 
 /* The BT interface on high-end HP systems supports up to 255 bytes in
  * one transfer.  Its "virtual" BMC supports some commands that are longer
  * than 128 bytes.  Use the full 256, plus NetFn/LUN, Cmd, cCode, plus
- * some overhead.  It would be nice to base this on the "BT Capabilities"
- * but that's too hard to propagate to the rest of the driver. */
+ * some overhead; it's not worth the effort to dynamically size this based
+ * on the results of the "Get BT Capabilities" command. */
 #define IPMI_MAX_MSG_LENGTH     272     /* multiple of 16 */
 
 #define IPMI_CC_NO_ERROR                0x00
 #define IPMI_NODE_BUSY_ERR              0xc0
 #define IPMI_INVALID_COMMAND_ERR        0xc1
+#define IPMI_TIMEOUT_ERR                0xc3
 #define IPMI_ERR_MSG_TRUNCATED          0xc6
+#define IPMI_REQ_LEN_INVALID_ERR        0xc7
+#define IPMI_REQ_LEN_EXCEEDED_ERR       0xc8
+#define IPMI_NOT_IN_MY_STATE_ERR        0xd5    /* IPMI 2.0 */
 #define IPMI_LOST_ARBITRATION_ERR       0x81
 #define IPMI_BUS_ERR                    0x82
 #define IPMI_NAK_ON_WRITE_ERR           0x83
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index 6d9c7e4da47..c0633108d05 100644
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -115,6 +115,13 @@ struct ipmi_smi_handlers
            poll for operations during things like crash dumps. */
         void (*poll)(void *send_info);
 
+        /* Enable/disable firmware maintenance mode.  Note that this
+           is *not* the modes defined, this is simply an on/off
+           setting.  The message handler does the mode handling.  Note
+           that this is called from interupt context, so it cannot
+           block. */
+        void (*set_maintenance_mode)(void *send_info, int enable);
+
         /* Tell the handler that we are using it/not using it.  The
            message handler get the modules that this handler belongs
            to; this function lets the SMI claim any modules that it
@@ -173,6 +180,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
                       void                     *send_info,
                       struct ipmi_device_id    *device_id,
                       struct device            *dev,
+                      const char               *sysfs_name,
                       unsigned char            slave_addr);
 
 /*
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 4f435c59de0..f8241130f5e 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -274,7 +274,7 @@ struct ipv6_pinfo {
         struct in6_addr         *saddr_cache;
 #endif
 
-        __u32                   flow_label;
+        __be32                  flow_label;
         __u32                   frag_size;
         __s16                   hop_limit;
         __s16                   mcast_hops;
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 62991148d5a..3c7875b7ab5 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -511,8 +511,8 @@ typedef struct modem_info {
 #endif
   struct tty_struct     *tty;            /* Pointer to corresponding tty   */
   atemu                 emu;             /* AT-emulator data               */
-  struct termios        normal_termios;  /* For saving termios structs     */
-  struct termios        callout_termios;
+  struct ktermios       normal_termios;  /* For saving termios structs     */
+  struct ktermios       callout_termios;
   wait_queue_head_t     open_wait, close_wait;
   struct semaphore      write_sem;
   spinlock_t            readlock;
@@ -525,8 +525,8 @@ typedef struct _isdn_modem {
   int                refcount;                          /* Number of opens        */
   struct tty_driver  *tty_modem;                        /* tty-device             */
   struct tty_struct  *modem_table[ISDN_MAX_CHANNELS];   /* ?? copied from Orig    */
-  struct termios     *modem_termios[ISDN_MAX_CHANNELS];
-  struct termios     *modem_termios_locked[ISDN_MAX_CHANNELS];
+  struct ktermios     *modem_termios[ISDN_MAX_CHANNELS];
+  struct ktermios     *modem_termios_locked[ISDN_MAX_CHANNELS];
   modem_info         info[ISDN_MAX_CHANNELS];      /* Private data           */
 } isdn_modem_t;
 
diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index b55e2a03560..106a5e85e5c 100644
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -49,13 +49,13 @@
  *      communication with the slave board will always be on a per port
  *      basis.
  */
-typedef struct {
+struct stliport {
         unsigned long           magic;
-        int                     portnr;
-        int                     panelnr;
-        int                     brdnr;
+        unsigned int            portnr;
+        unsigned int            panelnr;
+        unsigned int            brdnr;
         unsigned long           state;
-        int                     devnr;
+        unsigned int            devnr;
         int                     flags;
         int                     baud_base;
         int                     custom_divisor;
@@ -72,7 +72,7 @@ typedef struct {
         wait_queue_head_t       close_wait;
         wait_queue_head_t       raw_wait;
         struct work_struct      tqhangup;
-        asysigs_t               asig;
+        struct asysigs          asig;
         unsigned long           addr;
         unsigned long           rxoffset;
         unsigned long           txoffset;
@@ -83,31 +83,31 @@ typedef struct {
         unsigned char           reqbit;
         unsigned char           portidx;
         unsigned char           portbit;
-} stliport_t;
+};
 
 /*
  *      Use a structure of function pointers to do board level operations.
  *      These include, enable/disable, paging shared memory, interrupting, etc.
  */
-typedef struct stlibrd {
+struct stlibrd {
         unsigned long   magic;
-        int             brdnr;
-        int             brdtype;
-        int             state;
-        int             nrpanels;
-        int             nrports;
-        int             nrdevs;
+        unsigned int    brdnr;
+        unsigned int    brdtype;
+        unsigned int    state;
+        unsigned int    nrpanels;
+        unsigned int    nrports;
+        unsigned int    nrdevs;
         unsigned int    iobase;
         int             iosize;
         unsigned long   memaddr;
         void            __iomem *membase;
-        int             memsize;
+        unsigned long   memsize;
         int             pagesize;
         int             hostoffset;
         int             slaveoffset;
         int             bitsize;
         int             enabval;
-        int             panels[STL_MAXPANELS];
+        unsigned int    panels[STL_MAXPANELS];
         int             panelids[STL_MAXPANELS];
         void            (*init)(struct stlibrd *brdp);
         void            (*enable)(struct stlibrd *brdp);
@@ -116,8 +116,8 @@ typedef struct stlibrd {
         void            __iomem *(*getmemptr)(struct stlibrd *brdp, unsigned long offset, int line);
         void            (*intr)(struct stlibrd *brdp);
         void            (*reset)(struct stlibrd *brdp);
-        stliport_t      *ports[STL_MAXPORTS];
-} stlibrd_t;
+        struct stliport *ports[STL_MAXPORTS];
+};
 
 
 /*
diff --git a/include/linux/ixjuser.h b/include/linux/ixjuser.h
index fd1756d3a47..88b45895746 100644
--- a/include/linux/ixjuser.h
+++ b/include/linux/ixjuser.h
@@ -315,7 +315,7 @@ typedef struct {
 * structures.  If the freq0 variable is non-zero, the tone table contents
 * for the tone_index are updated to the frequencies and gains defined.  It
 * should be noted that DTMF tones cannot be reassigned, so if DTMF tone
-* table indexs are used in a cadence the frequency and gain variables will
+* table indexes are used in a cadence the frequency and gain variables will
 * be ignored.
 *
 * If the array elements contain frequency parameters the driver will
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index fe89444b1c6..45273755126 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -839,7 +839,6 @@ struct journal_s
  */
 
 /* Filing buffers */
-extern void __journal_temp_unlink_buffer(struct journal_head *jh);
 extern void journal_unfile_buffer(journal_t *, struct journal_head *);
 extern void __journal_unfile_buffer(struct journal_head *);
 extern void __journal_refile_buffer(struct journal_head *);
@@ -949,7 +948,7 @@ void journal_put_journal_head(struct journal_head *jh);
 /*
  * handle management
  */
-extern kmem_cache_t *jbd_handle_cache;
+extern struct kmem_cache *jbd_handle_cache;
 
 static inline handle_t *jbd_alloc_handle(gfp_t gfp_flags)
 {
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index ddb12879578..0e0fedd2039 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -848,7 +848,6 @@ struct journal_s
  */
 
 /* Filing buffers */
-extern void __jbd2_journal_temp_unlink_buffer(struct journal_head *jh);
 extern void jbd2_journal_unfile_buffer(journal_t *, struct journal_head *);
 extern void __jbd2_journal_unfile_buffer(struct journal_head *);
 extern void __jbd2_journal_refile_buffer(struct journal_head *);
@@ -958,7 +957,7 @@ void jbd2_journal_put_journal_head(struct journal_head *jh);
 /*
  * handle management
  */
-extern kmem_cache_t *jbd2_handle_cache;
+extern struct kmem_cache *jbd2_handle_cache;
 
 static inline handle_t *jbd_alloc_handle(gfp_t gfp_flags)
 {
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index c8d5f207c3d..0ec6e28bccd 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -74,7 +74,7 @@
 #define __jiffy_data  __attribute__((section(".data")))
 
 /*
- * The 64-bit value is not volatile - you MUST NOT read it
+ * The 64-bit value is not atomic - you MUST NOT read it
  * without sampling the sequence number in xtime_lock.
  * get_jiffies_64() will do this for you as appropriate.
  */
diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h
index efe0ee4cc80..06c58c423fe 100644
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
@@ -158,7 +158,7 @@ static inline void con_schedule_flip(struct tty_struct *t)
         if (t->buf.tail != NULL)
                 t->buf.tail->commit = t->buf.tail->used;
         spin_unlock_irqrestore(&t->buf.lock, flags);
-        schedule_work(&t->buf.work);
+        schedule_delayed_work(&t->buf.work, 0);
 }
 
 #endif
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index b9b5e4ba166..63fb18dcac3 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -13,10 +13,12 @@
 #include <linux/types.h>
 #include <linux/compiler.h>
 #include <linux/bitops.h>
+#include <linux/log2.h>
 #include <asm/byteorder.h>
 #include <asm/bug.h>
 
 extern const char linux_banner[];
+extern const char linux_proc_banner[];
 
 #define INT_MAX         ((int)(~0U>>1))
 #define INT_MIN         (-INT_MAX - 1)
@@ -65,7 +67,7 @@ struct user;
  * context (spinlock, irq-handler, ...).
  *
  * This is a useful debugging help to be able to catch problems early and not
- * be biten later when the calling function happens to sleep when it is not
+ * be bitten later when the calling function happens to sleep when it is not
  * supposed to.
  */
 #ifdef CONFIG_PREEMPT_VOLUNTARY
@@ -157,20 +159,6 @@ static inline int printk(const char *s, ...) { return 0; }
 
 unsigned long int_sqrt(unsigned long);
 
-static inline int __attribute_pure__ long_log2(unsigned long x)
-{
-        int r = 0;
-        for (x >>= 1; x > 0; x >>= 1)
-                r++;
-        return r;
-}
-
-static inline unsigned long
-__attribute_const__ roundup_pow_of_two(unsigned long x)
-{
-        return 1UL << fls_long(x - 1);
-}
-
 extern int printk_ratelimit(void);
 extern int __printk_ratelimit(int ratelimit_jiffies, int ratelimit_burst);
 extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h
index 891bb2cf0aa..aea34e74c49 100644
--- a/include/linux/kernelcapi.h
+++ b/include/linux/kernelcapi.h
@@ -47,6 +47,8 @@ typedef struct kcapi_carddef {
 
 #include <linux/list.h>
 #include <linux/skbuff.h>
+#include <linux/workqueue.h>
+#include <asm/semaphore.h>
 
 #define KCI_CONTRUP     0       /* arg: struct capi_profile */
 #define KCI_CONTRDOWN   1       /* arg: NULL */
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 6427949ddf9..d02425cdd80 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -105,9 +105,14 @@ extern struct page *kimage_alloc_control_pages(struct kimage *image,
                                                 unsigned int order);
 extern void crash_kexec(struct pt_regs *);
 int kexec_should_crash(struct task_struct *);
+void crash_save_cpu(struct pt_regs *regs, int cpu);
 extern struct kimage *kexec_image;
 extern struct kimage *kexec_crash_image;
 
+#ifndef kexec_flush_icache_page
+#define kexec_flush_icache_page(page)
+#endif
+
 #define KEXEC_ON_CRASH  0x00000001
 #define KEXEC_ARCH_MASK 0xffff0000
 
@@ -122,6 +127,8 @@ extern struct kimage *kexec_crash_image;
 #define KEXEC_ARCH_IA_64   (50 << 16)
 #define KEXEC_ARCH_S390    (22 << 16)
 #define KEXEC_ARCH_SH      (42 << 16)
+#define KEXEC_ARCH_MIPS_LE (10 << 16)
+#define KEXEC_ARCH_MIPS    ( 8 << 16)
 
 #define KEXEC_FLAGS    (KEXEC_ON_CRASH)  /* List of defined/legal kexec flags */
 
@@ -131,6 +138,7 @@ extern struct resource crashk_res;
 typedef u32 note_buf_t[MAX_NOTE_BYTES/4];
 extern note_buf_t *crash_notes;
 
+
 #else /* !CONFIG_KEXEC */
 struct pt_regs;
 struct task_struct;
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index bcd9cd173c2..76538fcf2c4 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -47,6 +47,7 @@ enum kobject_action {
         KOBJ_UMOUNT     = (__force kobject_action_t) 0x05,      /* umount event for block devices (broken) */
         KOBJ_OFFLINE    = (__force kobject_action_t) 0x06,      /* device offline */
         KOBJ_ONLINE     = (__force kobject_action_t) 0x07,      /* device online */
+        KOBJ_MOVE       = (__force kobject_action_t) 0x08,      /* device move */
 };
 
 struct kobject {
@@ -76,6 +77,7 @@ extern int __must_check kobject_add(struct kobject *);
 extern void kobject_del(struct kobject *);
 
 extern int __must_check kobject_rename(struct kobject *, const char *new_name);
+extern int __must_check kobject_move(struct kobject *, struct kobject *);
 
 extern int __must_check kobject_register(struct kobject *);
 extern void kobject_unregister(struct kobject *);
@@ -263,14 +265,21 @@ extern int __must_check subsys_create_file(struct subsystem * ,
                                         struct subsys_attribute *);
 
 #if defined(CONFIG_HOTPLUG)
-void kobject_uevent(struct kobject *kobj, enum kobject_action action);
+int kobject_uevent(struct kobject *kobj, enum kobject_action action);
+int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
+                        char *envp[]);
 
 int add_uevent_var(char **envp, int num_envp, int *cur_index,
                         char *buffer, int buffer_size, int *cur_len,
                         const char *format, ...)
         __attribute__((format (printf, 7, 8)));
 #else
-static inline void kobject_uevent(struct kobject *kobj, enum kobject_action action) { }
+static inline int kobject_uevent(struct kobject *kobj, enum kobject_action action)
+{ return 0; }
+static inline int kobject_uevent_env(struct kobject *kobj,
+                                      enum kobject_action action,
+                                      char *envp[])
+{ return 0; }
 
 static inline int add_uevent_var(char **envp, int num_envp, int *cur_index,
                                       char *buffer, int buffer_size, int *cur_len, 
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index ac4c0559f75..769be39b968 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -165,7 +165,7 @@ extern void arch_disarm_kprobe(struct kprobe *p);
 extern int arch_init_kprobes(void);
 extern void show_registers(struct pt_regs *regs);
 extern kprobe_opcode_t *get_insn_slot(void);
-extern void free_insn_slot(kprobe_opcode_t *slot);
+extern void free_insn_slot(kprobe_opcode_t *slot, int dirty);
 extern void kprobes_inc_nmissed_count(struct kprobe *p);
 
 /* Get the kprobe at this addr (if any) - called with preemption disabled */
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 84eeecd60a0..611f17f79ee 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -248,9 +248,9 @@ static inline struct timeval ktime_to_timeval(const ktime_t kt)
  *
  * Returns the scalar nanoseconds representation of kt
  */
-static inline u64 ktime_to_ns(const ktime_t kt)
+static inline s64 ktime_to_ns(const ktime_t kt)
 {
-        return (u64) kt.tv.sec * NSEC_PER_SEC + kt.tv.nsec;
+        return (s64) kt.tv.sec * NSEC_PER_SEC + kt.tv.nsec;
 }
 
 #endif
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
new file mode 100644
index 00000000000..bc8b4616bad
--- /dev/null
+++ b/include/linux/kvm.h
@@ -0,0 +1,239 @@
+#ifndef __LINUX_KVM_H
+#define __LINUX_KVM_H
+
+/*
+ * Userspace interface for /dev/kvm - kernel based virtual machine
+ *
+ * Note: this interface is considered experimental and may change without
+ *       notice.
+ */
+
+#include <asm/types.h>
+#include <linux/ioctl.h>
+
+#define KVM_API_VERSION 2
+
+/*
+ * Architectural interrupt line count, and the size of the bitmap needed
+ * to hold them.
+ */
+#define KVM_NR_INTERRUPTS 256
+#define KVM_IRQ_BITMAP_SIZE_BYTES    ((KVM_NR_INTERRUPTS + 7) / 8)
+#define KVM_IRQ_BITMAP_SIZE(type)    (KVM_IRQ_BITMAP_SIZE_BYTES / sizeof(type))
+
+
+/* for KVM_CREATE_MEMORY_REGION */
+struct kvm_memory_region {
+        __u32 slot;
+        __u32 flags;
+        __u64 guest_phys_addr;
+        __u64 memory_size; /* bytes */
+};
+
+/* for kvm_memory_region::flags */
+#define KVM_MEM_LOG_DIRTY_PAGES  1UL
+
+
+#define KVM_EXIT_TYPE_FAIL_ENTRY 1
+#define KVM_EXIT_TYPE_VM_EXIT    2
+
+enum kvm_exit_reason {
+        KVM_EXIT_UNKNOWN          = 0,
+        KVM_EXIT_EXCEPTION        = 1,
+        KVM_EXIT_IO               = 2,
+        KVM_EXIT_CPUID            = 3,
+        KVM_EXIT_DEBUG            = 4,
+        KVM_EXIT_HLT              = 5,
+        KVM_EXIT_MMIO             = 6,
+        KVM_EXIT_IRQ_WINDOW_OPEN  = 7,
+};
+
+/* for KVM_RUN */
+struct kvm_run {
+        /* in */
+        __u32 vcpu;
+        __u32 emulated;  /* skip current instruction */
+        __u32 mmio_completed; /* mmio request completed */
+        __u8 request_interrupt_window;
+        __u8 padding1[3];
+
+        /* out */
+        __u32 exit_type;
+        __u32 exit_reason;
+        __u32 instruction_length;
+        __u8 ready_for_interrupt_injection;
+        __u8 if_flag;
+        __u16 padding2;
+        __u64 cr8;
+        __u64 apic_base;
+
+        union {
+                /* KVM_EXIT_UNKNOWN */
+                struct {
+                        __u32 hardware_exit_reason;
+                } hw;
+                /* KVM_EXIT_EXCEPTION */
+                struct {
+                        __u32 exception;
+                        __u32 error_code;
+                } ex;
+                /* KVM_EXIT_IO */
+                struct {
+#define KVM_EXIT_IO_IN  0
+#define KVM_EXIT_IO_OUT 1
+                        __u8 direction;
+                        __u8 size; /* bytes */
+                        __u8 string;
+                        __u8 string_down;
+                        __u8 rep;
+                        __u8 pad;
+                        __u16 port;
+                        __u64 count;
+                        union {
+                                __u64 address;
+                                __u32 value;
+                        };
+                } io;
+                struct {
+                } debug;
+                /* KVM_EXIT_MMIO */
+                struct {
+                        __u64 phys_addr;
+                        __u8  data[8];
+                        __u32 len;
+                        __u8  is_write;
+                } mmio;
+        };
+};
+
+/* for KVM_GET_REGS and KVM_SET_REGS */
+struct kvm_regs {
+        /* in */
+        __u32 vcpu;
+        __u32 padding;
+
+        /* out (KVM_GET_REGS) / in (KVM_SET_REGS) */
+        __u64 rax, rbx, rcx, rdx;
+        __u64 rsi, rdi, rsp, rbp;
+        __u64 r8,  r9,  r10, r11;
+        __u64 r12, r13, r14, r15;
+        __u64 rip, rflags;
+};
+
+struct kvm_segment {
+        __u64 base;
+        __u32 limit;
+        __u16 selector;
+        __u8  type;
+        __u8  present, dpl, db, s, l, g, avl;
+        __u8  unusable;
+        __u8  padding;
+};
+
+struct kvm_dtable {
+        __u64 base;
+        __u16 limit;
+        __u16 padding[3];
+};
+
+/* for KVM_GET_SREGS and KVM_SET_SREGS */
+struct kvm_sregs {
+        /* in */
+        __u32 vcpu;
+        __u32 padding;
+
+        /* out (KVM_GET_SREGS) / in (KVM_SET_SREGS) */
+        struct kvm_segment cs, ds, es, fs, gs, ss;
+        struct kvm_segment tr, ldt;
+        struct kvm_dtable gdt, idt;
+        __u64 cr0, cr2, cr3, cr4, cr8;
+        __u64 efer;
+        __u64 apic_base;
+        __u64 interrupt_bitmap[KVM_IRQ_BITMAP_SIZE(__u64)];
+};
+
+struct kvm_msr_entry {
+        __u32 index;
+        __u32 reserved;
+        __u64 data;
+};
+
+/* for KVM_GET_MSRS and KVM_SET_MSRS */
+struct kvm_msrs {
+        __u32 vcpu;
+        __u32 nmsrs; /* number of msrs in entries */
+
+        struct kvm_msr_entry entries[0];
+};
+
+/* for KVM_GET_MSR_INDEX_LIST */
+struct kvm_msr_list {
+        __u32 nmsrs; /* number of msrs in entries */
+        __u32 indices[0];
+};
+
+/* for KVM_TRANSLATE */
+struct kvm_translation {
+        /* in */
+        __u64 linear_address;
+        __u32 vcpu;
+        __u32 padding;
+
+        /* out */
+        __u64 physical_address;
+        __u8  valid;
+        __u8  writeable;
+        __u8  usermode;
+};
+
+/* for KVM_INTERRUPT */
+struct kvm_interrupt {
+        /* in */
+        __u32 vcpu;
+        __u32 irq;
+};
+
+struct kvm_breakpoint {
+        __u32 enabled;
+        __u32 padding;
+        __u64 address;
+};
+
+/* for KVM_DEBUG_GUEST */
+struct kvm_debug_guest {
+        /* int */
+        __u32 vcpu;
+        __u32 enabled;
+        struct kvm_breakpoint breakpoints[4];
+        __u32 singlestep;
+};
+
+/* for KVM_GET_DIRTY_LOG */
+struct kvm_dirty_log {
+        __u32 slot;
+        __u32 padding;
+        union {
+                void __user *dirty_bitmap; /* one bit per page */
+                __u64 padding;
+        };
+};
+
+#define KVMIO 0xAE
+
+#define KVM_GET_API_VERSION       _IO(KVMIO, 1)
+#define KVM_RUN                   _IOWR(KVMIO, 2, struct kvm_run)
+#define KVM_GET_REGS              _IOWR(KVMIO, 3, struct kvm_regs)
+#define KVM_SET_REGS              _IOW(KVMIO, 4, struct kvm_regs)
+#define KVM_GET_SREGS             _IOWR(KVMIO, 5, struct kvm_sregs)
+#define KVM_SET_SREGS             _IOW(KVMIO, 6, struct kvm_sregs)
+#define KVM_TRANSLATE             _IOWR(KVMIO, 7, struct kvm_translation)
+#define KVM_INTERRUPT             _IOW(KVMIO, 8, struct kvm_interrupt)
+#define KVM_DEBUG_GUEST           _IOW(KVMIO, 9, struct kvm_debug_guest)
+#define KVM_SET_MEMORY_REGION     _IOW(KVMIO, 10, struct kvm_memory_region)
+#define KVM_CREATE_VCPU           _IOW(KVMIO, 11, int /* vcpu_slot */)
+#define KVM_GET_DIRTY_LOG         _IOW(KVMIO, 12, struct kvm_dirty_log)
+#define KVM_GET_MSRS              _IOWR(KVMIO, 13, struct kvm_msrs)
+#define KVM_SET_MSRS              _IOWR(KVMIO, 14, struct kvm_msrs)
+#define KVM_GET_MSR_INDEX_LIST    _IOWR(KVMIO, 15, struct kvm_msr_list)
+
+#endif
diff --git a/include/linux/libata.h b/include/linux/libata.h
index abd2debebca..ab275483032 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -140,6 +140,7 @@ enum {
         ATA_DFLAG_LBA48         = (1 << 1), /* device supports LBA48 */
         ATA_DFLAG_CDB_INTR      = (1 << 2), /* device asserts INTRQ when ready for CDB */
         ATA_DFLAG_NCQ           = (1 << 3), /* device supports NCQ */
+        ATA_DFLAG_FLUSH_EXT     = (1 << 4), /* do FLUSH_EXT instead of FLUSH */
         ATA_DFLAG_CFG_MASK      = (1 << 8) - 1,
 
         ATA_DFLAG_PIO           = (1 << 8), /* device limited to PIO mode */
@@ -175,6 +176,7 @@ enum {
         ATA_FLAG_SKIP_D2H_BSY   = (1 << 12), /* can't wait for the first D2H
                                               * Register FIS clearing BSY */
         ATA_FLAG_DEBUGMSG       = (1 << 13),
+        ATA_FLAG_SETXFER_POLLING= (1 << 14), /* use polling for SETXFER */
 
         /* The following flag belongs to ap->pflags but is kept in
          * ap->flags because it's referenced in many LLDs and will be
@@ -283,6 +285,9 @@ enum {
         ATA_EHI_QUIET           = (1 << 3),  /* be quiet */
 
         ATA_EHI_DID_RESET       = (1 << 16), /* already reset this port */
+        ATA_EHI_PRINTINFO       = (1 << 17), /* print configuration info */
+        ATA_EHI_SETMODE         = (1 << 18), /* configure transfer mode */
+        ATA_EHI_POST_SETMODE    = (1 << 19), /* revaildating after setmode */
 
         ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK,
 
@@ -307,10 +312,11 @@ enum {
            (some horkage may be drive/controller pair dependant */
 
         ATA_HORKAGE_DIAGNOSTIC  = (1 << 0),     /* Failed boot diag */
+        ATA_HORKAGE_NODMA       = (1 << 1),     /* DMA problems */
+        ATA_HORKAGE_NONCQ       = (1 << 2),     /* Don't use NCQ */
 };
 
 enum hsm_task_states {
-        HSM_ST_UNKNOWN,         /* state unknown */
         HSM_ST_IDLE,            /* no command on going */
         HSM_ST,                 /* (waiting the device to) transfer data */
         HSM_ST_LAST,            /* (waiting the device to) complete command */
@@ -329,6 +335,7 @@ enum ata_completion_errors {
         AC_ERR_SYSTEM           = (1 << 6), /* system error */
         AC_ERR_INVALID          = (1 << 7), /* invalid argument */
         AC_ERR_OTHER            = (1 << 8), /* unknown */
+        AC_ERR_NODEV_HINT       = (1 << 9), /* polling device detection hint */
 };
 
 /* forward declarations */
@@ -568,8 +575,9 @@ struct ata_port {
         struct ata_host         *host;
         struct device           *dev;
 
-        struct work_struct      port_task;
-        struct work_struct      hotplug_task;
+        void                    *port_task_data;
+        struct delayed_work     port_task;
+        struct delayed_work     hotplug_task;
         struct work_struct      scsi_rescan_task;
 
         unsigned int            hsm_task_state;
@@ -700,6 +708,8 @@ extern int sata_phy_debounce(struct ata_port *ap, const unsigned long *param);
 extern int sata_phy_resume(struct ata_port *ap, const unsigned long *param);
 extern int ata_std_prereset(struct ata_port *ap);
 extern int ata_std_softreset(struct ata_port *ap, unsigned int *classes);
+extern int sata_port_hardreset(struct ata_port *ap,
+                               const unsigned long *timing);
 extern int sata_std_hardreset(struct ata_port *ap, unsigned int *class);
 extern void ata_std_postreset(struct ata_port *ap, unsigned int *classes);
 extern void ata_port_disable(struct ata_port *);
@@ -744,10 +754,9 @@ extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t mesg);
 extern int ata_host_suspend(struct ata_host *host, pm_message_t mesg);
 extern void ata_host_resume(struct ata_host *host);
 extern int ata_ratelimit(void);
-extern unsigned int ata_busy_sleep(struct ata_port *ap,
-                                   unsigned long timeout_pat,
-                                   unsigned long timeout);
-extern void ata_port_queue_task(struct ata_port *ap, void (*fn)(void *),
+extern int ata_busy_sleep(struct ata_port *ap,
+                          unsigned long timeout_pat, unsigned long timeout);
+extern void ata_port_queue_task(struct ata_port *ap, work_func_t fn,
                                 void *data, unsigned long delay);
 extern u32 ata_wait_register(void __iomem *reg, u32 mask, u32 val,
                              unsigned long interval_msec,
@@ -787,6 +796,7 @@ extern void ata_id_string(const u16 *id, unsigned char *s,
                           unsigned int ofs, unsigned int len);
 extern void ata_id_c_string(const u16 *id, unsigned char *s,
                             unsigned int ofs, unsigned int len);
+extern unsigned long ata_device_blacklisted(const struct ata_device *dev);
 extern void ata_bmdma_setup (struct ata_queued_cmd *qc);
 extern void ata_bmdma_start (struct ata_queued_cmd *qc);
 extern void ata_bmdma_stop(struct ata_queued_cmd *qc);
@@ -1061,7 +1071,7 @@ static inline u8 ata_busy_wait(struct ata_port *ap, unsigned int bits,
                 udelay(10);
                 status = ata_chk_status(ap);
                 max--;
-        } while ((status & bits) && (max > 0));
+        } while (status != 0xff && (status & bits) && (max > 0));
 
         return status;
 }
@@ -1082,7 +1092,7 @@ static inline u8 ata_wait_idle(struct ata_port *ap)
 {
         u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
 
-        if (status & (ATA_BUSY | ATA_DRQ)) {
+        if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ))) {
                 unsigned long l = ap->ioaddr.status_addr;
                 if (ata_msg_warn(ap))
                         printk(KERN_WARNING "ATA: abnormal status 0x%X on port 0x%lX\n",
@@ -1148,37 +1158,6 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
 }
 
 /**
- *      ata_irq_on - Enable interrupts on a port.
- *      @ap: Port on which interrupts are enabled.
- *
- *      Enable interrupts on a legacy IDE device using MMIO or PIO,
- *      wait for idle, clear any pending interrupts.
- *
- *      LOCKING:
- *      Inherited from caller.
- */
-
-static inline u8 ata_irq_on(struct ata_port *ap)
-{
-        struct ata_ioports *ioaddr = &ap->ioaddr;
-        u8 tmp;
-
-        ap->ctl &= ~ATA_NIEN;
-        ap->last_ctl = ap->ctl;
-
-        if (ap->flags & ATA_FLAG_MMIO)
-                writeb(ap->ctl, (void __iomem *) ioaddr->ctl_addr);
-        else
-                outb(ap->ctl, ioaddr->ctl_addr);
-        tmp = ata_wait_idle(ap);
-
-        ap->ops->irq_clear(ap);
-
-        return tmp;
-}
-
-
-/**
  *      ata_irq_ack - Acknowledge a device interrupt.
  *      @ap: Port on which interrupts are enabled.
  *
diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
index aa50d89eacd..246de1d84a2 100644
--- a/include/linux/lockd/bind.h
+++ b/include/linux/lockd/bind.h
@@ -23,7 +23,7 @@ struct svc_rqst;
  * This is the set of functions for lockd->nfsd communication
  */
 struct nlmsvc_binding {
-        u32                     (*fopen)(struct svc_rqst *,
+        __be32                  (*fopen)(struct svc_rqst *,
                                                 struct nfs_fh *,
                                                 struct file **);
         void                    (*fclose)(struct file *);
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 862d9730a60..ac25b5649c5 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -164,14 +164,12 @@ void		  nlmclnt_next_cookie(struct nlm_cookie *);
  */
 struct nlm_host * nlmclnt_lookup_host(const struct sockaddr_in *, int, int, const char *, int);
 struct nlm_host * nlmsvc_lookup_host(struct svc_rqst *, const char *, int);
-struct nlm_host * nlm_lookup_host(int server, const struct sockaddr_in *, int, int, const char *, int);
 struct rpc_clnt * nlm_bind_host(struct nlm_host *);
 void              nlm_rebind_host(struct nlm_host *);
 struct nlm_host * nlm_get_host(struct nlm_host *);
 void              nlm_release_host(struct nlm_host *);
 void              nlm_shutdown_hosts(void);
 extern void       nlm_host_rebooted(const struct sockaddr_in *, const char *, int, u32);
-struct nsm_handle *nsm_find(const struct sockaddr_in *, const char *, int);
 void              nsm_release(struct nsm_handle *);
 
 
@@ -193,7 +191,7 @@ __be32		  nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *);
 unsigned long     nlmsvc_retry_blocked(void);
 void              nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
                                         nlm_host_match_fn_t match);
-void              nlmsvc_grant_reply(struct nlm_cookie *, u32);
+void              nlmsvc_grant_reply(struct nlm_cookie *, __be32);
 
 /*
  * File handling for the server personality
@@ -208,7 +206,7 @@ void		  nlmsvc_invalidate_all(void);
 static __inline__ struct inode *
 nlmsvc_file_inode(struct nlm_file *file)
 {
-        return file->f_file->f_dentry->d_inode;
+        return file->f_file->f_path.dentry->d_inode;
 }
 
 /*
diff --git a/include/linux/lockd/sm_inter.h b/include/linux/lockd/sm_inter.h
index fc61d40964d..22a645828f2 100644
--- a/include/linux/lockd/sm_inter.h
+++ b/include/linux/lockd/sm_inter.h
@@ -24,7 +24,7 @@
  * Arguments for all calls to statd
  */
 struct nsm_args {
-        u32             addr;           /* remote address */
+        __be32          addr;           /* remote address */
         u32             prog;           /* RPC callback info */
         u32             vers;
         u32             proc;
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index 29e7d9fc9da..83a1f9f6237 100644
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -69,7 +69,7 @@ typedef struct nlm_args nlm_args;
  */
 struct nlm_res {
         struct nlm_cookie       cookie;
-        u32                     status;
+        __be32                  status;
         struct nlm_lock         lock;
 };
 
@@ -80,9 +80,9 @@ struct nlm_reboot {
         char *          mon;
         int             len;
         u32             state;
-        u32             addr;
-        u32             vers;
-        u32             proto;
+        __be32          addr;
+        __be32          vers;
+        __be32          proto;
 };
 
 /*
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 819f08f1310..ea097dddc44 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -193,7 +193,6 @@ extern void lockdep_free_key_range(void *start, unsigned long size);
 
 extern void lockdep_off(void);
 extern void lockdep_on(void);
-extern int lockdep_internal(void);
 
 /*
  * These methods are used by specific locking variants (spinlocks,
@@ -243,6 +242,8 @@ extern void lock_release(struct lockdep_map *lock, int nested,
 
 # define INIT_LOCKDEP                           .lockdep_recursion = 0,
 
+#define lockdep_depth(tsk)      ((tsk)->lockdep_depth)
+
 #else /* !LOCKDEP */
 
 static inline void lockdep_off(void)
@@ -253,11 +254,6 @@ static inline void lockdep_on(void)
 {
 }
 
-static inline int lockdep_internal(void)
-{
-        return 0;
-}
-
 # define lock_acquire(l, s, t, r, c, i)         do { } while (0)
 # define lock_release(l, n, i)                  do { } while (0)
 # define lockdep_init()                         do { } while (0)
@@ -277,20 +273,33 @@ static inline int lockdep_internal(void)
  * The class key takes no space if lockdep is disabled:
  */
 struct lock_class_key { };
+
+#define lockdep_depth(tsk)      (0)
+
 #endif /* !LOCKDEP */
 
 #if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_GENERIC_HARDIRQS)
 extern void early_init_irq_lock_class(void);
 #else
-# define early_init_irq_lock_class()            do { } while (0)
+static inline void early_init_irq_lock_class(void)
+{
+}
 #endif
 
 #ifdef CONFIG_TRACE_IRQFLAGS
 extern void early_boot_irqs_off(void);
 extern void early_boot_irqs_on(void);
+extern void print_irqtrace_events(struct task_struct *curr);
 #else
-# define early_boot_irqs_off()                  do { } while (0)
-# define early_boot_irqs_on()                   do { } while (0)
+static inline void early_boot_irqs_off(void)
+{
+}
+static inline void early_boot_irqs_on(void)
+{
+}
+static inline void print_irqtrace_events(struct task_struct *curr)
+{
+}
 #endif
 
 /*
diff --git a/include/linux/log2.h b/include/linux/log2.h
new file mode 100644
index 00000000000..d02e1a547a7
--- /dev/null
+++ b/include/linux/log2.h
@@ -0,0 +1,157 @@
+/* Integer base 2 logarithm calculation
+ *
+ * Copyright (C) 2006 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_LOG2_H
+#define _LINUX_LOG2_H
+
+#include <linux/types.h>
+#include <linux/bitops.h>
+
+/*
+ * deal with unrepresentable constant logarithms
+ */
+extern __attribute__((const, noreturn))
+int ____ilog2_NaN(void);
+
+/*
+ * non-constant log of base 2 calculators
+ * - the arch may override these in asm/bitops.h if they can be implemented
+ *   more efficiently than using fls() and fls64()
+ * - the arch is not required to handle n==0 if implementing the fallback
+ */
+#ifndef CONFIG_ARCH_HAS_ILOG2_U32
+static inline __attribute__((const))
+int __ilog2_u32(u32 n)
+{
+        return fls(n) - 1;
+}
+#endif
+
+#ifndef CONFIG_ARCH_HAS_ILOG2_U64
+static inline __attribute__((const))
+int __ilog2_u64(u64 n)
+{
+        return fls64(n) - 1;
+}
+#endif
+
+/*
+ * round up to nearest power of two
+ */
+static inline __attribute__((const))
+unsigned long __roundup_pow_of_two(unsigned long n)
+{
+        return 1UL << fls_long(n - 1);
+}
+
+/**
+ * ilog2 - log of base 2 of 32-bit or a 64-bit unsigned value
+ * @n - parameter
+ *
+ * constant-capable log of base 2 calculation
+ * - this can be used to initialise global variables from constant data, hence
+ *   the massive ternary operator construction
+ *
+ * selects the appropriately-sized optimised version depending on sizeof(n)
+ */
+#define ilog2(n)                                \
+(                                               \
+        __builtin_constant_p(n) ? (             \
+                (n) < 1 ? ____ilog2_NaN() :     \
+                (n) & (1ULL << 63) ? 63 :       \
+                (n) & (1ULL << 62) ? 62 :       \
+                (n) & (1ULL << 61) ? 61 :       \
+                (n) & (1ULL << 60) ? 60 :       \
+                (n) & (1ULL << 59) ? 59 :       \
+                (n) & (1ULL << 58) ? 58 :       \
+                (n) & (1ULL << 57) ? 57 :       \
+                (n) & (1ULL << 56) ? 56 :       \
+                (n) & (1ULL << 55) ? 55 :       \
+                (n) & (1ULL << 54) ? 54 :       \
+                (n) & (1ULL << 53) ? 53 :       \
+                (n) & (1ULL << 52) ? 52 :       \
+                (n) & (1ULL << 51) ? 51 :       \
+                (n) & (1ULL << 50) ? 50 :       \
+                (n) & (1ULL << 49) ? 49 :       \
+                (n) & (1ULL << 48) ? 48 :       \
+                (n) & (1ULL << 47) ? 47 :       \
+                (n) & (1ULL << 46) ? 46 :       \
+                (n) & (1ULL << 45) ? 45 :       \
+                (n) & (1ULL << 44) ? 44 :       \
+                (n) & (1ULL << 43) ? 43 :       \
+                (n) & (1ULL << 42) ? 42 :       \
+                (n) & (1ULL << 41) ? 41 :       \
+                (n) & (1ULL << 40) ? 40 :       \
+                (n) & (1ULL << 39) ? 39 :       \
+                (n) & (1ULL << 38) ? 38 :       \
+                (n) & (1ULL << 37) ? 37 :       \
+                (n) & (1ULL << 36) ? 36 :       \
+                (n) & (1ULL << 35) ? 35 :       \
+                (n) & (1ULL << 34) ? 34 :       \
+                (n) & (1ULL << 33) ? 33 :       \
+                (n) & (1ULL << 32) ? 32 :       \
+                (n) & (1ULL << 31) ? 31 :       \
+                (n) & (1ULL << 30) ? 30 :       \
+                (n) & (1ULL << 29) ? 29 :       \
+                (n) & (1ULL << 28) ? 28 :       \
+                (n) & (1ULL << 27) ? 27 :       \
+                (n) & (1ULL << 26) ? 26 :       \
+                (n) & (1ULL << 25) ? 25 :       \
+                (n) & (1ULL << 24) ? 24 :       \
+                (n) & (1ULL << 23) ? 23 :       \
+                (n) & (1ULL << 22) ? 22 :       \
+                (n) & (1ULL << 21) ? 21 :       \
+                (n) & (1ULL << 20) ? 20 :       \
+                (n) & (1ULL << 19) ? 19 :       \
+                (n) & (1ULL << 18) ? 18 :       \
+                (n) & (1ULL << 17) ? 17 :       \
+                (n) & (1ULL << 16) ? 16 :       \
+                (n) & (1ULL << 15) ? 15 :       \
+                (n) & (1ULL << 14) ? 14 :       \
+                (n) & (1ULL << 13) ? 13 :       \
+                (n) & (1ULL << 12) ? 12 :       \
+                (n) & (1ULL << 11) ? 11 :       \
+                (n) & (1ULL << 10) ? 10 :       \
+                (n) & (1ULL <<  9) ?  9 :       \
+                (n) & (1ULL <<  8) ?  8 :       \
+                (n) & (1ULL <<  7) ?  7 :       \
+                (n) & (1ULL <<  6) ?  6 :       \
+                (n) & (1ULL <<  5) ?  5 :       \
+                (n) & (1ULL <<  4) ?  4 :       \
+                (n) & (1ULL <<  3) ?  3 :       \
+                (n) & (1ULL <<  2) ?  2 :       \
+                (n) & (1ULL <<  1) ?  1 :       \
+                (n) & (1ULL <<  0) ?  0 :       \
+                ____ilog2_NaN()                 \
+                                   ) :          \
+        (sizeof(n) <= 4) ?                      \
+        __ilog2_u32(n) :                        \
+        __ilog2_u64(n)                          \
+ )
+
+/**
+ * roundup_pow_of_two - round the given value up to nearest power of two
+ * @n - parameter
+ *
+ * round the given balue up to the nearest power of two
+ * - the result is undefined when n == 0
+ * - this can be used to initialise global variables from constant data
+ */
+#define roundup_pow_of_two(n)                   \
+(                                               \
+        __builtin_constant_p(n) ? (             \
+                (n == 1) ? 0 :                  \
+                (1UL << (ilog2((n) - 1) + 1))   \
+                                   ) :          \
+        __roundup_pow_of_two(n)                 \
+ )
+
+#endif /* _LINUX_LOG2_H */
diff --git a/include/linux/magic.h b/include/linux/magic.h
index 156c40fc664..b78bbf42135 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -3,6 +3,7 @@
 
 #define ADFS_SUPER_MAGIC        0xadf5
 #define AFFS_SUPER_MAGIC        0xadff
+#define AFS_SUPER_MAGIC                0x5346414F
 #define AUTOFS_SUPER_MAGIC      0x0187
 #define CODA_SUPER_MAGIC        0x73757245
 #define EFS_SUPER_MAGIC         0x414A53
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index b03cfb91e22..326da7d500c 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -31,15 +31,14 @@
 #define HPET_MINOR           228
 
 struct device;
-struct class_device;
 
 struct miscdevice  {
         int minor;
         const char *name;
         const struct file_operations *fops;
         struct list_head list;
-        struct device *dev;
-        struct class_device *class;
+        struct device *parent;
+        struct device *this_device;
 };
 
 extern int misc_register(struct miscdevice * misc);
diff --git a/include/linux/mm.h b/include/linux/mm.h
index d538de90196..76912231af4 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -114,6 +114,8 @@ struct vm_area_struct {
 #endif
 };
 
+extern struct kmem_cache *vm_area_cachep;
+
 /*
  * This struct defines the per-mm list of VMAs for uClinux. If CONFIG_MMU is
  * disabled, then there's a single shared list of VMAs maintained by the
@@ -294,6 +296,24 @@ void put_pages_list(struct list_head *pages);
 void split_page(struct page *page, unsigned int order);
 
 /*
+ * Compound pages have a destructor function.  Provide a
+ * prototype for that function and accessor functions.
+ * These are _only_ valid on the head of a PG_compound page.
+ */
+typedef void compound_page_dtor(struct page *);
+
+static inline void set_compound_page_dtor(struct page *page,
+                                                compound_page_dtor *dtor)
+{
+        page[1].lru.next = (void *)dtor;
+}
+
+static inline compound_page_dtor *get_compound_page_dtor(struct page *page)
+{
+        return (compound_page_dtor *)page[1].lru.next;
+}
+
+/*
  * Multiple processes may "see" the same page. E.g. for untouched
  * mappings of /dev/null, all processes see the same page full of
  * zeroes, and text pages of executables and shared libraries have
@@ -396,7 +416,9 @@ void split_page(struct page *page, unsigned int order);
  * We are going to use the flags for the page to node mapping if its in
  * there.  This includes the case where there is no node, so it is implicit.
  */
-#define FLAGS_HAS_NODE          (NODES_WIDTH > 0 || NODES_SHIFT == 0)
+#if !(NODES_WIDTH > 0 || NODES_SHIFT == 0)
+#define NODE_NOT_IN_PAGE_FLAGS
+#endif
 
 #ifndef PFN_SECTION_SHIFT
 #define PFN_SECTION_SHIFT 0
@@ -411,13 +433,18 @@ void split_page(struct page *page, unsigned int order);
 #define NODES_PGSHIFT           (NODES_PGOFF * (NODES_WIDTH != 0))
 #define ZONES_PGSHIFT           (ZONES_PGOFF * (ZONES_WIDTH != 0))
 
-/* NODE:ZONE or SECTION:ZONE is used to lookup the zone from a page. */
-#if FLAGS_HAS_NODE
-#define ZONETABLE_SHIFT         (NODES_SHIFT + ZONES_SHIFT)
+/* NODE:ZONE or SECTION:ZONE is used to ID a zone for the buddy allcator */
+#ifdef NODE_NOT_IN_PAGEFLAGS
+#define ZONEID_SHIFT            (SECTIONS_SHIFT + ZONES_SHIFT)
+#else
+#define ZONEID_SHIFT            (NODES_SHIFT + ZONES_SHIFT)
+#endif
+
+#if ZONES_WIDTH > 0
+#define ZONEID_PGSHIFT          ZONES_PGSHIFT
 #else
-#define ZONETABLE_SHIFT         (SECTIONS_SHIFT + ZONES_SHIFT)
+#define ZONEID_PGSHIFT          NODES_PGOFF
 #endif
-#define ZONETABLE_PGSHIFT       ZONES_PGSHIFT
 
 #if SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH > FLAGS_RESERVED
 #error SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH > FLAGS_RESERVED
@@ -426,26 +453,28 @@ void split_page(struct page *page, unsigned int order);
 #define ZONES_MASK              ((1UL << ZONES_WIDTH) - 1)
 #define NODES_MASK              ((1UL << NODES_WIDTH) - 1)
 #define SECTIONS_MASK           ((1UL << SECTIONS_WIDTH) - 1)
-#define ZONETABLE_MASK          ((1UL << ZONETABLE_SHIFT) - 1)
+#define ZONEID_MASK             ((1UL << ZONEID_SHIFT) - 1)
 
 static inline enum zone_type page_zonenum(struct page *page)
 {
         return (page->flags >> ZONES_PGSHIFT) & ZONES_MASK;
 }
 
-struct zone;
-extern struct zone *zone_table[];
-
+/*
+ * The identification function is only used by the buddy allocator for
+ * determining if two pages could be buddies. We are not really
+ * identifying a zone since we could be using a the section number
+ * id if we have not node id available in page flags.
+ * We guarantee only that it will return the same value for two
+ * combinable pages in a zone.
+ */
 static inline int page_zone_id(struct page *page)
 {
-        return (page->flags >> ZONETABLE_PGSHIFT) & ZONETABLE_MASK;
-}
-static inline struct zone *page_zone(struct page *page)
-{
-        return zone_table[page_zone_id(page)];
+        BUILD_BUG_ON(ZONEID_PGSHIFT == 0 && ZONEID_MASK);
+        return (page->flags >> ZONEID_PGSHIFT) & ZONEID_MASK;
 }
 
-static inline unsigned long zone_to_nid(struct zone *zone)
+static inline int zone_to_nid(struct zone *zone)
 {
 #ifdef CONFIG_NUMA
         return zone->node;
@@ -454,13 +483,20 @@ static inline unsigned long zone_to_nid(struct zone *zone)
 #endif
 }
 
-static inline unsigned long page_to_nid(struct page *page)
+#ifdef NODE_NOT_IN_PAGE_FLAGS
+extern int page_to_nid(struct page *page);
+#else
+static inline int page_to_nid(struct page *page)
+{
+        return (page->flags >> NODES_PGSHIFT) & NODES_MASK;
+}
+#endif
+
+static inline struct zone *page_zone(struct page *page)
 {
-        if (FLAGS_HAS_NODE)
-                return (page->flags >> NODES_PGSHIFT) & NODES_MASK;
-        else
-                return zone_to_nid(page_zone(page));
+        return &NODE_DATA(page_to_nid(page))->node_zones[page_zonenum(page)];
 }
+
 static inline unsigned long page_to_section(struct page *page)
 {
         return (page->flags >> SECTIONS_PGSHIFT) & SECTIONS_MASK;
@@ -477,6 +513,7 @@ static inline void set_page_node(struct page *page, unsigned long node)
         page->flags &= ~(NODES_MASK << NODES_PGSHIFT);
         page->flags |= (node & NODES_MASK) << NODES_PGSHIFT;
 }
+
 static inline void set_page_section(struct page *page, unsigned long section)
 {
         page->flags &= ~(SECTIONS_MASK << SECTIONS_PGSHIFT);
@@ -941,14 +978,13 @@ extern int early_pfn_to_nid(unsigned long pfn);
 #endif /* CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID */
 #endif /* CONFIG_ARCH_POPULATES_NODE_MAP */
 extern void set_dma_reserve(unsigned long new_dma_reserve);
-extern void memmap_init_zone(unsigned long, int, unsigned long, unsigned long);
+extern void memmap_init_zone(unsigned long, int, unsigned long,
+                                unsigned long, enum memmap_context);
 extern void setup_per_zone_pages_min(void);
 extern void mem_init(void);
 extern void show_mem(void);
 extern void si_meminfo(struct sysinfo * val);
 extern void si_meminfo_node(struct sysinfo *val, int nid);
-extern void zonetable_add(struct zone *zone, int nid, enum zone_type zid,
-                                        unsigned long pfn, unsigned long size);
 
 #ifdef CONFIG_NUMA
 extern void setup_per_cpu_pageset(void);
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 991a37382a2..d0e6a549761 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -39,6 +39,10 @@ struct mmc_csd {
                                 write_misalign:1;
 };
 
+struct mmc_ext_csd {
+        unsigned int            hs_max_dtr;
+};
+
 struct sd_scr {
         unsigned char           sda_vsn;
         unsigned char           bus_widths;
@@ -46,6 +50,10 @@ struct sd_scr {
 #define SD_SCR_BUS_WIDTH_4      (1<<2)
 };
 
+struct sd_switch_caps {
+        unsigned int            hs_max_dtr;
+};
+
 struct mmc_host;
 
 /*
@@ -62,12 +70,15 @@ struct mmc_card {
 #define MMC_STATE_BAD           (1<<2)          /* unrecognised device */
 #define MMC_STATE_SDCARD        (1<<3)          /* is an SD card */
 #define MMC_STATE_READONLY      (1<<4)          /* card is read-only */
+#define MMC_STATE_HIGHSPEED     (1<<5)          /* card is in high speed mode */
         u32                     raw_cid[4];     /* raw card CID */
         u32                     raw_csd[4];     /* raw card CSD */
         u32                     raw_scr[2];     /* raw card SCR */
         struct mmc_cid          cid;            /* card identification */
         struct mmc_csd          csd;            /* card specific */
+        struct mmc_ext_csd      ext_csd;        /* mmc v4 extended card specific */
         struct sd_scr           scr;            /* extra SD information */
+        struct sd_switch_caps   sw_caps;        /* switch (CMD6) caps */
 };
 
 #define mmc_card_present(c)     ((c)->state & MMC_STATE_PRESENT)
@@ -75,12 +86,14 @@ struct mmc_card {
 #define mmc_card_bad(c)         ((c)->state & MMC_STATE_BAD)
 #define mmc_card_sd(c)          ((c)->state & MMC_STATE_SDCARD)
 #define mmc_card_readonly(c)    ((c)->state & MMC_STATE_READONLY)
+#define mmc_card_highspeed(c)   ((c)->state & MMC_STATE_HIGHSPEED)
 
 #define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT)
 #define mmc_card_set_dead(c)    ((c)->state |= MMC_STATE_DEAD)
 #define mmc_card_set_bad(c)     ((c)->state |= MMC_STATE_BAD)
 #define mmc_card_set_sd(c)      ((c)->state |= MMC_STATE_SDCARD)
 #define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY)
+#define mmc_card_set_highspeed(c) ((c)->state |= MMC_STATE_HIGHSPEED)
 
 #define mmc_card_name(c)        ((c)->cid.prod_name)
 #define mmc_card_id(c)          ((c)->dev.bus_id)
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 587264a58d5..c15ae1986b9 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -74,8 +74,8 @@ struct mmc_card;
 struct device;
 
 struct mmc_host {
-        struct device           *dev;
-        struct class_device     class_dev;
+        struct device           *parent;
+        struct device           class_dev;
         int                     index;
         const struct mmc_host_ops *ops;
         unsigned int            f_min;
@@ -110,7 +110,7 @@ struct mmc_host {
         struct mmc_card         *card_busy;     /* the MMC card claiming host */
         struct mmc_card         *card_selected; /* the selected MMC card */
 
-        struct work_struct      detect;
+        struct delayed_work     detect;
 
         unsigned long           private[0] ____cacheline_aligned;
 };
@@ -125,8 +125,8 @@ static inline void *mmc_priv(struct mmc_host *host)
         return (void *)host->private;
 }
 
-#define mmc_dev(x)      ((x)->dev)
-#define mmc_hostname(x) ((x)->class_dev.class_id)
+#define mmc_dev(x)      ((x)->parent)
+#define mmc_hostname(x) ((x)->class_dev.bus_id)
 
 extern int mmc_suspend_host(struct mmc_host *, pm_message_t);
 extern int mmc_resume_host(struct mmc_host *);
diff --git a/include/linux/mmc/protocol.h b/include/linux/mmc/protocol.h
index 08dec8d9e70..2dce60c43f4 100644
--- a/include/linux/mmc/protocol.h
+++ b/include/linux/mmc/protocol.h
@@ -25,14 +25,16 @@
 #ifndef MMC_MMC_PROTOCOL_H
 #define MMC_MMC_PROTOCOL_H
 
-/* Standard MMC commands (3.1)           type  argument     response */
+/* Standard MMC commands (4.1)           type  argument     response */
    /* class 1 */
 #define MMC_GO_IDLE_STATE         0   /* bc                          */
 #define MMC_SEND_OP_COND          1   /* bcr  [31:0] OCR         R3  */
 #define MMC_ALL_SEND_CID          2   /* bcr                     R2  */
 #define MMC_SET_RELATIVE_ADDR     3   /* ac   [31:16] RCA        R1  */
 #define MMC_SET_DSR               4   /* bc   [31:16] RCA            */
+#define MMC_SWITCH                6   /* ac   [31:0] See below   R1b */
 #define MMC_SELECT_CARD           7   /* ac   [31:16] RCA        R1  */
+#define MMC_SEND_EXT_CSD          8   /* adtc                    R1  */
 #define MMC_SEND_CSD              9   /* ac   [31:16] RCA        R2  */
 #define MMC_SEND_CID             10   /* ac   [31:16] RCA        R2  */
 #define MMC_READ_DAT_UNTIL_STOP  11   /* adtc [31:0] dadr        R1  */
@@ -80,6 +82,7 @@
   /* class 8 */
 /* This is basically the same command as for MMC with some quirks. */
 #define SD_SEND_RELATIVE_ADDR     3   /* bcr                     R6  */
+#define SD_SWITCH                 6   /* adtc [31:0] See below   R1  */
 
   /* Application commands */
 #define SD_APP_SET_BUS_WIDTH      6   /* ac   [1:0] bus width    R1  */
@@ -88,6 +91,30 @@
 #define SD_APP_SEND_SCR          51   /* adtc                    R1  */
 
 /*
+ * MMC_SWITCH argument format:
+ *
+ *      [31:26] Always 0
+ *      [25:24] Access Mode
+ *      [23:16] Location of target Byte in EXT_CSD
+ *      [15:08] Value Byte
+ *      [07:03] Always 0
+ *      [02:00] Command Set
+ */
+
+/*
+ * SD_SWITCH argument format:
+ *
+ *      [31] Check (0) or switch (1)
+ *      [30:24] Reserved (0)
+ *      [23:20] Function group 6
+ *      [19:16] Function group 5
+ *      [15:12] Function group 4
+ *      [11:8] Function group 3
+ *      [7:4] Function group 2
+ *      [3:0] Function group 1
+ */
+
+/*
   MMC status in R1
   Type
         e : error bit
@@ -230,13 +257,54 @@ struct _mmc_csd {
 
 #define CSD_STRUCT_VER_1_0  0           /* Valid for system specification 1.0 - 1.2 */
 #define CSD_STRUCT_VER_1_1  1           /* Valid for system specification 1.4 - 2.2 */
-#define CSD_STRUCT_VER_1_2  2           /* Valid for system specification 3.1       */
+#define CSD_STRUCT_VER_1_2  2           /* Valid for system specification 3.1 - 3.2 - 3.31 - 4.0 - 4.1 */
+#define CSD_STRUCT_EXT_CSD  3           /* Version is coded in CSD_STRUCTURE in EXT_CSD */
 
 #define CSD_SPEC_VER_0      0           /* Implements system specification 1.0 - 1.2 */
 #define CSD_SPEC_VER_1      1           /* Implements system specification 1.4 */
 #define CSD_SPEC_VER_2      2           /* Implements system specification 2.0 - 2.2 */
-#define CSD_SPEC_VER_3      3           /* Implements system specification 3.1 */
+#define CSD_SPEC_VER_3      3           /* Implements system specification 3.1 - 3.2 - 3.31 */
+#define CSD_SPEC_VER_4      4           /* Implements system specification 4.0 - 4.1 */
+
+/*
+ * EXT_CSD fields
+ */
+
+#define EXT_CSD_BUS_WIDTH       183     /* R/W */
+#define EXT_CSD_HS_TIMING       185     /* R/W */
+#define EXT_CSD_CARD_TYPE       196     /* RO */
+
+/*
+ * EXT_CSD field definitions
+ */
+
+#define EXT_CSD_CMD_SET_NORMAL          (1<<0)
+#define EXT_CSD_CMD_SET_SECURE          (1<<1)
+#define EXT_CSD_CMD_SET_CPSECURE        (1<<2)
+
+#define EXT_CSD_CARD_TYPE_26    (1<<0)  /* Card can run at 26MHz */
+#define EXT_CSD_CARD_TYPE_52    (1<<1)  /* Card can run at 52MHz */
+
+#define EXT_CSD_BUS_WIDTH_1     0       /* Card is in 1 bit mode */
+#define EXT_CSD_BUS_WIDTH_4     1       /* Card is in 4 bit mode */
+#define EXT_CSD_BUS_WIDTH_8     2       /* Card is in 8 bit mode */
+
+/*
+ * MMC_SWITCH access modes
+ */
+
+#define MMC_SWITCH_MODE_CMD_SET         0x00    /* Change the command set */
+#define MMC_SWITCH_MODE_SET_BITS        0x01    /* Set bits which are 1 in value */
+#define MMC_SWITCH_MODE_CLEAR_BITS      0x02    /* Clear bits which are 1 in value */
+#define MMC_SWITCH_MODE_WRITE_BYTE      0x03    /* Set target to value */
+
+/*
+ * SCR field definitions
+ */
 
+#define SCR_SPEC_VER_0      0           /* Implements system specification 1.0 - 1.01 */
+#define SCR_SPEC_VER_1      1           /* Implements system specification 1.10 */
+#define SCR_SPEC_VER_2      2           /* Implements system specification 2.00 */
 
 /*
  * SD bus widths
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index e06683e2bea..b262f47961f 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -278,7 +278,7 @@ struct zone {
         /*
          * rarely used fields:
          */
-        char                    *name;
+        const char              *name;
 } ____cacheline_internodealigned_in_smp;
 
 /*
@@ -288,19 +288,94 @@ struct zone {
  */
 #define DEF_PRIORITY 12
 
+/* Maximum number of zones on a zonelist */
+#define MAX_ZONES_PER_ZONELIST (MAX_NUMNODES * MAX_NR_ZONES)
+
+#ifdef CONFIG_NUMA
+/*
+ * We cache key information from each zonelist for smaller cache
+ * footprint when scanning for free pages in get_page_from_freelist().
+ *
+ * 1) The BITMAP fullzones tracks which zones in a zonelist have come
+ *    up short of free memory since the last time (last_fullzone_zap)
+ *    we zero'd fullzones.
+ * 2) The array z_to_n[] maps each zone in the zonelist to its node
+ *    id, so that we can efficiently evaluate whether that node is
+ *    set in the current tasks mems_allowed.
+ *
+ * Both fullzones and z_to_n[] are one-to-one with the zonelist,
+ * indexed by a zones offset in the zonelist zones[] array.
+ *
+ * The get_page_from_freelist() routine does two scans.  During the
+ * first scan, we skip zones whose corresponding bit in 'fullzones'
+ * is set or whose corresponding node in current->mems_allowed (which
+ * comes from cpusets) is not set.  During the second scan, we bypass
+ * this zonelist_cache, to ensure we look methodically at each zone.
+ *
+ * Once per second, we zero out (zap) fullzones, forcing us to
+ * reconsider nodes that might have regained more free memory.
+ * The field last_full_zap is the time we last zapped fullzones.
+ *
+ * This mechanism reduces the amount of time we waste repeatedly
+ * reexaming zones for free memory when they just came up low on
+ * memory momentarilly ago.
+ *
+ * The zonelist_cache struct members logically belong in struct
+ * zonelist.  However, the mempolicy zonelists constructed for
+ * MPOL_BIND are intentionally variable length (and usually much
+ * shorter).  A general purpose mechanism for handling structs with
+ * multiple variable length members is more mechanism than we want
+ * here.  We resort to some special case hackery instead.
+ *
+ * The MPOL_BIND zonelists don't need this zonelist_cache (in good
+ * part because they are shorter), so we put the fixed length stuff
+ * at the front of the zonelist struct, ending in a variable length
+ * zones[], as is needed by MPOL_BIND.
+ *
+ * Then we put the optional zonelist cache on the end of the zonelist
+ * struct.  This optional stuff is found by a 'zlcache_ptr' pointer in
+ * the fixed length portion at the front of the struct.  This pointer
+ * both enables us to find the zonelist cache, and in the case of
+ * MPOL_BIND zonelists, (which will just set the zlcache_ptr to NULL)
+ * to know that the zonelist cache is not there.
+ *
+ * The end result is that struct zonelists come in two flavors:
+ *  1) The full, fixed length version, shown below, and
+ *  2) The custom zonelists for MPOL_BIND.
+ * The custom MPOL_BIND zonelists have a NULL zlcache_ptr and no zlcache.
+ *
+ * Even though there may be multiple CPU cores on a node modifying
+ * fullzones or last_full_zap in the same zonelist_cache at the same
+ * time, we don't lock it.  This is just hint data - if it is wrong now
+ * and then, the allocator will still function, perhaps a bit slower.
+ */
+
+
+struct zonelist_cache {
+        unsigned short z_to_n[MAX_ZONES_PER_ZONELIST];          /* zone->nid */
+        DECLARE_BITMAP(fullzones, MAX_ZONES_PER_ZONELIST);      /* zone full? */
+        unsigned long last_full_zap;            /* when last zap'd (jiffies) */
+};
+#else
+struct zonelist_cache;
+#endif
+
 /*
  * One allocation request operates on a zonelist. A zonelist
  * is a list of zones, the first one is the 'goal' of the
  * allocation, the other zones are fallback zones, in decreasing
  * priority.
  *
- * Right now a zonelist takes up less than a cacheline. We never
- * modify it apart from boot-up, and only a few indices are used,
- * so despite the zonelist table being relatively big, the cache
- * footprint of this construct is very small.
+ * If zlcache_ptr is not NULL, then it is just the address of zlcache,
+ * as explained above.  If zlcache_ptr is NULL, there is no zlcache.
  */
+
 struct zonelist {
-        struct zone *zones[MAX_NUMNODES * MAX_NR_ZONES + 1]; // NULL delimited
+        struct zonelist_cache *zlcache_ptr;                  // NULL or &zlcache
+        struct zone *zones[MAX_ZONES_PER_ZONELIST + 1];      // NULL delimited
+#ifdef CONFIG_NUMA
+        struct zonelist_cache zlcache;                       // optional ...
+#endif
 };
 
 #ifdef CONFIG_ARCH_POPULATES_NODE_MAP
@@ -375,9 +450,13 @@ void build_all_zonelists(void);
 void wakeup_kswapd(struct zone *zone, int order);
 int zone_watermark_ok(struct zone *z, int order, unsigned long mark,
                 int classzone_idx, int alloc_flags);
-
+enum memmap_context {
+        MEMMAP_EARLY,
+        MEMMAP_HOTPLUG,
+};
 extern int init_currently_empty_zone(struct zone *zone, unsigned long start_pfn,
-                                     unsigned long size);
+                                     unsigned long size,
+                                     enum memmap_context context);
 
 #ifdef CONFIG_HAVE_MEMORY_PRESENT
 void memory_present(int nid, unsigned long start, unsigned long end);
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
new file mode 100644
index 00000000000..4af0b1fc282
--- /dev/null
+++ b/include/linux/mnt_namespace.h
@@ -0,0 +1,42 @@
+#ifndef _NAMESPACE_H_
+#define _NAMESPACE_H_
+#ifdef __KERNEL__
+
+#include <linux/mount.h>
+#include <linux/sched.h>
+#include <linux/nsproxy.h>
+
+struct mnt_namespace {
+        atomic_t                count;
+        struct vfsmount *       root;
+        struct list_head        list;
+        wait_queue_head_t poll;
+        int event;
+};
+
+extern int copy_mnt_ns(int, struct task_struct *);
+extern void __put_mnt_ns(struct mnt_namespace *ns);
+extern struct mnt_namespace *dup_mnt_ns(struct task_struct *,
+                struct fs_struct *);
+
+static inline void put_mnt_ns(struct mnt_namespace *ns)
+{
+        if (atomic_dec_and_lock(&ns->count, &vfsmount_lock))
+                /* releases vfsmount_lock */
+                __put_mnt_ns(ns);
+}
+
+static inline void exit_mnt_ns(struct task_struct *p)
+{
+        struct mnt_namespace *ns = p->nsproxy->mnt_ns;
+        if (ns)
+                put_mnt_ns(ns);
+}
+
+static inline void get_mnt_ns(struct mnt_namespace *ns)
+{
+        atomic_inc(&ns->count);
+}
+
+#endif
+#endif
diff --git a/include/linux/module.h b/include/linux/module.h
index d1d00ce8f4e..10f771a4999 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -6,7 +6,6 @@
  * Rewritten by Richard Henderson <rth@tamu.edu> Dec 1996
  * Rewritten again by Rusty Russell, 2002
  */
-#include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
 #include <linux/stat.h>
@@ -264,6 +263,7 @@ struct module
         struct module_attribute *modinfo_attrs;
         const char *version;
         const char *srcversion;
+        struct kobject *drivers_dir;
 
         /* Exported symbols */
         const struct kernel_symbol *syms;
@@ -319,6 +319,13 @@ struct module
 
         unsigned int taints;    /* same bits as kernel:tainted */
 
+#ifdef CONFIG_GENERIC_BUG
+        /* Support for BUG */
+        struct list_head bug_list;
+        struct bug_entry *bug_table;
+        unsigned num_bugs;
+#endif
+
 #ifdef CONFIG_MODULE_UNLOAD
         /* Reference counts */
         struct module_ref ref[NR_CPUS];
@@ -410,17 +417,7 @@ static inline int try_module_get(struct module *module)
         return ret;
 }
 
-static inline void module_put(struct module *module)
-{
-        if (module) {
-                unsigned int cpu = get_cpu();
-                local_dec(&module->ref[cpu].count);
-                /* Maybe they're waiting for us to drop reference? */
-                if (unlikely(!module_is_live(module)))
-                        wake_up_process(module->waiter);
-                put_cpu();
-        }
-}
+extern void module_put(struct module *module);
 
 #else /*!CONFIG_MODULE_UNLOAD*/
 static inline int try_module_get(struct module *module)
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index 7c0c2c198f1..4a189dadb16 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -63,6 +63,9 @@ struct kparam_array
    not there, read bits mean it's readable, write bits mean it's
    writable. */
 #define __module_param_call(prefix, name, set, get, arg, perm)          \
+        /* Default value instead of permissions? */                     \
+        static int __param_perm_check_##name __attribute__((unused)) =  \
+        BUILD_BUG_ON_ZERO((perm) < 0 || (perm) > 0777 || ((perm) & 2)); \
         static char __param_str_##name[] = prefix #name;                \
         static struct kernel_param const __param_##name                 \
         __attribute_used__                                              \
diff --git a/include/linux/mount.h b/include/linux/mount.h
index 403d1a97c51..1b7e178b0d8 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -20,13 +20,14 @@
 struct super_block;
 struct vfsmount;
 struct dentry;
-struct namespace;
+struct mnt_namespace;
 
 #define MNT_NOSUID      0x01
 #define MNT_NODEV       0x02
 #define MNT_NOEXEC      0x04
 #define MNT_NOATIME     0x08
 #define MNT_NODIRATIME  0x10
+#define MNT_RELATIME    0x20
 
 #define MNT_SHRINKABLE  0x100
 
@@ -52,7 +53,7 @@ struct vfsmount {
         struct list_head mnt_slave_list;/* list of slave mounts */
         struct list_head mnt_slave;     /* slave list entry */
         struct vfsmount *mnt_master;    /* slave is on master->mnt_slave_list */
-        struct namespace *mnt_namespace; /* containing namespace */
+        struct mnt_namespace *mnt_ns;   /* containing namespace */
         int mnt_pinned;
 };
 
diff --git a/include/linux/mqueue.h b/include/linux/mqueue.h
index 8db9d75541a..8b5a79615fb 100644
--- a/include/linux/mqueue.h
+++ b/include/linux/mqueue.h
@@ -18,8 +18,6 @@
 #ifndef _LINUX_MQUEUE_H
 #define _LINUX_MQUEUE_H
 
-#include <linux/types.h>
-
 #define MQ_PRIO_MAX     32768
 /* per-uid limit of kernel memory used by mqueue, in bytes */
 #define MQ_BYTES_MAX    819200
diff --git a/include/linux/msg.h b/include/linux/msg.h
index acc7c174ff0..f1b60740d64 100644
--- a/include/linux/msg.h
+++ b/include/linux/msg.h
@@ -92,6 +92,12 @@ struct msg_queue {
         struct list_head q_senders;
 };
 
+/* Helper routines for sys_msgsnd and sys_msgrcv */
+extern long do_msgsnd(int msqid, long mtype, void __user *mtext,
+                        size_t msgsz, int msgflg);
+extern long do_msgrcv(int msqid, long *pmtype, void __user *mtext,
+                        size_t msgsz, long msgtyp, int msgflg);
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_MSG_H */
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 27c48daa318..a7544afd758 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -94,7 +94,7 @@ do {							\
 
 #define __MUTEX_INITIALIZER(lockname) \
                 { .count = ATOMIC_INIT(1) \
-                , .wait_lock = SPIN_LOCK_UNLOCKED \
+                , .wait_lock = __SPIN_LOCK_UNLOCKED(lockname.wait_lock) \
                 , .wait_list = LIST_HEAD_INIT(lockname.wait_list) \
                 __DEBUG_MUTEX_INITIALIZER(lockname) \
                 __DEP_MAP_MUTEX_INITIALIZER(lockname) }
@@ -125,8 +125,10 @@ extern int fastcall mutex_lock_interruptible(struct mutex *lock);
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 extern void mutex_lock_nested(struct mutex *lock, unsigned int subclass);
+extern int mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass);
 #else
 # define mutex_lock_nested(lock, subclass) mutex_lock(lock)
+# define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)
 #endif
 
 /*
diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h
index edfa012fad3..aff25c000ab 100644
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
@@ -724,7 +724,7 @@
 #define MV643XX_ETH_RX_FIFO_URGENT_THRESHOLD_REG(port)             (0x2470 + (port<<10))
 #define MV643XX_ETH_TX_FIFO_URGENT_THRESHOLD_REG(port)             (0x2474 + (port<<10))
 #define MV643XX_ETH_RX_MINIMAL_FRAME_SIZE_REG(port)                (0x247c + (port<<10))
-#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port)              (0x2484 + (port<<10)
+#define MV643XX_ETH_RX_DISCARDED_FRAMES_COUNTER(port)              (0x2484 + (port<<10))
 #define MV643XX_ETH_PORT_DEBUG_0_REG(port)                         (0x248c + (port<<10))
 #define MV643XX_ETH_PORT_DEBUG_1_REG(port)                         (0x2490 + (port<<10))
 #define MV643XX_ETH_PORT_INTERNAL_ADDR_ERROR_REG(port)             (0x2494 + (port<<10))
@@ -1135,7 +1135,7 @@ struct mv64xxx_i2c_pdata {
 #define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_1      (1<<19)
 #define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_2      (1<<20)
 #define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_3      ((1<<20) | (1<<19))
-#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4      ((1<<21)
+#define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_4      (1<<21)
 #define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_5      ((1<<21) | (1<<19))
 #define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_6      ((1<<21) | (1<<20))
 #define MV643XX_ETH_DEFAULT_RX_UDP_QUEUE_7      ((1<<21) | (1<<20) | (1<<19))
diff --git a/include/linux/n_r3964.h b/include/linux/n_r3964.h
index db4f3776978..de24af79ebd 100644
--- a/include/linux/n_r3964.h
+++ b/include/linux/n_r3964.h
@@ -116,7 +116,7 @@ struct r3964_message;
 
 struct r3964_client_info {
         spinlock_t     lock;
-        pid_t          pid;
+        struct pid    *pid;
         unsigned int   sig_flags;
 
         struct r3964_client_info *next;
diff --git a/include/linux/namei.h b/include/linux/namei.h
index f5f19606eff..d39a5a67e97 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -29,6 +29,11 @@ struct nameidata {
         } intent;
 };
 
+struct path {
+        struct vfsmount *mnt;
+        struct dentry *dentry;
+};
+
 /*
  * Type of the last component on LOOKUP_PARENT
  */
diff --git a/include/linux/namespace.h b/include/linux/namespace.h
deleted file mode 100644
index d137009f0b2..00000000000
--- a/include/linux/namespace.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _NAMESPACE_H_
-#define _NAMESPACE_H_
-#ifdef __KERNEL__
-
-#include <linux/mount.h>
-#include <linux/sched.h>
-#include <linux/nsproxy.h>
-
-struct namespace {
-        atomic_t                count;
-        struct vfsmount *       root;
-        struct list_head        list;
-        wait_queue_head_t poll;
-        int event;
-};
-
-extern int copy_namespace(int, struct task_struct *);
-extern void __put_namespace(struct namespace *namespace);
-extern struct namespace *dup_namespace(struct task_struct *, struct fs_struct *);
-
-static inline void put_namespace(struct namespace *namespace)
-{
-        if (atomic_dec_and_lock(&namespace->count, &vfsmount_lock))
-                /* releases vfsmount_lock */
-                __put_namespace(namespace);
-}
-
-static inline void exit_namespace(struct task_struct *p)
-{
-        struct namespace *namespace = p->nsproxy->namespace;
-        if (namespace) {
-                put_namespace(namespace);
-        }
-}
-
-static inline void get_namespace(struct namespace *namespace)
-{
-        atomic_inc(&namespace->count);
-}
-
-#endif
-#endif
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index d6b6dc09ad9..0f3e6930254 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -64,6 +64,7 @@ struct nbd_device {
         struct gendisk *disk;
         int blksize;
         u64 bytesize;
+        pid_t pid; /* pid of nbd-client, if attached */
 };
 
 #endif
diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h
index b089d950628..a503052138b 100644
--- a/include/linux/ncp_fs_sb.h
+++ b/include/linux/ncp_fs_sb.h
@@ -127,10 +127,10 @@ struct ncp_server {
         } unexpected_packet;
 };
 
-extern void ncp_tcp_rcv_proc(void *server);
-extern void ncp_tcp_tx_proc(void *server);
-extern void ncpdgram_rcv_proc(void *server);
-extern void ncpdgram_timeout_proc(void *server);
+extern void ncp_tcp_rcv_proc(struct work_struct *work);
+extern void ncp_tcp_tx_proc(struct work_struct *work);
+extern void ncpdgram_rcv_proc(struct work_struct *work);
+extern void ncpdgram_timeout_proc(struct work_struct *work);
 extern void ncpdgram_timeout_call(unsigned long server);
 extern void ncp_tcp_data_ready(struct sock* sk, int len);
 extern void ncp_tcp_write_space(struct sock* sk);
diff --git a/include/linux/ncp_mount.h b/include/linux/ncp_mount.h
index f46bddcdbd3..a2b549eb1ec 100644
--- a/include/linux/ncp_mount.h
+++ b/include/linux/ncp_mount.h
@@ -75,7 +75,7 @@ struct ncp_mount_data_kernel {
         unsigned int     int_flags;     /* internal flags */
 #define NCP_IMOUNT_LOGGEDIN_POSSIBLE    0x0001
         __kernel_uid32_t mounted_uid;   /* Who may umount() this filesystem? */
-        __kernel_pid_t   wdog_pid;              /* Who cares for our watchdog packets? */
+        struct pid      *wdog_pid;      /* Who cares for our watchdog packets? */
         unsigned int     ncp_fd;        /* The socket to the ncp port */
         unsigned int     time_out;      /* How long should I wait after
                                            sending a NCP request? */
diff --git a/include/linux/net.h b/include/linux/net.h
index 15c733b816f..f28d8a2e2c9 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -19,7 +19,6 @@
 #define _LINUX_NET_H
 
 #include <linux/wait.h>
-#include <linux/random.h>
 #include <asm/socket.h>
 
 struct poll_table_struct;
@@ -57,6 +56,7 @@ typedef enum {
 
 #ifdef __KERNEL__
 #include <linux/stringify.h>
+#include <linux/random.h>
 
 #define SOCK_ASYNC_NOSPACE      0
 #define SOCK_ASYNC_WAITDATA     1
@@ -196,7 +196,7 @@ extern struct socket *sockfd_lookup(int fd, int *err);
 extern int           net_ratelimit(void);
 
 #define net_random()            random32()
-#define net_srandom(seed)       srandom32(seed)
+#define net_srandom(seed)       srandom32((__force u32)seed)
 
 extern int           kernel_sendmsg(struct socket *sock, struct msghdr *msg,
                                     struct kvec *vec, size_t num, size_t len);
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 83b8c4f1d69..fea0d9db684 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -30,6 +30,7 @@
 #include <linux/if_packet.h>
 
 #ifdef __KERNEL__
+#include <linux/timer.h>
 #include <asm/atomic.h>
 #include <asm/cache.h>
 #include <asm/byteorder.h>
@@ -38,7 +39,6 @@
 #include <linux/percpu.h>
 #include <linux/dmaengine.h>
 
-struct divert_blk;
 struct vlan_group;
 struct ethtool_ops;
 struct netpoll_info;
@@ -67,6 +67,10 @@ struct netpoll_info;
 #define NET_RX_CN_HIGH          4   /* The storm is here */
 #define NET_RX_BAD              5  /* packet dropped due to kernel error */
 
+/* NET_XMIT_CN is special. It does not guarantee that this packet is lost. It
+ * indicates that the device will soon be dropping packets, or already drops
+ * some packets of the same priority; prompting us to send less aggressively. */
+#define net_xmit_eval(e)        ((e) == NET_XMIT_CN? 0 : (e))
 #define net_xmit_errno(e)       ((e) != NET_XMIT_CN ? -ENOBUFS : 0)
 
 #endif
@@ -189,13 +193,20 @@ struct hh_cache
 {
         struct hh_cache *hh_next;       /* Next entry                        */
         atomic_t        hh_refcnt;      /* number of users                   */
-        __be16          hh_type;        /* protocol identifier, f.e ETH_P_IP
+/*
+ * We want hh_output, hh_len, hh_lock and hh_data be a in a separate
+ * cache line on SMP.
+ * They are mostly read, but hh_refcnt may be changed quite frequently,
+ * incurring cache line ping pongs.
+ */
+        __be16          hh_type ____cacheline_aligned_in_smp;
+                                        /* protocol identifier, f.e ETH_P_IP
                                          *  NOTE:  For VLANs, this will be the
                                          *  encapuslated type. --BLG
                                          */
-        int             hh_len;         /* length of header */
+        u16             hh_len;         /* length of header */
         int             (*hh_output)(struct sk_buff *skb);
-        rwlock_t        hh_lock;
+        seqlock_t       hh_lock;
 
         /* cached hardware header; allow for machine alignment needs.        */
 #define HH_DATA_MOD     16
@@ -517,11 +528,6 @@ struct net_device
         /* bridge stuff */
         struct net_bridge_port  *br_port;
 
-#ifdef CONFIG_NET_DIVERT
-        /* this will get initialized at each interface type init routine */
-        struct divert_blk       *divert;
-#endif /* CONFIG_NET_DIVERT */
-
         /* class/net/name entry */
         struct class_device     class_dev;
         /* space for optional statistics and wireless sysfs groups */
@@ -900,6 +906,7 @@ static inline void netif_poll_disable(struct net_device *dev)
 
 static inline void netif_poll_enable(struct net_device *dev)
 {
+        smp_mb__before_clear_bit();
         clear_bit(__LINK_STATE_RX_SCHED, &dev->state);
 }
 
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index b7e67d1d438..d4c4c5120bc 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -117,6 +117,16 @@ void nf_unregister_hooks(struct nf_hook_ops *reg, unsigned int n);
 int nf_register_sockopt(struct nf_sockopt_ops *reg);
 void nf_unregister_sockopt(struct nf_sockopt_ops *reg);
 
+#ifdef CONFIG_SYSCTL
+/* Sysctl registration */
+struct ctl_table_header *nf_register_sysctl_table(struct ctl_table *path,
+                                                  struct ctl_table *table);
+void nf_unregister_sysctl_table(struct ctl_table_header *header,
+                                struct ctl_table *table);
+extern struct ctl_table nf_net_netfilter_sysctl_path[];
+extern struct ctl_table nf_net_ipv4_netfilter_sysctl_path[];
+#endif /* CONFIG_SYSCTL */
+
 extern struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS];
 
 /* those NF_LOG_* defines and struct nf_loginfo are legacy definitios that will
@@ -282,15 +292,31 @@ extern void nf_invalidate_cache(int pf);
    Returns true or false. */
 extern int skb_make_writable(struct sk_buff **pskb, unsigned int writable_len);
 
-extern u_int16_t nf_csum_update(u_int32_t oldval, u_int32_t newval,
-                                u_int32_t csum);
-extern u_int16_t nf_proto_csum_update(struct sk_buff *skb,
-                                      u_int32_t oldval, u_int32_t newval,
-                                      u_int16_t csum, int pseudohdr);
+static inline void nf_csum_replace4(__sum16 *sum, __be32 from, __be32 to)
+{
+        __be32 diff[] = { ~from, to };
+
+        *sum = csum_fold(csum_partial((char *)diff, sizeof(diff), ~csum_unfold(*sum)));
+}
+
+static inline void nf_csum_replace2(__sum16 *sum, __be16 from, __be16 to)
+{
+        nf_csum_replace4(sum, (__force __be32)from, (__force __be32)to);
+}
+
+extern void nf_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,
+                                      __be32 from, __be32 to, int pseudohdr);
+
+static inline void nf_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb,
+                                      __be16 from, __be16 to, int pseudohdr)
+{
+        nf_proto_csum_replace4(sum, skb, (__force __be32)from,
+                                (__force __be32)to, pseudohdr);
+}
 
 struct nf_afinfo {
         unsigned short  family;
-        unsigned int    (*checksum)(struct sk_buff *skb, unsigned int hook,
+        __sum16         (*checksum)(struct sk_buff *skb, unsigned int hook,
                                     unsigned int dataoff, u_int8_t protocol);
         void            (*saveroute)(const struct sk_buff *skb,
                                      struct nf_info *info);
@@ -305,12 +331,12 @@ static inline struct nf_afinfo *nf_get_afinfo(unsigned short family)
         return rcu_dereference(nf_afinfo[family]);
 }
 
-static inline unsigned int
+static inline __sum16
 nf_checksum(struct sk_buff *skb, unsigned int hook, unsigned int dataoff,
             u_int8_t protocol, unsigned short family)
 {
         struct nf_afinfo *afinfo;
-        unsigned int csum = 0;
+        __sum16 csum = 0;
 
         rcu_read_lock();
         afinfo = nf_get_afinfo(family);
@@ -331,7 +357,7 @@ extern void (*ip_nat_decode_session)(struct sk_buff *, struct flowi *);
 static inline void
 nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, int family)
 {
-#ifdef CONFIG_IP_NF_NAT_NEEDED
+#if defined(CONFIG_IP_NF_NAT_NEEDED) || defined(CONFIG_NF_NAT_NEEDED)
         void (*decodefn)(struct sk_buff *, struct flowi *);
 
         if (family == AF_INET && (decodefn = ip_nat_decode_session) != NULL)
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index 312bd2ffee3..6328175a1c3 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -14,6 +14,7 @@ header-y += xt_dscp.h
 header-y += xt_DSCP.h
 header-y += xt_esp.h
 header-y += xt_helper.h
+header-y += xt_hashlimit.h
 header-y += xt_length.h
 header-y += xt_limit.h
 header-y += xt_mac.h
@@ -21,6 +22,7 @@ header-y += xt_mark.h
 header-y += xt_MARK.h
 header-y += xt_multiport.h
 header-y += xt_NFQUEUE.h
+header-y += xt_NFLOG.h
 header-y += xt_pkttype.h
 header-y += xt_policy.h
 header-y += xt_realm.h
diff --git a/include/linux/netfilter/nf_conntrack_amanda.h b/include/linux/netfilter/nf_conntrack_amanda.h
new file mode 100644
index 00000000000..26c223544ae
--- /dev/null
+++ b/include/linux/netfilter/nf_conntrack_amanda.h
@@ -0,0 +1,10 @@
+#ifndef _NF_CONNTRACK_AMANDA_H
+#define _NF_CONNTRACK_AMANDA_H
+/* AMANDA tracking. */
+
+extern unsigned int (*nf_nat_amanda_hook)(struct sk_buff **pskb,
+                                          enum ip_conntrack_info ctinfo,
+                                          unsigned int matchoff,
+                                          unsigned int matchlen,
+                                          struct nf_conntrack_expect *exp);
+#endif /* _NF_CONNTRACK_AMANDA_H */
diff --git a/include/linux/netfilter/nf_conntrack_ftp.h b/include/linux/netfilter/nf_conntrack_ftp.h
index ad4a41c9ce9..81453ea7e4c 100644
--- a/include/linux/netfilter/nf_conntrack_ftp.h
+++ b/include/linux/netfilter/nf_conntrack_ftp.h
@@ -3,16 +3,16 @@
 /* FTP tracking. */
 
 /* This enum is exposed to userspace */
-enum ip_ct_ftp_type
+enum nf_ct_ftp_type
 {
         /* PORT command from client */
-        IP_CT_FTP_PORT,
+        NF_CT_FTP_PORT,
         /* PASV response from server */
-        IP_CT_FTP_PASV,
+        NF_CT_FTP_PASV,
         /* EPRT command from client */
-        IP_CT_FTP_EPRT,
+        NF_CT_FTP_EPRT,
         /* EPSV response from server */
-        IP_CT_FTP_EPSV,
+        NF_CT_FTP_EPSV,
 };
 
 #ifdef __KERNEL__
@@ -21,23 +21,23 @@ enum ip_ct_ftp_type
 
 #define NUM_SEQ_TO_REMEMBER 2
 /* This structure exists only once per master */
-struct ip_ct_ftp_master {
+struct nf_ct_ftp_master {
         /* Valid seq positions for cmd matching after newline */
         u_int32_t seq_aft_nl[IP_CT_DIR_MAX][NUM_SEQ_TO_REMEMBER];
         /* 0 means seq_match_aft_nl not set */
         int seq_aft_nl_num[IP_CT_DIR_MAX];
 };
 
-struct ip_conntrack_expect;
+struct nf_conntrack_expect;
 
 /* For NAT to hook in when we find a packet which describes what other
  * connection we should expect. */
-extern unsigned int (*ip_nat_ftp_hook)(struct sk_buff **pskb,
+extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff **pskb,
                                        enum ip_conntrack_info ctinfo,
-                                       enum ip_ct_ftp_type type,
+                                       enum nf_ct_ftp_type type,
                                        unsigned int matchoff,
                                        unsigned int matchlen,
-                                       struct ip_conntrack_expect *exp,
+                                       struct nf_conntrack_expect *exp,
                                        u32 *seq);
 #endif /* __KERNEL__ */
 
diff --git a/include/linux/netfilter/nf_conntrack_h323.h b/include/linux/netfilter/nf_conntrack_h323.h
new file mode 100644
index 00000000000..08e2f4977c2
--- /dev/null
+++ b/include/linux/netfilter/nf_conntrack_h323.h
@@ -0,0 +1,92 @@
+#ifndef _NF_CONNTRACK_H323_H
+#define _NF_CONNTRACK_H323_H
+
+#ifdef __KERNEL__
+
+#include <linux/netfilter/nf_conntrack_h323_asn1.h>
+
+#define RAS_PORT 1719
+#define Q931_PORT 1720
+#define H323_RTP_CHANNEL_MAX 4  /* Audio, video, FAX and other */
+
+/* This structure exists only once per master */
+struct nf_ct_h323_master {
+
+        /* Original and NATed Q.931 or H.245 signal ports */
+        __be16 sig_port[IP_CT_DIR_MAX];
+
+        /* Original and NATed RTP ports */
+        __be16 rtp_port[H323_RTP_CHANNEL_MAX][IP_CT_DIR_MAX];
+
+        union {
+                /* RAS connection timeout */
+                u_int32_t timeout;
+
+                /* Next TPKT length (for separate TPKT header and data) */
+                u_int16_t tpkt_len[IP_CT_DIR_MAX];
+        };
+};
+
+struct nf_conn;
+
+extern int get_h225_addr(struct nf_conn *ct, unsigned char *data,
+                         TransportAddress *taddr,
+                         union nf_conntrack_address *addr, __be16 *port);
+extern void nf_conntrack_h245_expect(struct nf_conn *new,
+                                     struct nf_conntrack_expect *this);
+extern void nf_conntrack_q931_expect(struct nf_conn *new,
+                                     struct nf_conntrack_expect *this);
+extern int (*set_h245_addr_hook) (struct sk_buff **pskb,
+                                  unsigned char **data, int dataoff,
+                                  H245_TransportAddress *taddr,
+                                  union nf_conntrack_address *addr,
+                                  __be16 port);
+extern int (*set_h225_addr_hook) (struct sk_buff **pskb,
+                                  unsigned char **data, int dataoff,
+                                  TransportAddress *taddr,
+                                  union nf_conntrack_address *addr,
+                                  __be16 port);
+extern int (*set_sig_addr_hook) (struct sk_buff **pskb,
+                                 struct nf_conn *ct,
+                                 enum ip_conntrack_info ctinfo,
+                                 unsigned char **data,
+                                 TransportAddress *taddr, int count);
+extern int (*set_ras_addr_hook) (struct sk_buff **pskb,
+                                 struct nf_conn *ct,
+                                 enum ip_conntrack_info ctinfo,
+                                 unsigned char **data,
+                                 TransportAddress *taddr, int count);
+extern int (*nat_rtp_rtcp_hook) (struct sk_buff **pskb,
+                                 struct nf_conn *ct,
+                                 enum ip_conntrack_info ctinfo,
+                                 unsigned char **data, int dataoff,
+                                 H245_TransportAddress *taddr,
+                                 __be16 port, __be16 rtp_port,
+                                 struct nf_conntrack_expect *rtp_exp,
+                                 struct nf_conntrack_expect *rtcp_exp);
+extern int (*nat_t120_hook) (struct sk_buff **pskb, struct nf_conn *ct,
+                             enum ip_conntrack_info ctinfo,
+                             unsigned char **data, int dataoff,
+                             H245_TransportAddress *taddr, __be16 port,
+                             struct nf_conntrack_expect *exp);
+extern int (*nat_h245_hook) (struct sk_buff **pskb, struct nf_conn *ct,
+                             enum ip_conntrack_info ctinfo,
+                             unsigned char **data, int dataoff,
+                             TransportAddress *taddr, __be16 port,
+                             struct nf_conntrack_expect *exp);
+extern int (*nat_callforwarding_hook) (struct sk_buff **pskb,
+                                       struct nf_conn *ct,
+                                       enum ip_conntrack_info ctinfo,
+                                       unsigned char **data, int dataoff,
+                                       TransportAddress *taddr,
+                                       __be16 port,
+                                       struct nf_conntrack_expect *exp);
+extern int (*nat_q931_hook) (struct sk_buff **pskb, struct nf_conn *ct,
+                             enum ip_conntrack_info ctinfo,
+                             unsigned char **data, TransportAddress *taddr,
+                             int idx, __be16 port,
+                             struct nf_conntrack_expect *exp);
+
+#endif
+
+#endif
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h b/include/linux/netfilter/nf_conntrack_h323_asn1.h
index c6e9a0b6d30..8dab5968fc7 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
+++ b/include/linux/netfilter/nf_conntrack_h323_asn1.h
@@ -1,6 +1,6 @@
 /****************************************************************************
- * ip_conntrack_helper_h323_asn1.h - BER and PER decoding library for H.323
- *                                   conntrack/NAT module.
+ * ip_conntrack_h323_asn1.h - BER and PER decoding library for H.323
+ *                            conntrack/NAT module.
  *
  * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net>
  *
@@ -34,13 +34,13 @@
  *
  ****************************************************************************/
 
-#ifndef _IP_CONNTRACK_HELPER_H323_ASN1_H_
-#define _IP_CONNTRACK_HELPER_H323_ASN1_H_
+#ifndef _NF_CONNTRACK_HELPER_H323_ASN1_H_
+#define _NF_CONNTRACK_HELPER_H323_ASN1_H_
 
 /*****************************************************************************
  * H.323 Types
  ****************************************************************************/
-#include "ip_conntrack_helper_h323_types.h"
+#include "nf_conntrack_h323_types.h"
 
 typedef struct {
         enum {
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h b/include/linux/netfilter/nf_conntrack_h323_types.h
index 3d4a773799f..38d74d5c970 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
+++ b/include/linux/netfilter/nf_conntrack_h323_types.h
@@ -10,6 +10,11 @@ typedef struct TransportAddress_ipAddress {	/* SEQUENCE */
         unsigned ip;
 } TransportAddress_ipAddress;
 
+typedef struct TransportAddress_ip6Address {    /* SEQUENCE */
+        int options;            /* No use */
+        unsigned ip6;
+} TransportAddress_ip6Address;
+
 typedef struct TransportAddress {       /* CHOICE */
         enum {
                 eTransportAddress_ipAddress,
@@ -22,6 +27,7 @@ typedef struct TransportAddress {	/* CHOICE */
         } choice;
         union {
                 TransportAddress_ipAddress ipAddress;
+                TransportAddress_ip6Address ip6Address;
         };
 } TransportAddress;
 
@@ -93,6 +99,11 @@ typedef struct UnicastAddress_iPAddress {	/* SEQUENCE */
         unsigned network;
 } UnicastAddress_iPAddress;
 
+typedef struct UnicastAddress_iP6Address {      /* SEQUENCE */
+        int options;            /* No use */
+        unsigned network;
+} UnicastAddress_iP6Address;
+
 typedef struct UnicastAddress { /* CHOICE */
         enum {
                 eUnicastAddress_iPAddress,
@@ -105,6 +116,7 @@ typedef struct UnicastAddress {	/* CHOICE */
         } choice;
         union {
                 UnicastAddress_iPAddress iPAddress;
+                UnicastAddress_iP6Address iP6Address;
         };
 } UnicastAddress;
 
diff --git a/include/linux/netfilter/nf_conntrack_irc.h b/include/linux/netfilter/nf_conntrack_irc.h
new file mode 100644
index 00000000000..2ab6b825591
--- /dev/null
+++ b/include/linux/netfilter/nf_conntrack_irc.h
@@ -0,0 +1,15 @@
+#ifndef _NF_CONNTRACK_IRC_H
+#define _NF_CONNTRACK_IRC_H
+
+#ifdef __KERNEL__
+
+#define IRC_PORT        6667
+
+extern unsigned int (*nf_nat_irc_hook)(struct sk_buff **pskb,
+                                       enum ip_conntrack_info ctinfo,
+                                       unsigned int matchoff,
+                                       unsigned int matchlen,
+                                       struct nf_conntrack_expect *exp);
+
+#endif /* __KERNEL__ */
+#endif /* _NF_CONNTRACK_IRC_H */
diff --git a/include/linux/netfilter/nf_conntrack_pptp.h b/include/linux/netfilter/nf_conntrack_pptp.h
new file mode 100644
index 00000000000..9d8144a488c
--- /dev/null
+++ b/include/linux/netfilter/nf_conntrack_pptp.h
@@ -0,0 +1,322 @@
+/* PPTP constants and structs */
+#ifndef _NF_CONNTRACK_PPTP_H
+#define _NF_CONNTRACK_PPTP_H
+
+#include <linux/netfilter/nf_conntrack_common.h>
+
+/* state of the control session */
+enum pptp_ctrlsess_state {
+        PPTP_SESSION_NONE,                      /* no session present */
+        PPTP_SESSION_ERROR,                     /* some session error */
+        PPTP_SESSION_STOPREQ,                   /* stop_sess request seen */
+        PPTP_SESSION_REQUESTED,                 /* start_sess request seen */
+        PPTP_SESSION_CONFIRMED,                 /* session established */
+};
+
+/* state of the call inside the control session */
+enum pptp_ctrlcall_state {
+        PPTP_CALL_NONE,
+        PPTP_CALL_ERROR,
+        PPTP_CALL_OUT_REQ,
+        PPTP_CALL_OUT_CONF,
+        PPTP_CALL_IN_REQ,
+        PPTP_CALL_IN_REP,
+        PPTP_CALL_IN_CONF,
+        PPTP_CALL_CLEAR_REQ,
+};
+
+/* conntrack private data */
+struct nf_ct_pptp_master {
+        enum pptp_ctrlsess_state sstate;        /* session state */
+        enum pptp_ctrlcall_state cstate;        /* call state */
+        __be16 pac_call_id;                     /* call id of PAC */
+        __be16 pns_call_id;                     /* call id of PNS */
+
+        /* in pre-2.6.11 this used to be per-expect. Now it is per-conntrack
+         * and therefore imposes a fixed limit on the number of maps */
+        struct nf_ct_gre_keymap *keymap[IP_CT_DIR_MAX];
+};
+
+struct nf_nat_pptp {
+        __be16 pns_call_id;                     /* NAT'ed PNS call id */
+        __be16 pac_call_id;                     /* NAT'ed PAC call id */
+};
+
+#ifdef __KERNEL__
+
+#define PPTP_CONTROL_PORT       1723
+
+#define PPTP_PACKET_CONTROL     1
+#define PPTP_PACKET_MGMT        2
+
+#define PPTP_MAGIC_COOKIE       0x1a2b3c4d
+
+struct pptp_pkt_hdr {
+        __u16   packetLength;
+        __be16  packetType;
+        __be32  magicCookie;
+};
+
+/* PptpControlMessageType values */
+#define PPTP_START_SESSION_REQUEST      1
+#define PPTP_START_SESSION_REPLY        2
+#define PPTP_STOP_SESSION_REQUEST       3
+#define PPTP_STOP_SESSION_REPLY         4
+#define PPTP_ECHO_REQUEST               5
+#define PPTP_ECHO_REPLY                 6
+#define PPTP_OUT_CALL_REQUEST           7
+#define PPTP_OUT_CALL_REPLY             8
+#define PPTP_IN_CALL_REQUEST            9
+#define PPTP_IN_CALL_REPLY              10
+#define PPTP_IN_CALL_CONNECT            11
+#define PPTP_CALL_CLEAR_REQUEST         12
+#define PPTP_CALL_DISCONNECT_NOTIFY     13
+#define PPTP_WAN_ERROR_NOTIFY           14
+#define PPTP_SET_LINK_INFO              15
+
+#define PPTP_MSG_MAX                    15
+
+/* PptpGeneralError values */
+#define PPTP_ERROR_CODE_NONE            0
+#define PPTP_NOT_CONNECTED              1
+#define PPTP_BAD_FORMAT                 2
+#define PPTP_BAD_VALUE                  3
+#define PPTP_NO_RESOURCE                4
+#define PPTP_BAD_CALLID                 5
+#define PPTP_REMOVE_DEVICE_ERROR        6
+
+struct PptpControlHeader {
+        __be16  messageType;
+        __u16   reserved;
+};
+
+/* FramingCapability Bitmap Values */
+#define PPTP_FRAME_CAP_ASYNC            0x1
+#define PPTP_FRAME_CAP_SYNC             0x2
+
+/* BearerCapability Bitmap Values */
+#define PPTP_BEARER_CAP_ANALOG          0x1
+#define PPTP_BEARER_CAP_DIGITAL         0x2
+
+struct PptpStartSessionRequest {
+        __be16  protocolVersion;
+        __u16   reserved1;
+        __be32  framingCapability;
+        __be32  bearerCapability;
+        __be16  maxChannels;
+        __be16  firmwareRevision;
+        __u8    hostName[64];
+        __u8    vendorString[64];
+};
+
+/* PptpStartSessionResultCode Values */
+#define PPTP_START_OK                   1
+#define PPTP_START_GENERAL_ERROR        2
+#define PPTP_START_ALREADY_CONNECTED    3
+#define PPTP_START_NOT_AUTHORIZED       4
+#define PPTP_START_UNKNOWN_PROTOCOL     5
+
+struct PptpStartSessionReply {
+        __be16  protocolVersion;
+        __u8    resultCode;
+        __u8    generalErrorCode;
+        __be32  framingCapability;
+        __be32  bearerCapability;
+        __be16  maxChannels;
+        __be16  firmwareRevision;
+        __u8    hostName[64];
+        __u8    vendorString[64];
+};
+
+/* PptpStopReasons */
+#define PPTP_STOP_NONE                  1
+#define PPTP_STOP_PROTOCOL              2
+#define PPTP_STOP_LOCAL_SHUTDOWN        3
+
+struct PptpStopSessionRequest {
+        __u8    reason;
+        __u8    reserved1;
+        __u16   reserved2;
+};
+
+/* PptpStopSessionResultCode */
+#define PPTP_STOP_OK                    1
+#define PPTP_STOP_GENERAL_ERROR         2
+
+struct PptpStopSessionReply {
+        __u8    resultCode;
+        __u8    generalErrorCode;
+        __u16   reserved1;
+};
+
+struct PptpEchoRequest {
+        __be32 identNumber;
+};
+
+/* PptpEchoReplyResultCode */
+#define PPTP_ECHO_OK                    1
+#define PPTP_ECHO_GENERAL_ERROR         2
+
+struct PptpEchoReply {
+        __be32  identNumber;
+        __u8    resultCode;
+        __u8    generalErrorCode;
+        __u16   reserved;
+};
+
+/* PptpFramingType */
+#define PPTP_ASYNC_FRAMING              1
+#define PPTP_SYNC_FRAMING               2
+#define PPTP_DONT_CARE_FRAMING          3
+
+/* PptpCallBearerType */
+#define PPTP_ANALOG_TYPE                1
+#define PPTP_DIGITAL_TYPE               2
+#define PPTP_DONT_CARE_BEARER_TYPE      3
+
+struct PptpOutCallRequest {
+        __be16  callID;
+        __be16  callSerialNumber;
+        __be32  minBPS;
+        __be32  maxBPS;
+        __be32  bearerType;
+        __be32  framingType;
+        __be16  packetWindow;
+        __be16  packetProcDelay;
+        __be16  phoneNumberLength;
+        __u16   reserved1;
+        __u8    phoneNumber[64];
+        __u8    subAddress[64];
+};
+
+/* PptpCallResultCode */
+#define PPTP_OUTCALL_CONNECT            1
+#define PPTP_OUTCALL_GENERAL_ERROR      2
+#define PPTP_OUTCALL_NO_CARRIER         3
+#define PPTP_OUTCALL_BUSY               4
+#define PPTP_OUTCALL_NO_DIAL_TONE       5
+#define PPTP_OUTCALL_TIMEOUT            6
+#define PPTP_OUTCALL_DONT_ACCEPT        7
+
+struct PptpOutCallReply {
+        __be16  callID;
+        __be16  peersCallID;
+        __u8    resultCode;
+        __u8    generalErrorCode;
+        __be16  causeCode;
+        __be32  connectSpeed;
+        __be16  packetWindow;
+        __be16  packetProcDelay;
+        __be32  physChannelID;
+};
+
+struct PptpInCallRequest {
+        __be16  callID;
+        __be16  callSerialNumber;
+        __be32  callBearerType;
+        __be32  physChannelID;
+        __be16  dialedNumberLength;
+        __be16  dialingNumberLength;
+        __u8    dialedNumber[64];
+        __u8    dialingNumber[64];
+        __u8    subAddress[64];
+};
+
+/* PptpInCallResultCode */
+#define PPTP_INCALL_ACCEPT              1
+#define PPTP_INCALL_GENERAL_ERROR       2
+#define PPTP_INCALL_DONT_ACCEPT         3
+
+struct PptpInCallReply {
+        __be16  callID;
+        __be16  peersCallID;
+        __u8    resultCode;
+        __u8    generalErrorCode;
+        __be16  packetWindow;
+        __be16  packetProcDelay;
+        __u16   reserved;
+};
+
+struct PptpInCallConnected {
+        __be16  peersCallID;
+        __u16   reserved;
+        __be32  connectSpeed;
+        __be16  packetWindow;
+        __be16  packetProcDelay;
+        __be32  callFramingType;
+};
+
+struct PptpClearCallRequest {
+        __be16  callID;
+        __u16   reserved;
+};
+
+struct PptpCallDisconnectNotify {
+        __be16  callID;
+        __u8    resultCode;
+        __u8    generalErrorCode;
+        __be16  causeCode;
+        __u16   reserved;
+        __u8    callStatistics[128];
+};
+
+struct PptpWanErrorNotify {
+        __be16  peersCallID;
+        __u16   reserved;
+        __be32  crcErrors;
+        __be32  framingErrors;
+        __be32  hardwareOverRuns;
+        __be32  bufferOverRuns;
+        __be32  timeoutErrors;
+        __be32  alignmentErrors;
+};
+
+struct PptpSetLinkInfo {
+        __be16  peersCallID;
+        __u16   reserved;
+        __be32  sendAccm;
+        __be32  recvAccm;
+};
+
+union pptp_ctrl_union {
+        struct PptpStartSessionRequest  sreq;
+        struct PptpStartSessionReply    srep;
+        struct PptpStopSessionRequest   streq;
+        struct PptpStopSessionReply     strep;
+        struct PptpOutCallRequest       ocreq;
+        struct PptpOutCallReply         ocack;
+        struct PptpInCallRequest        icreq;
+        struct PptpInCallReply          icack;
+        struct PptpInCallConnected      iccon;
+        struct PptpClearCallRequest     clrreq;
+        struct PptpCallDisconnectNotify disc;
+        struct PptpWanErrorNotify       wanerr;
+        struct PptpSetLinkInfo          setlink;
+};
+
+/* crap needed for nf_conntrack_compat.h */
+struct nf_conn;
+struct nf_conntrack_expect;
+
+extern int
+(*nf_nat_pptp_hook_outbound)(struct sk_buff **pskb,
+                             struct nf_conn *ct, enum ip_conntrack_info ctinfo,
+                             struct PptpControlHeader *ctlh,
+                             union pptp_ctrl_union *pptpReq);
+
+extern int
+(*nf_nat_pptp_hook_inbound)(struct sk_buff **pskb,
+                            struct nf_conn *ct, enum ip_conntrack_info ctinfo,
+                            struct PptpControlHeader *ctlh,
+                            union pptp_ctrl_union *pptpReq);
+
+extern void
+(*nf_nat_pptp_hook_exp_gre)(struct nf_conntrack_expect *exp_orig,
+                            struct nf_conntrack_expect *exp_reply);
+
+extern void
+(*nf_nat_pptp_hook_expectfn)(struct nf_conn *ct,
+                             struct nf_conntrack_expect *exp);
+
+#endif /* __KERNEL__ */
+#endif /* _NF_CONNTRACK_PPTP_H */
diff --git a/include/linux/netfilter/nf_conntrack_proto_gre.h b/include/linux/netfilter/nf_conntrack_proto_gre.h
new file mode 100644
index 00000000000..4e6bbce04ff
--- /dev/null
+++ b/include/linux/netfilter/nf_conntrack_proto_gre.h
@@ -0,0 +1,112 @@
+#ifndef _CONNTRACK_PROTO_GRE_H
+#define _CONNTRACK_PROTO_GRE_H
+#include <asm/byteorder.h>
+
+/* GRE PROTOCOL HEADER */
+
+/* GRE Version field */
+#define GRE_VERSION_1701        0x0
+#define GRE_VERSION_PPTP        0x1
+
+/* GRE Protocol field */
+#define GRE_PROTOCOL_PPTP       0x880B
+
+/* GRE Flags */
+#define GRE_FLAG_C              0x80
+#define GRE_FLAG_R              0x40
+#define GRE_FLAG_K              0x20
+#define GRE_FLAG_S              0x10
+#define GRE_FLAG_A              0x80
+
+#define GRE_IS_C(f)     ((f)&GRE_FLAG_C)
+#define GRE_IS_R(f)     ((f)&GRE_FLAG_R)
+#define GRE_IS_K(f)     ((f)&GRE_FLAG_K)
+#define GRE_IS_S(f)     ((f)&GRE_FLAG_S)
+#define GRE_IS_A(f)     ((f)&GRE_FLAG_A)
+
+/* GRE is a mess: Four different standards */
+struct gre_hdr {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+        __u16   rec:3,
+                srr:1,
+                seq:1,
+                key:1,
+                routing:1,
+                csum:1,
+                version:3,
+                reserved:4,
+                ack:1;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+        __u16   csum:1,
+                routing:1,
+                key:1,
+                seq:1,
+                srr:1,
+                rec:3,
+                ack:1,
+                reserved:4,
+                version:3;
+#else
+#error "Adjust your <asm/byteorder.h> defines"
+#endif
+        __be16  protocol;
+};
+
+/* modified GRE header for PPTP */
+struct gre_hdr_pptp {
+        __u8   flags;           /* bitfield */
+        __u8   version;         /* should be GRE_VERSION_PPTP */
+        __be16 protocol;        /* should be GRE_PROTOCOL_PPTP */
+        __be16 payload_len;     /* size of ppp payload, not inc. gre header */
+        __be16 call_id;         /* peer's call_id for this session */
+        __be32 seq;             /* sequence number.  Present if S==1 */
+        __be32 ack;             /* seq number of highest packet recieved by */
+                                /*  sender in this session */
+};
+
+struct nf_ct_gre {
+        unsigned int stream_timeout;
+        unsigned int timeout;
+};
+
+#ifdef __KERNEL__
+#include <net/netfilter/nf_conntrack_tuple.h>
+
+struct nf_conn;
+
+/* structure for original <-> reply keymap */
+struct nf_ct_gre_keymap {
+        struct list_head list;
+        struct nf_conntrack_tuple tuple;
+};
+
+/* add new tuple->key_reply pair to keymap */
+int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir,
+                         struct nf_conntrack_tuple *t);
+
+/* delete keymap entries */
+void nf_ct_gre_keymap_destroy(struct nf_conn *ct);
+
+/* get pointer to gre key, if present */
+static inline __be32 *gre_key(struct gre_hdr *greh)
+{
+        if (!greh->key)
+                return NULL;
+        if (greh->csum || greh->routing)
+                return (__be32 *)(greh+sizeof(*greh)+4);
+        return (__be32 *)(greh+sizeof(*greh));
+}
+
+/* get pointer ot gre csum, if present */
+static inline __sum16 *gre_csum(struct gre_hdr *greh)
+{
+        if (!greh->csum)
+                return NULL;
+        return (__sum16 *)(greh+sizeof(*greh));
+}
+
+extern void nf_ct_gre_keymap_flush(void);
+extern void nf_nat_need_gre(void);
+
+#endif /* __KERNEL__ */
+#endif /* _CONNTRACK_PROTO_GRE_H */
diff --git a/include/linux/netfilter/nf_conntrack_sctp.h b/include/linux/netfilter/nf_conntrack_sctp.h
index b8994d9fd1a..5cf2c115cce 100644
--- a/include/linux/netfilter/nf_conntrack_sctp.h
+++ b/include/linux/netfilter/nf_conntrack_sctp.h
@@ -20,7 +20,7 @@ struct ip_ct_sctp
 {
         enum sctp_conntrack state;
 
-        u_int32_t vtag[IP_CT_DIR_MAX];
+        __be32 vtag[IP_CT_DIR_MAX];
         u_int32_t ttag[IP_CT_DIR_MAX];
 };
 
diff --git a/include/linux/netfilter/nf_conntrack_sip.h b/include/linux/netfilter/nf_conntrack_sip.h
new file mode 100644
index 00000000000..bb7f2041db7
--- /dev/null
+++ b/include/linux/netfilter/nf_conntrack_sip.h
@@ -0,0 +1,41 @@
+#ifndef __NF_CONNTRACK_SIP_H__
+#define __NF_CONNTRACK_SIP_H__
+#ifdef __KERNEL__
+
+#define SIP_PORT        5060
+#define SIP_TIMEOUT     3600
+
+enum sip_header_pos {
+        POS_REG_REQ_URI,
+        POS_REQ_URI,
+        POS_FROM,
+        POS_TO,
+        POS_VIA,
+        POS_CONTACT,
+        POS_CONTENT,
+        POS_MEDIA,
+        POS_OWNER_IP4,
+        POS_CONNECTION_IP4,
+        POS_OWNER_IP6,
+        POS_CONNECTION_IP6,
+        POS_SDP_HEADER,
+};
+
+extern unsigned int (*nf_nat_sip_hook)(struct sk_buff **pskb,
+                                       enum ip_conntrack_info ctinfo,
+                                       struct nf_conn *ct,
+                                       const char **dptr);
+extern unsigned int (*nf_nat_sdp_hook)(struct sk_buff **pskb,
+                                       enum ip_conntrack_info ctinfo,
+                                       struct nf_conntrack_expect *exp,
+                                       const char *dptr);
+
+extern int ct_sip_get_info(struct nf_conn *ct, const char *dptr, size_t dlen,
+                           unsigned int *matchoff, unsigned int *matchlen,
+                           enum sip_header_pos pos);
+extern int ct_sip_lnlen(const char *line, const char *limit);
+extern const char *ct_sip_search(const char *needle, const char *haystack,
+                                 size_t needle_len, size_t haystack_len,
+                                 int case_sensitive);
+#endif /* __KERNEL__ */
+#endif /* __NF_CONNTRACK_SIP_H__ */
diff --git a/include/linux/netfilter/nf_conntrack_tcp.h b/include/linux/netfilter/nf_conntrack_tcp.h
index 6b01ba29772..2f4e98b90cc 100644
--- a/include/linux/netfilter/nf_conntrack_tcp.h
+++ b/include/linux/netfilter/nf_conntrack_tcp.h
@@ -25,7 +25,7 @@ enum tcp_conntrack {
 #define IP_CT_TCP_FLAG_SACK_PERM                0x02
 
 /* This sender sent FIN first */
-#define IP_CT_TCP_FLAG_CLOSE_INIT               0x03
+#define IP_CT_TCP_FLAG_CLOSE_INIT               0x04
 
 #ifdef __KERNEL__
 
diff --git a/include/linux/netfilter/nf_conntrack_tftp.h b/include/linux/netfilter/nf_conntrack_tftp.h
new file mode 100644
index 00000000000..0d79b7ae051
--- /dev/null
+++ b/include/linux/netfilter/nf_conntrack_tftp.h
@@ -0,0 +1,20 @@
+#ifndef _NF_CONNTRACK_TFTP_H
+#define _NF_CONNTRACK_TFTP_H
+
+#define TFTP_PORT 69
+
+struct tftphdr {
+        __be16 opcode;
+};
+
+#define TFTP_OPCODE_READ        1
+#define TFTP_OPCODE_WRITE       2
+#define TFTP_OPCODE_DATA        3
+#define TFTP_OPCODE_ACK         4
+#define TFTP_OPCODE_ERROR       5
+
+extern unsigned int (*nf_nat_tftp_hook)(struct sk_buff **pskb,
+                                        enum ip_conntrack_info ctinfo,
+                                        struct nf_conntrack_expect *exp);
+
+#endif /* _NF_CONNTRACK_TFTP_H */
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 6d8e3e5a80e..1e9c821f152 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -78,7 +78,7 @@ struct nfattr
 struct nfgenmsg {
         u_int8_t  nfgen_family;         /* AF_xxx */
         u_int8_t  version;              /* nfnetlink version */
-        u_int16_t res_id;               /* resource id */
+        __be16    res_id;               /* resource id */
 };
 
 #define NFNETLINK_V0    0
diff --git a/include/linux/netfilter/nfnetlink_log.h b/include/linux/netfilter/nfnetlink_log.h
index 87b92f8b988..5966afa026e 100644
--- a/include/linux/netfilter/nfnetlink_log.h
+++ b/include/linux/netfilter/nfnetlink_log.h
@@ -16,24 +16,22 @@ enum nfulnl_msg_types {
 };
 
 struct nfulnl_msg_packet_hdr {
-        u_int16_t       hw_protocol;    /* hw protocol (network order) */
+        __be16          hw_protocol;    /* hw protocol (network order) */
         u_int8_t        hook;           /* netfilter hook */
         u_int8_t        _pad;
 };
 
 struct nfulnl_msg_packet_hw {
-        u_int16_t       hw_addrlen;
+        __be16          hw_addrlen;
         u_int16_t       _pad;
         u_int8_t        hw_addr[8];
 };
 
 struct nfulnl_msg_packet_timestamp {
-        aligned_u64     sec;
-        aligned_u64     usec;
+        aligned_be64    sec;
+        aligned_be64    usec;
 };
 
-#define NFULNL_PREFIXLEN        30      /* just like old log target */
-
 enum nfulnl_attr_type {
         NFULA_UNSPEC,
         NFULA_PACKET_HDR,
@@ -67,7 +65,7 @@ struct nfulnl_msg_config_cmd {
 } __attribute__ ((packed));
 
 struct nfulnl_msg_config_mode {
-        u_int32_t       copy_range;
+        __be32          copy_range;
         u_int8_t        copy_mode;
         u_int8_t        _pad;
 } __attribute__ ((packed));
diff --git a/include/linux/netfilter/nfnetlink_queue.h b/include/linux/netfilter/nfnetlink_queue.h
index 36af0360b56..83e789633e3 100644
--- a/include/linux/netfilter/nfnetlink_queue.h
+++ b/include/linux/netfilter/nfnetlink_queue.h
@@ -13,20 +13,20 @@ enum nfqnl_msg_types {
 };
 
 struct nfqnl_msg_packet_hdr {
-        u_int32_t       packet_id;      /* unique ID of packet in queue */
-        u_int16_t       hw_protocol;    /* hw protocol (network order) */
+        __be32          packet_id;      /* unique ID of packet in queue */
+        __be16          hw_protocol;    /* hw protocol (network order) */
         u_int8_t        hook;           /* netfilter hook */
 } __attribute__ ((packed));
 
 struct nfqnl_msg_packet_hw {
-        u_int16_t       hw_addrlen;
+        __be16          hw_addrlen;
         u_int16_t       _pad;
         u_int8_t        hw_addr[8];
 };
 
 struct nfqnl_msg_packet_timestamp {
-        aligned_u64     sec;
-        aligned_u64     usec;
+        aligned_be64    sec;
+        aligned_be64    usec;
 };
 
 enum nfqnl_attr_type {
@@ -47,8 +47,8 @@ enum nfqnl_attr_type {
 #define NFQA_MAX (__NFQA_MAX - 1)
 
 struct nfqnl_msg_verdict_hdr {
-        u_int32_t verdict;
-        u_int32_t id;
+        __be32 verdict;
+        __be32 id;
 };
 
 
@@ -63,7 +63,7 @@ enum nfqnl_msg_config_cmds {
 struct nfqnl_msg_config_cmd {
         u_int8_t        command;        /* nfqnl_msg_config_cmds */
         u_int8_t        _pad;
-        u_int16_t       pf;             /* AF_xxx for PF_[UN]BIND */
+        __be16          pf;             /* AF_xxx for PF_[UN]BIND */
 };
 
 enum nfqnl_config_mode {
@@ -73,7 +73,7 @@ enum nfqnl_config_mode {
 };
 
 struct nfqnl_msg_config_params {
-        u_int32_t       copy_range;
+        __be32          copy_range;
         u_int8_t        copy_mode;      /* enum nfqnl_config_mode */
 } __attribute__ ((packed));
 
@@ -82,6 +82,7 @@ enum nfqnl_attr_config {
         NFQA_CFG_UNSPEC,
         NFQA_CFG_CMD,                   /* nfqnl_msg_config_cmd */
         NFQA_CFG_PARAMS,                /* nfqnl_msg_config_params */
+        NFQA_CFG_QUEUE_MAXLEN,          /* u_int32_t */
         __NFQA_CFG_MAX
 };
 #define NFQA_CFG_MAX (__NFQA_CFG_MAX-1)
diff --git a/include/linux/netfilter/xt_NFLOG.h b/include/linux/netfilter/xt_NFLOG.h
new file mode 100644
index 00000000000..cdcd0ed58f7
--- /dev/null
+++ b/include/linux/netfilter/xt_NFLOG.h
@@ -0,0 +1,18 @@
+#ifndef _XT_NFLOG_TARGET
+#define _XT_NFLOG_TARGET
+
+#define XT_NFLOG_DEFAULT_GROUP          0x1
+#define XT_NFLOG_DEFAULT_THRESHOLD      1
+
+#define XT_NFLOG_MASK                   0x0
+
+struct xt_nflog_info {
+        u_int32_t       len;
+        u_int16_t       group;
+        u_int16_t       threshold;
+        u_int16_t       flags;
+        u_int16_t       pad;
+        char            prefix[64];
+};
+
+#endif /* _XT_NFLOG_TARGET */
diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h
index 4c2d9945ca5..70b6f718cf4 100644
--- a/include/linux/netfilter/xt_conntrack.h
+++ b/include/linux/netfilter/xt_conntrack.h
@@ -29,14 +29,14 @@
 struct ip_conntrack_old_tuple
 {
         struct {
-                __u32 ip;
+                __be32 ip;
                 union {
                         __u16 all;
                 } u;
         } src;
 
         struct {
-                __u32 ip;
+                __be32 ip;
                 union {
                         __u16 all;
                 } u;
diff --git a/include/linux/netfilter/xt_hashlimit.h b/include/linux/netfilter/xt_hashlimit.h
new file mode 100644
index 00000000000..b4556b8edbf
--- /dev/null
+++ b/include/linux/netfilter/xt_hashlimit.h
@@ -0,0 +1,40 @@
+#ifndef _XT_HASHLIMIT_H
+#define _XT_HASHLIMIT_H
+
+/* timings are in milliseconds. */
+#define XT_HASHLIMIT_SCALE 10000
+/* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
+   seconds, or one every 59 hours. */
+
+/* details of this structure hidden by the implementation */
+struct xt_hashlimit_htable;
+
+#define XT_HASHLIMIT_HASH_DIP   0x0001
+#define XT_HASHLIMIT_HASH_DPT   0x0002
+#define XT_HASHLIMIT_HASH_SIP   0x0004
+#define XT_HASHLIMIT_HASH_SPT   0x0008
+
+struct hashlimit_cfg {
+        u_int32_t mode;   /* bitmask of IPT_HASHLIMIT_HASH_* */
+        u_int32_t avg;    /* Average secs between packets * scale */
+        u_int32_t burst;  /* Period multiplier for upper limit. */
+
+        /* user specified */
+        u_int32_t size;         /* how many buckets */
+        u_int32_t max;          /* max number of entries */
+        u_int32_t gc_interval;  /* gc interval */
+        u_int32_t expire;       /* when do entries expire? */
+};
+
+struct xt_hashlimit_info {
+        char name [IFNAMSIZ];           /* name */
+        struct hashlimit_cfg cfg;
+        struct xt_hashlimit_htable *hinfo;
+
+        /* Used internally by the kernel */
+        union {
+                void *ptr;
+                struct xt_hashlimit_info *master;
+        } u;
+};
+#endif /*_XT_HASHLIMIT_H*/
diff --git a/include/linux/netfilter/xt_policy.h b/include/linux/netfilter/xt_policy.h
index a8132ec076f..45654d359a6 100644
--- a/include/linux/netfilter/xt_policy.h
+++ b/include/linux/netfilter/xt_policy.h
@@ -39,7 +39,7 @@ struct xt_policy_elem
         union xt_policy_addr    smask;
         union xt_policy_addr    daddr;
         union xt_policy_addr    dmask;
-        u_int32_t               spi;
+        __be32                  spi;
         u_int32_t               reqid;
         u_int8_t                proto;
         u_int8_t                mode;
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
index 0be235418a2..24c8786d12e 100644
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
@@ -190,6 +190,7 @@ struct arpt_replace
 
 /* The argument to ARPT_SO_ADD_COUNTERS. */
 #define arpt_counters_info xt_counters_info
+#define arpt_counters xt_counters
 
 /* The argument to ARPT_SO_GET_ENTRIES. */
 struct arpt_get_entries
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h
index 9a4dd11af86..55689f39f77 100644
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
@@ -64,11 +64,10 @@ static inline int nf_bridge_pad(const struct sk_buff *skb)
 
 struct bridge_skb_cb {
         union {
-                __u32 ipv4;
+                __be32 ipv4;
         } daddr;
 };
 
-extern int brnf_deferred_hooks;
 #else
 #define nf_bridge_maybe_copy_header(skb)        (0)
 #define nf_bridge_pad(skb)                      (0)
diff --git a/include/linux/netfilter_bridge/ebt_802_3.h b/include/linux/netfilter_bridge/ebt_802_3.h
index b9f712c14a0..07f044ff1a6 100644
--- a/include/linux/netfilter_bridge/ebt_802_3.h
+++ b/include/linux/netfilter_bridge/ebt_802_3.h
@@ -28,21 +28,21 @@ struct hdr_ui {
         uint8_t ssap;
         uint8_t ctrl;
         uint8_t orig[3];
-        uint16_t type;
+        __be16 type;
 };
 
 struct hdr_ni {
         uint8_t dsap;
         uint8_t ssap;
-        uint16_t ctrl;
+        __be16 ctrl;
         uint8_t  orig[3];
-        uint16_t type;
+        __be16 type;
 };
 
 struct ebt_802_3_hdr {
         uint8_t  daddr[6];
         uint8_t  saddr[6];
-        uint16_t len;
+        __be16 len;
         union {
                 struct hdr_ui ui;
                 struct hdr_ni ni;
@@ -61,7 +61,7 @@ static inline struct ebt_802_3_hdr *ebt_802_3_hdr(const struct sk_buff *skb)
 struct ebt_802_3_info 
 {
         uint8_t  sap;
-        uint16_t type;
+        __be16 type;
         uint8_t  bitmask;
         uint8_t  invflags;
 };
diff --git a/include/linux/netfilter_bridge/ebt_among.h b/include/linux/netfilter_bridge/ebt_among.h
index 307c1fed851..7654069233c 100644
--- a/include/linux/netfilter_bridge/ebt_among.h
+++ b/include/linux/netfilter_bridge/ebt_among.h
@@ -32,7 +32,7 @@
 struct ebt_mac_wormhash_tuple
 {
         uint32_t cmp[2];
-        uint32_t ip;
+        __be32 ip;
 };
 
 struct ebt_mac_wormhash
diff --git a/include/linux/netfilter_bridge/ebt_arp.h b/include/linux/netfilter_bridge/ebt_arp.h
index 537ec6b487a..97e4dbde1f8 100644
--- a/include/linux/netfilter_bridge/ebt_arp.h
+++ b/include/linux/netfilter_bridge/ebt_arp.h
@@ -14,13 +14,13 @@
 
 struct ebt_arp_info
 {
-        uint16_t htype;
-        uint16_t ptype;
-        uint16_t opcode;
-        uint32_t saddr;
-        uint32_t smsk;
-        uint32_t daddr;
-        uint32_t dmsk;
+        __be16 htype;
+        __be16 ptype;
+        __be16 opcode;
+        __be32 saddr;
+        __be32 smsk;
+        __be32 daddr;
+        __be32 dmsk;
         unsigned char smaddr[ETH_ALEN];
         unsigned char smmsk[ETH_ALEN];
         unsigned char dmaddr[ETH_ALEN];
diff --git a/include/linux/netfilter_bridge/ebt_ip.h b/include/linux/netfilter_bridge/ebt_ip.h
index 7247385cdcb..d6847475bf2 100644
--- a/include/linux/netfilter_bridge/ebt_ip.h
+++ b/include/linux/netfilter_bridge/ebt_ip.h
@@ -28,10 +28,10 @@
 /* the same values are used for the invflags */
 struct ebt_ip_info
 {
-        uint32_t saddr;
-        uint32_t daddr;
-        uint32_t smsk;
-        uint32_t dmsk;
+        __be32 saddr;
+        __be32 daddr;
+        __be32 smsk;
+        __be32 dmsk;
         uint8_t  tos;
         uint8_t  protocol;
         uint8_t  bitmask;
diff --git a/include/linux/netfilter_bridge/ebt_nat.h b/include/linux/netfilter_bridge/ebt_nat.h
index 26fd90da4cd..435b886a51a 100644
--- a/include/linux/netfilter_bridge/ebt_nat.h
+++ b/include/linux/netfilter_bridge/ebt_nat.h
@@ -1,6 +1,7 @@
 #ifndef __LINUX_BRIDGE_EBT_NAT_H
 #define __LINUX_BRIDGE_EBT_NAT_H
 
+#define NAT_ARP_BIT  (0x00000010)
 struct ebt_nat_info
 {
         unsigned char mac[ETH_ALEN];
diff --git a/include/linux/netfilter_bridge/ebt_vlan.h b/include/linux/netfilter_bridge/ebt_vlan.h
index cb1fcc41565..1d98be4031e 100644
--- a/include/linux/netfilter_bridge/ebt_vlan.h
+++ b/include/linux/netfilter_bridge/ebt_vlan.h
@@ -10,7 +10,7 @@
 struct ebt_vlan_info {
         uint16_t id;            /* VLAN ID {1-4095} */
         uint8_t prio;           /* VLAN User Priority {0-7} */
-        uint16_t encap;         /* VLAN Encapsulated frame code {0-65535} */
+        __be16 encap;           /* VLAN Encapsulated frame code {0-65535} */
         uint8_t bitmask;                /* Args bitmask bit 1=1 - ID arg,
                                    bit 2=1 User-Priority arg, bit 3=1 encap*/
         uint8_t invflags;               /* Inverse bitmask  bit 1=1 - inversed ID arg, 
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h
index b1a7cc90877..94e0a7dc0cb 100644
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
@@ -26,6 +26,10 @@
 #define EBT_CONTINUE -3
 #define EBT_RETURN   -4
 #define NUM_STANDARD_TARGETS   4
+/* ebtables target modules store the verdict inside an int. We can
+ * reclaim a part of this int for backwards compatible extensions.
+ * The 4 lsb are more than enough to store the verdict. */
+#define EBT_VERDICT_BITS 0x0000000F
 
 struct ebt_counter
 {
@@ -42,6 +46,23 @@ struct ebt_replace
         /* total size of the entries */
         unsigned int entries_size;
         /* start of the chains */
+        struct ebt_entries __user *hook_entry[NF_BR_NUMHOOKS];
+        /* nr of counters userspace expects back */
+        unsigned int num_counters;
+        /* where the kernel will put the old counters */
+        struct ebt_counter __user *counters;
+        char __user *entries;
+};
+
+struct ebt_replace_kernel
+{
+        char name[EBT_TABLE_MAXNAMELEN];
+        unsigned int valid_hooks;
+        /* nr of rules in the table */
+        unsigned int nentries;
+        /* total size of the entries */
+        unsigned int entries_size;
+        /* start of the chains */
         struct ebt_entries *hook_entry[NF_BR_NUMHOOKS];
         /* nr of counters userspace expects back */
         unsigned int num_counters;
@@ -141,7 +162,7 @@ struct ebt_entry {
         /* this needs to be the first field */
         unsigned int bitmask;
         unsigned int invflags;
-        uint16_t ethproto;
+        __be16 ethproto;
         /* the physical in-dev */
         char in[IFNAMSIZ];
         /* the logical in-dev */
@@ -251,7 +272,7 @@ struct ebt_table
 {
         struct list_head list;
         char name[EBT_TABLE_MAXNAMELEN];
-        struct ebt_replace *table;
+        struct ebt_replace_kernel *table;
         unsigned int valid_hooks;
         rwlock_t lock;
         /* e.g. could be the table explicitly only allows certain
diff --git a/include/linux/netfilter_ipv4.h b/include/linux/netfilter_ipv4.h
index 5b63a231a76..ceae87a4c89 100644
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
@@ -57,10 +57,8 @@ enum nf_ip_hook_priorities {
         NF_IP_PRI_RAW = -300,
         NF_IP_PRI_SELINUX_FIRST = -225,
         NF_IP_PRI_CONNTRACK = -200,
-        NF_IP_PRI_BRIDGE_SABOTAGE_FORWARD = -175,
         NF_IP_PRI_MANGLE = -150,
         NF_IP_PRI_NAT_DST = -100,
-        NF_IP_PRI_BRIDGE_SABOTAGE_LOCAL_OUT = -50,
         NF_IP_PRI_FILTER = 0,
         NF_IP_PRI_NAT_SRC = 100,
         NF_IP_PRI_SELINUX_LAST = 225,
@@ -79,7 +77,7 @@ enum nf_ip_hook_priorities {
 #ifdef __KERNEL__
 extern int ip_route_me_harder(struct sk_buff **pskb, unsigned addr_type);
 extern int ip_xfrm_me_harder(struct sk_buff **pskb);
-extern unsigned int nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
+extern __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
                                    unsigned int dataoff, u_int8_t protocol);
 #endif /*__KERNEL__*/
 
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
index 591c1a809c0..180337801a8 100644
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
@@ -1,6 +1,4 @@
 header-y += ip_conntrack_helper.h
-header-y += ip_conntrack_helper_h323_asn1.h
-header-y += ip_conntrack_helper_h323_types.h
 header-y += ip_conntrack_protocol.h
 header-y += ip_conntrack_sctp.h
 header-y += ip_conntrack_tcp.h
diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index 64e868034c4..33581c13d94 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -9,6 +9,7 @@
 #include <linux/compiler.h>
 #include <asm/atomic.h>
 
+#include <linux/timer.h>
 #include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_icmp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_proto_gre.h>
@@ -277,7 +278,7 @@ extern struct ip_conntrack_expect *
 __ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple);
 
 extern struct ip_conntrack_expect *
-ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple);
+ip_conntrack_expect_find_get(const struct ip_conntrack_tuple *tuple);
 
 extern struct ip_conntrack_tuple_hash *
 __ip_conntrack_find(const struct ip_conntrack_tuple *tuple,
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_ftp.h b/include/linux/netfilter_ipv4/ip_conntrack_ftp.h
index 63811934de4..2129fc3972a 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_ftp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_ftp.h
@@ -1,6 +1,44 @@
 #ifndef _IP_CONNTRACK_FTP_H
 #define _IP_CONNTRACK_FTP_H
+/* FTP tracking. */
 
-#include <linux/netfilter/nf_conntrack_ftp.h>
+/* This enum is exposed to userspace */
+enum ip_ct_ftp_type
+{
+        /* PORT command from client */
+        IP_CT_FTP_PORT,
+        /* PASV response from server */
+        IP_CT_FTP_PASV,
+        /* EPRT command from client */
+        IP_CT_FTP_EPRT,
+        /* EPSV response from server */
+        IP_CT_FTP_EPSV,
+};
+
+#ifdef __KERNEL__
+
+#define FTP_PORT        21
+
+#define NUM_SEQ_TO_REMEMBER 2
+/* This structure exists only once per master */
+struct ip_ct_ftp_master {
+        /* Valid seq positions for cmd matching after newline */
+        u_int32_t seq_aft_nl[IP_CT_DIR_MAX][NUM_SEQ_TO_REMEMBER];
+        /* 0 means seq_match_aft_nl not set */
+        int seq_aft_nl_num[IP_CT_DIR_MAX];
+};
+
+struct ip_conntrack_expect;
+
+/* For NAT to hook in when we find a packet which describes what other
+ * connection we should expect. */
+extern unsigned int (*ip_nat_ftp_hook)(struct sk_buff **pskb,
+                                       enum ip_conntrack_info ctinfo,
+                                       enum ip_ct_ftp_type type,
+                                       unsigned int matchoff,
+                                       unsigned int matchlen,
+                                       struct ip_conntrack_expect *exp,
+                                       u32 *seq);
+#endif /* __KERNEL__ */
 
 #endif /* _IP_CONNTRACK_FTP_H */
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_h323.h b/include/linux/netfilter_ipv4/ip_conntrack_h323.h
index 943cc6a4871..18f769818f4 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_h323.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_h323.h
@@ -3,7 +3,7 @@
 
 #ifdef __KERNEL__
 
-#include <linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h>
+#include <linux/netfilter/nf_conntrack_h323_asn1.h>
 
 #define RAS_PORT 1719
 #define Q931_PORT 1720
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h b/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
index 1d853aa873e..e371e0fc167 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
@@ -102,11 +102,11 @@ static inline __be32 *gre_key(struct gre_hdr *greh)
 }
 
 /* get pointer ot gre csum, if present */
-static inline u_int16_t *gre_csum(struct gre_hdr *greh)
+static inline __sum16 *gre_csum(struct gre_hdr *greh)
 {
         if (!greh->csum)
                 return NULL;
-        return (u_int16_t *) (greh+sizeof(*greh));
+        return (__sum16 *) (greh+sizeof(*greh));
 }
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_sip.h b/include/linux/netfilter_ipv4/ip_conntrack_sip.h
index 913dad66c0f..bef6c646def 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_sip.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_sip.h
@@ -5,23 +5,18 @@
 #define SIP_PORT        5060
 #define SIP_TIMEOUT     3600
 
-#define POS_VIA         0
-#define POS_CONTACT     1
-#define POS_CONTENT     2
-#define POS_MEDIA       3
-#define POS_OWNER       4
-#define POS_CONNECTION  5
-#define POS_REQ_HEADER  6
-#define POS_SDP_HEADER  7
-
-struct sip_header_nfo {
-        const char      *lname;
-        const char      *sname;
-        const char      *ln_str;
-        size_t          lnlen;
-        size_t          snlen;
-        size_t          ln_strlen;
-        int             (*match_len)(const char *, const char *, int *);
+enum sip_header_pos {
+        POS_REG_REQ_URI,
+        POS_REQ_URI,
+        POS_FROM,
+        POS_TO,
+        POS_VIA,
+        POS_CONTACT,
+        POS_CONTENT,
+        POS_MEDIA,
+        POS_OWNER,
+        POS_CONNECTION,
+        POS_SDP_HEADER,
 };
 
 extern unsigned int (*ip_nat_sip_hook)(struct sk_buff **pskb,
@@ -36,9 +31,10 @@ extern unsigned int (*ip_nat_sdp_hook)(struct sk_buff **pskb,
 extern int ct_sip_get_info(const char *dptr, size_t dlen,
                            unsigned int *matchoff,
                            unsigned int *matchlen,
-                           struct sip_header_nfo *hnfo);
+                           enum sip_header_pos pos);
 extern int ct_sip_lnlen(const char *line, const char *limit);
 extern const char *ct_sip_search(const char *needle, const char *haystack,
-                                 size_t needle_len, size_t haystack_len);
+                                 size_t needle_len, size_t haystack_len,
+                                 int case_sensitive);
 #endif /* __KERNEL__ */
 #endif /* __IP_CONNTRACK_SIP_H__ */
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_tftp.h b/include/linux/netfilter_ipv4/ip_conntrack_tftp.h
index cde9729aa17..a404fc0abf0 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_tftp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_tftp.h
@@ -4,7 +4,7 @@
 #define TFTP_PORT 69
 
 struct tftphdr {
-        u_int16_t opcode;
+        __be16 opcode;
 };
 
 #define TFTP_OPCODE_READ        1
diff --git a/include/linux/netfilter_ipv4/ipt_LOG.h b/include/linux/netfilter_ipv4/ipt_LOG.h
index 892f9a33fea..90fa6525ef9 100644
--- a/include/linux/netfilter_ipv4/ipt_LOG.h
+++ b/include/linux/netfilter_ipv4/ipt_LOG.h
@@ -6,7 +6,7 @@
 #define IPT_LOG_TCPOPT          0x02    /* Log TCP options */
 #define IPT_LOG_IPOPT           0x04    /* Log IP options */
 #define IPT_LOG_UID             0x08    /* Log UID owning local socket */
-#define IPT_LOG_NFLOG           0x10    /* Log using nf_log backend */
+#define IPT_LOG_NFLOG           0x10    /* Unsupported, don't reuse */
 #define IPT_LOG_MASK            0x1f
 
 struct ipt_log_info {
diff --git a/include/linux/netfilter_ipv4/ipt_hashlimit.h b/include/linux/netfilter_ipv4/ipt_hashlimit.h
index ac2cb64ecd7..5662120a3d7 100644
--- a/include/linux/netfilter_ipv4/ipt_hashlimit.h
+++ b/include/linux/netfilter_ipv4/ipt_hashlimit.h
@@ -1,40 +1,14 @@
 #ifndef _IPT_HASHLIMIT_H
 #define _IPT_HASHLIMIT_H
 
-/* timings are in milliseconds. */
-#define IPT_HASHLIMIT_SCALE 10000
-/* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
-   seconds, or one every 59 hours. */
+#include <linux/netfilter/xt_hashlimit.h>
 
-/* details of this structure hidden by the implementation */
-struct ipt_hashlimit_htable;
+#define IPT_HASHLIMIT_SCALE     XT_HASHLIMIT_SCALE
+#define IPT_HASHLIMIT_HASH_DIP  XT_HASHLIMIT_HASH_DIP
+#define IPT_HASHLIMIT_HASH_DPT  XT_HASHLIMIT_HASH_DPT
+#define IPT_HASHLIMIT_HASH_SIP  XT_HASHLIMIT_HASH_SIP
+#define IPT_HASHLIMIT_HASH_SPT  XT_HASHLIMIT_HASH_SPT
 
-#define IPT_HASHLIMIT_HASH_DIP  0x0001
-#define IPT_HASHLIMIT_HASH_DPT  0x0002
-#define IPT_HASHLIMIT_HASH_SIP  0x0004
-#define IPT_HASHLIMIT_HASH_SPT  0x0008
+#define ipt_hashlimit_info xt_hashlimit_info
 
-struct hashlimit_cfg {
-        u_int32_t mode;   /* bitmask of IPT_HASHLIMIT_HASH_* */
-        u_int32_t avg;    /* Average secs between packets * scale */
-        u_int32_t burst;  /* Period multiplier for upper limit. */
-
-        /* user specified */
-        u_int32_t size;         /* how many buckets */
-        u_int32_t max;          /* max number of entries */
-        u_int32_t gc_interval;  /* gc interval */
-        u_int32_t expire;       /* when do entries expire? */
-};
-
-struct ipt_hashlimit_info {
-        char name [IFNAMSIZ];           /* name */
-        struct hashlimit_cfg cfg;
-        struct ipt_hashlimit_htable *hinfo;
-
-        /* Used internally by the kernel */
-        union {
-                void *ptr;
-                struct ipt_hashlimit_info *master;
-        } u;
-};
-#endif /*_IPT_HASHLIMIT_H*/
+#endif /* _IPT_HASHLIMIT_H */
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index d97e268cdfe..66ca8e3100d 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -62,10 +62,8 @@ enum nf_ip6_hook_priorities {
         NF_IP6_PRI_CONNTRACK_DEFRAG = -400,
         NF_IP6_PRI_SELINUX_FIRST = -225,
         NF_IP6_PRI_CONNTRACK = -200,
-        NF_IP6_PRI_BRIDGE_SABOTAGE_FORWARD = -175,
         NF_IP6_PRI_MANGLE = -150,
         NF_IP6_PRI_NAT_DST = -100,
-        NF_IP6_PRI_BRIDGE_SABOTAGE_LOCAL_OUT = -50,
         NF_IP6_PRI_FILTER = 0,
         NF_IP6_PRI_NAT_SRC = 100,
         NF_IP6_PRI_SELINUX_LAST = 225,
@@ -74,7 +72,7 @@ enum nf_ip6_hook_priorities {
 
 #ifdef CONFIG_NETFILTER
 extern int ip6_route_me_harder(struct sk_buff *skb);
-extern unsigned int nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
+extern __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
                                     unsigned int dataoff, u_int8_t protocol);
 
 extern int ipv6_netfilter_init(void);
diff --git a/include/linux/netfilter_ipv6/ip6t_LOG.h b/include/linux/netfilter_ipv6/ip6t_LOG.h
index 060c1a1c6c6..0d0119b0458 100644
--- a/include/linux/netfilter_ipv6/ip6t_LOG.h
+++ b/include/linux/netfilter_ipv6/ip6t_LOG.h
@@ -6,7 +6,7 @@
 #define IP6T_LOG_TCPOPT         0x02    /* Log TCP options */
 #define IP6T_LOG_IPOPT          0x04    /* Log IP options */
 #define IP6T_LOG_UID            0x08    /* Log UID owning local socket */
-#define IP6T_LOG_NFLOG          0x10    /* Log using nf_log backend */
+#define IP6T_LOG_NFLOG          0x10    /* Unsupported, don't use */
 #define IP6T_LOG_MASK           0x1f
 
 struct ip6t_log_info {
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 66411622e06..b3b9b609ee8 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -141,7 +141,6 @@ struct netlink_skb_parms
 {
         struct ucred            creds;          /* Skb credentials      */
         __u32                   pid;
-        __u32                   dst_pid;
         __u32                   dst_group;
         kernel_cap_t            eff_cap;
         __u32                   loginuid;       /* Login (audit) uid */
@@ -174,6 +173,7 @@ int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol);
  */
 #define NLMSG_GOODORDER 0
 #define NLMSG_GOODSIZE (SKB_MAX_ORDER(0, NLMSG_GOODORDER))
+#define NLMSG_DEFAULT_SIZE (NLMSG_GOODSIZE - NLMSG_HDRLEN)
 
 
 struct netlink_callback
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 1efe60c5c00..29930b71a9a 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -12,26 +12,27 @@
 #include <linux/rcupdate.h>
 #include <linux/list.h>
 
-struct netpoll;
-
 struct netpoll {
         struct net_device *dev;
-        char dev_name[16], *name;
+        char dev_name[IFNAMSIZ];
+        const char *name;
         void (*rx_hook)(struct netpoll *, int, char *, int);
-        void (*drop)(struct sk_buff *skb);
+
         u32 local_ip, remote_ip;
         u16 local_port, remote_port;
-        unsigned char local_mac[6], remote_mac[6];
+        u8 local_mac[ETH_ALEN], remote_mac[ETH_ALEN];
 };
 
 struct netpoll_info {
+        atomic_t refcnt;
         spinlock_t poll_lock;
         int poll_owner;
-        int tries;
         int rx_flags;
         spinlock_t rx_lock;
         struct netpoll *rx_np; /* netpoll that registered an rx_hook */
         struct sk_buff_head arp_tx; /* list of arp requests to reply to */
+        struct sk_buff_head txq;
+        struct delayed_work tx_work;
 };
 
 void netpoll_poll(struct netpoll *np);
@@ -42,7 +43,7 @@ int netpoll_trap(void);
 void netpoll_set_trap(int trap);
 void netpoll_cleanup(struct netpoll *np);
 int __netpoll_rx(struct sk_buff *skb);
-void netpoll_queue(struct sk_buff *skb);
+
 
 #ifdef CONFIG_NETPOLL
 static inline int netpoll_rx(struct sk_buff *skb)
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 45228c1a119..04963063e62 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -33,6 +33,7 @@
 #define FLUSH_HIGHPRI           16      /* high priority memory reclaim flush */
 #define FLUSH_NOCOMMIT          32      /* Don't send the NFSv3/v4 COMMIT */
 #define FLUSH_INVALIDATE        64      /* Invalidate the page cache */
+#define FLUSH_NOWRITEPAGE       128     /* Don't call writepage() */
 
 #ifdef __KERNEL__
 
@@ -318,7 +319,7 @@ 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);
 
 /* linux/net/ipv4/ipconfig.c: trims ip addr off front of name, too. */
-extern u32 root_nfs_parse_addr(char *name); /*__init*/
+extern __be32 root_nfs_parse_addr(char *name); /*__init*/
 
 static inline void nfs_fattr_init(struct nfs_fattr *fattr)
 {
@@ -427,19 +428,21 @@ extern int  nfs_flush_incompatible(struct file *file, struct page *page);
 extern int  nfs_updatepage(struct file *, struct page *, unsigned int, unsigned int);
 extern int nfs_writeback_done(struct rpc_task *, struct nfs_write_data *);
 extern void nfs_writedata_release(void *);
-
-#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
-struct nfs_write_data *nfs_commit_alloc(void);
-void nfs_commit_free(struct nfs_write_data *p);
-#endif
+extern int nfs_set_page_dirty(struct page *);
 
 /*
  * Try to write back everything synchronously (but check the
  * return value!)
  */
-extern int  nfs_sync_inode_wait(struct inode *, unsigned long, unsigned int, int);
+extern long nfs_sync_mapping_wait(struct address_space *, struct writeback_control *, int);
+extern int nfs_sync_mapping_range(struct address_space *, loff_t, loff_t, int);
+extern int nfs_wb_all(struct inode *inode);
+extern int nfs_wb_page(struct inode *inode, struct page* page);
+extern int nfs_wb_page_priority(struct inode *inode, struct page* page, int how);
 #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
 extern int  nfs_commit_inode(struct inode *, int);
+extern struct nfs_write_data *nfs_commit_alloc(void);
+extern void nfs_commit_free(struct nfs_write_data *wdata);
 extern void nfs_commit_release(void *wdata);
 #else
 static inline int
@@ -455,28 +458,6 @@ nfs_have_writebacks(struct inode *inode)
         return NFS_I(inode)->npages != 0;
 }
 
-static inline int
-nfs_wb_all(struct inode *inode)
-{
-        int error = nfs_sync_inode_wait(inode, 0, 0, 0);
-        return (error < 0) ? error : 0;
-}
-
-/*
- * Write back all requests on one page - we do this before reading it.
- */
-static inline int nfs_wb_page_priority(struct inode *inode, struct page* page, int how)
-{
-        int error = nfs_sync_inode_wait(inode, page->index, 1,
-                        how | FLUSH_STABLE);
-        return (error < 0) ? error : 0;
-}
-
-static inline int nfs_wb_page(struct inode *inode, struct page* page)
-{
-        return nfs_wb_page_priority(inode, page, 0);
-}
-
 /*
  * Allocate nfs_write_data structures
  */
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 7ccfc7ef0a8..95796e6924f 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -51,7 +51,7 @@ struct nfs_client {
 
         unsigned long           cl_lease_time;
         unsigned long           cl_last_renewal;
-        struct work_struct      cl_renewd;
+        struct delayed_work     cl_renewd;
 
         struct rpc_wait_queue   cl_rpcwaitq;
 
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 1f7bd287c23..2e555d49c9b 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -30,6 +30,8 @@
 #define PG_BUSY                 0
 #define PG_NEED_COMMIT          1
 #define PG_NEED_RESCHED         2
+#define PG_NEED_FLUSH           3
+#define PG_FLUSHING             4
 
 struct nfs_inode;
 struct nfs_page {
@@ -60,8 +62,9 @@ extern	void nfs_clear_request(struct nfs_page *req);
 extern  void nfs_release_request(struct nfs_page *req);
 
 
-extern  int nfs_scan_lock_dirty(struct nfs_inode *nfsi, struct list_head *dst,
-                                unsigned long idx_start, unsigned int npages);
+extern  long nfs_scan_dirty(struct address_space *mapping,
+                                struct writeback_control *wbc,
+                                struct list_head *dst);
 extern  int nfs_scan_list(struct nfs_inode *nfsi, struct list_head *head, struct list_head *dst,
                           unsigned long idx_start, unsigned int npages);
 extern  int nfs_coalesce_requests(struct list_head *, struct list_head *,
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 768c1ad5ff6..9ee9da5e1cc 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -785,8 +785,6 @@ struct nfs_rpc_ops {
         int     (*readlink)(struct inode *, struct page *, unsigned int,
                             unsigned int);
         int     (*read)    (struct nfs_read_data *);
-        int     (*write)   (struct nfs_write_data *);
-        int     (*commit)  (struct nfs_write_data *);
         int     (*create)  (struct inode *, struct dentry *,
                             struct iattr *, int, struct nameidata *);
         int     (*remove)  (struct inode *, struct qstr *);
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index edb54c3171b..0727774772b 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -275,12 +275,12 @@ static inline int is_fsid(struct svc_fh *fh, struct knfsd_fh *reffh)
  * we might process an operation with side effects, and be unable to
  * tell the client that the operation succeeded.
  *
- * COMPOUND_SLACK_SPACE - this is the minimum amount of buffer space
+ * COMPOUND_SLACK_SPACE - this is the minimum bytes of buffer space
  * needed to encode an "ordinary" _successful_ operation.  (GETATTR,
  * READ, READDIR, and READLINK have their own buffer checks.)  if we
  * fall below this level, we fail the next operation with NFS4ERR_RESOURCE.
  *
- * COMPOUND_ERR_SLACK_SPACE - this is the minimum amount of buffer space
+ * COMPOUND_ERR_SLACK_SPACE - this is the minimum bytes of buffer space
  * needed to encode an operation which has failed with NFS4ERR_RESOURCE.
  * care is taken to ensure that we never fall below this level for any
  * reason.
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index c3673f487e8..ab5c236bd9a 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -273,7 +273,6 @@ struct nfs4_stateid {
         ((err) != nfserr_stale_stateid) &&      \
         ((err) != nfserr_bad_stateid))
 
-extern __be32 nfsd4_renew(clientid_t *clid);
 extern __be32 nfs4_preprocess_stateid_op(struct svc_fh *current_fh,
                 stateid_t *stateid, int flags, struct file **filp);
 extern void nfs4_lock_state(void);
diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h
index 45ca01b5f84..09799bcee0a 100644
--- a/include/linux/nfsd/xdr4.h
+++ b/include/linux/nfsd/xdr4.h
@@ -44,6 +44,12 @@
 #define NFSD4_MAX_TAGLEN        128
 #define XDR_LEN(n)                     (((n) + 3) & ~3)
 
+struct nfsd4_compound_state {
+        struct svc_fh current_fh;
+        struct svc_fh save_fh;
+        struct nfs4_stateowner *replay_owner;
+};
+
 struct nfsd4_change_info {
         u32             atomic;
         u32             before_ctime_sec;
@@ -430,35 +436,39 @@ __be32 nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
                        struct dentry *dentry, __be32 *buffer, int *countp,
                        u32 *bmval, struct svc_rqst *);
 extern __be32 nfsd4_setclientid(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
                 struct nfsd4_setclientid *setclid);
 extern __be32 nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
                 struct nfsd4_setclientid_confirm *setclientid_confirm);
 extern __be32 nfsd4_process_open1(struct nfsd4_open *open);
 extern __be32 nfsd4_process_open2(struct svc_rqst *rqstp,
                 struct svc_fh *current_fh, struct nfsd4_open *open);
 extern __be32 nfsd4_open_confirm(struct svc_rqst *rqstp,
-                struct svc_fh *current_fh, struct nfsd4_open_confirm *oc,
-                struct nfs4_stateowner **);
-extern __be32 nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh,
-                struct nfsd4_close *close,
-                struct nfs4_stateowner **replay_owner);
+                struct nfsd4_compound_state *, struct nfsd4_open_confirm *oc);
+extern __be32 nfsd4_close(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
+                struct nfsd4_close *close);
 extern __be32 nfsd4_open_downgrade(struct svc_rqst *rqstp,
-                struct svc_fh *current_fh, struct nfsd4_open_downgrade *od,
-                struct nfs4_stateowner **replay_owner);
-extern __be32 nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh,
-                struct nfsd4_lock *lock,
-                struct nfs4_stateowner **replay_owner);
-extern __be32 nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh,
+                struct nfsd4_compound_state *,
+                struct nfsd4_open_downgrade *od);
+extern __be32 nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *,
+                struct nfsd4_lock *lock);
+extern __be32 nfsd4_lockt(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
                 struct nfsd4_lockt *lockt);
-extern __be32 nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh,
-                struct nfsd4_locku *locku,
-                struct nfs4_stateowner **replay_owner);
+extern __be32 nfsd4_locku(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
+                struct nfsd4_locku *locku);
 extern __be32
 nfsd4_release_lockowner(struct svc_rqst *rqstp,
+                struct nfsd4_compound_state *,
                 struct nfsd4_release_lockowner *rlockowner);
 extern void nfsd4_release_compoundargs(struct nfsd4_compoundargs *);
 extern __be32 nfsd4_delegreturn(struct svc_rqst *rqstp,
-                struct svc_fh *current_fh, struct nfsd4_delegreturn *dr);
+                struct nfsd4_compound_state *, struct nfsd4_delegreturn *dr);
+extern __be32 nfsd4_renew(struct svc_rqst *rqstp,
+                          struct nfsd4_compound_state *, clientid_t *clid);
 #endif
 
 /*
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index e16904e28c3..acb4ed13024 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -15,9 +15,14 @@
  * disables interrupts for a long time. This call is stateless.
  */
 #ifdef ARCH_HAS_NMI_WATCHDOG
+#include <asm/nmi.h>
 extern void touch_nmi_watchdog(void);
 #else
 # define touch_nmi_watchdog() touch_softlockup_watchdog()
 #endif
 
+#ifndef trigger_all_cpu_backtrace
+#define trigger_all_cpu_backtrace() do { } while (0)
+#endif
+
 #endif
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index 971d1c6dfc4..0b9f0dc30d6 100644
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -4,9 +4,10 @@
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 
-struct namespace;
+struct mnt_namespace;
 struct uts_namespace;
 struct ipc_namespace;
+struct pid_namespace;
 
 /*
  * A structure to contain pointers to all per-process
@@ -25,7 +26,8 @@ struct nsproxy {
         spinlock_t nslock;
         struct uts_namespace *uts_ns;
         struct ipc_namespace *ipc_ns;
-        struct namespace *namespace;
+        struct mnt_namespace *mnt_ns;
+        struct pid_namespace *pid_ns;
 };
 extern struct nsproxy init_nsproxy;
 
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 4830a3bedfb..350878a2d84 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -253,15 +253,11 @@ static inline void SetPageUptodate(struct page *page)
 
 struct page;    /* forward declaration */
 
-int test_clear_page_dirty(struct page *page);
+extern void cancel_dirty_page(struct page *page, unsigned int account_size);
+
 int test_clear_page_writeback(struct page *page);
 int test_set_page_writeback(struct page *page);
 
-static inline void clear_page_dirty(struct page *page)
-{
-        test_clear_page_dirty(page);
-}
-
 static inline void set_page_writeback(struct page *page)
 {
         test_set_page_writeback(page);
diff --git a/include/linux/pata_platform.h b/include/linux/pata_platform.h
new file mode 100644
index 00000000000..2d5fd647e0e
--- /dev/null
+++ b/include/linux/pata_platform.h
@@ -0,0 +1,13 @@
+#ifndef __LINUX_PATA_PLATFORM_H
+#define __LINUX_PATA_PLATFORM_H
+
+struct pata_platform_info {
+        /*
+         * I/O port shift, for platforms with ports that are
+         * constantly spaced and need larger than the 1-byte
+         * spacing used by ata_std_ports().
+         */
+        unsigned int ioport_shift;
+};
+
+#endif /* __LINUX_PATA_PLATFORM_H */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 09be0f81b27..f3c617eabd8 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -20,9 +20,6 @@
 /* Include the pci register defines */
 #include <linux/pci_regs.h>
 
-/* Include the ID list */
-#include <linux/pci_ids.h>
-
 /*
  * The PCI interface treats multi-function devices as independent
  * devices.  The slot/function address of each device is encoded
@@ -51,8 +48,12 @@
 #include <linux/list.h>
 #include <linux/compiler.h>
 #include <linux/errno.h>
+#include <asm/atomic.h>
 #include <linux/device.h>
 
+/* Include the ID list */
+#include <linux/pci_ids.h>
+
 /* File state for mmap()s on /proc/bus/pci/X/Y */
 enum pci_mmap_state {
         pci_mmap_io,
@@ -159,7 +160,6 @@ struct pci_dev {
         unsigned int    transparent:1;  /* Transparent PCI bridge */
         unsigned int    multifunction:1;/* Part of multi-function device */
         /* keep track of device state */
-        unsigned int    is_enabled:1;   /* pci_enable_device has been called */
         unsigned int    is_busmaster:1; /* device is busmaster */
         unsigned int    no_msi:1;       /* device may not use msi */
         unsigned int    no_d1d2:1;   /* only allow d0 or d3 */
@@ -167,6 +167,7 @@ struct pci_dev {
         unsigned int    broken_parity_status:1; /* Device generates false positive parity */
         unsigned int    msi_enabled:1;
         unsigned int    msix_enabled:1;
+        atomic_t        enable_cnt;     /* pci_enable_device has been called */
 
         u32             saved_config_space[16]; /* config space saved at suspend time */
         struct hlist_head saved_cap_space;
@@ -395,6 +396,21 @@ struct pci_driver {
  */
 #define pci_module_init pci_register_driver
 
+/**
+ * PCI_VDEVICE - macro used to describe a specific pci device in short form
+ * @vend: the vendor name
+ * @dev: the 16 bit PCI Device ID
+ *
+ * This macro is used to create a struct pci_device_id that matches a
+ * specific PCI device.  The subvendor, and subdevice fields will be set
+ * to PCI_ANY_ID. The macro allows the next field to follow as the device
+ * private data.
+ */
+
+#define PCI_VDEVICE(vendor, device)             \
+        PCI_VENDOR_ID_##vendor, (device),       \
+        PCI_ANY_ID, PCI_ANY_ID, 0, 0
+
 /* these external functions are only available when PCI support is enabled */
 #ifdef CONFIG_PCI
 
@@ -453,6 +469,8 @@ struct pci_dev *pci_find_slot (unsigned int bus, unsigned int devfn);
 int pci_find_capability (struct pci_dev *dev, int cap);
 int pci_find_next_capability (struct pci_dev *dev, u8 pos, int cap);
 int pci_find_ext_capability (struct pci_dev *dev, int cap);
+int pci_find_ht_capability (struct pci_dev *dev, int ht_cap);
+int pci_find_next_ht_capability (struct pci_dev *dev, int pos, int ht_cap);
 struct pci_bus *pci_find_next_bus(const struct pci_bus *from);
 
 struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,
@@ -467,6 +485,7 @@ struct pci_dev *pci_get_slot (struct pci_bus *bus, unsigned int devfn);
 struct pci_dev *pci_get_bus_and_slot (unsigned int bus, unsigned int devfn);
 struct pci_dev *pci_get_class (unsigned int class, struct pci_dev *from);
 int pci_dev_present(const struct pci_device_id *ids);
+const struct pci_device_id *pci_find_present(const struct pci_device_id *ids);
 
 int pci_bus_read_config_byte (struct pci_bus *bus, unsigned int devfn, int where, u8 *val);
 int pci_bus_read_config_word (struct pci_bus *bus, unsigned int devfn, int where, u16 *val);
@@ -680,6 +699,7 @@ static inline struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *
 { return NULL; }
 
 #define pci_dev_present(ids)    (0)
+#define pci_find_present(ids)   (NULL)
 #define pci_dev_put(dev)        do { } while (0)
 
 static inline void pci_set_master(struct pci_dev *dev) { }
@@ -782,6 +802,7 @@ enum pci_fixup_pass {
         pci_fixup_header,       /* After reading configuration header */
         pci_fixup_final,        /* Final phase of device fixups */
         pci_fixup_enable,       /* pci_enable_device() time */
+        pci_fixup_resume,       /* pci_enable_device() time */
 };
 
 /* Anonymous variables would be nice... */
@@ -800,6 +821,9 @@ enum pci_fixup_pass {
 #define DECLARE_PCI_FIXUP_ENABLE(vendor, device, hook)                  \
         DECLARE_PCI_FIXUP_SECTION(.pci_fixup_enable,                    \
                         vendor##device##hook, vendor, device, hook)
+#define DECLARE_PCI_FIXUP_RESUME(vendor, device, hook)                  \
+        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume,                    \
+                        resume##vendor##device##hook, vendor, device, hook)
 
 
 void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index fa4e1d79978..f7a416c52ed 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -104,6 +104,10 @@
 #define PCI_CLASS_SERIAL_FIBER          0x0c04
 #define PCI_CLASS_SERIAL_SMBUS          0x0c05
 
+#define PCI_BASE_CLASS_WIRELESS                 0x0d
+#define PCI_CLASS_WIRELESS_RF_CONTROLLER        0x0d10
+#define PCI_CLASS_WIRELESS_WHCI                 0x0d1010
+
 #define PCI_BASE_CLASS_INTELLIGENT      0x0e
 #define PCI_CLASS_INTELLIGENT_I2O       0x0e00
 
@@ -390,7 +394,7 @@
 #define PCI_DEVICE_ID_NS_CS5535_IDE     0x002d
 #define PCI_DEVICE_ID_NS_CS5535_AUDIO   0x002e
 #define PCI_DEVICE_ID_NS_CS5535_USB     0x002f
-#define PCI_DEVICE_ID_NS_CS5535_VIDEO   0x0030
+#define PCI_DEVICE_ID_NS_GX_VIDEO       0x0030
 #define PCI_DEVICE_ID_NS_SATURN         0x0035
 #define PCI_DEVICE_ID_NS_SCx200_BRIDGE  0x0500
 #define PCI_DEVICE_ID_NS_SCx200_SMI     0x0501
@@ -403,8 +407,7 @@
 #define PCI_DEVICE_ID_NS_SC1100_XBUS    0x0515
 #define PCI_DEVICE_ID_NS_87410          0xd001
 
-#define PCI_DEVICE_ID_NS_CS5535_HOST_BRIDGE  0x0028
-#define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE   0x002b
+#define PCI_DEVICE_ID_NS_GX_HOST_BRIDGE  0x0028
 
 #define PCI_VENDOR_ID_TSENG             0x100c
 #define PCI_DEVICE_ID_TSENG_W32P_2      0x3202
@@ -1213,6 +1216,10 @@
 #define PCI_DEVICE_ID_NVIDIA_NVENET_21              0x0451
 #define PCI_DEVICE_ID_NVIDIA_NVENET_22              0x0452
 #define PCI_DEVICE_ID_NVIDIA_NVENET_23              0x0453
+#define PCI_DEVICE_ID_NVIDIA_NVENET_24              0x054C
+#define PCI_DEVICE_ID_NVIDIA_NVENET_25              0x054D
+#define PCI_DEVICE_ID_NVIDIA_NVENET_26              0x054E
+#define PCI_DEVICE_ID_NVIDIA_NVENET_27              0x054F
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE       0x0560
 
 #define PCI_VENDOR_ID_IMS               0x10e0
@@ -1270,6 +1277,7 @@
 #define PCI_DEVICE_ID_VIA_3296_0        0x0296
 #define PCI_DEVICE_ID_VIA_8363_0        0x0305
 #define PCI_DEVICE_ID_VIA_P4M800CE      0x0314
+#define PCI_DEVICE_ID_VIA_K8M890CE      0x0336
 #define PCI_DEVICE_ID_VIA_8371_0        0x0391
 #define PCI_DEVICE_ID_VIA_8501_0        0x0501
 #define PCI_DEVICE_ID_VIA_82C561        0x0561
@@ -1782,14 +1790,17 @@
 #define PCI_DEVICE_ID_MOXA_C104         0x1040
 #define PCI_DEVICE_ID_MOXA_CP104U       0x1041
 #define PCI_DEVICE_ID_MOXA_CP104JU      0x1042
+#define PCI_DEVICE_ID_MOXA_CP104EL      0x1043
 #define PCI_DEVICE_ID_MOXA_CT114        0x1140
 #define PCI_DEVICE_ID_MOXA_CP114        0x1141
 #define PCI_DEVICE_ID_MOXA_CP118U       0x1180
+#define PCI_DEVICE_ID_MOXA_CP118EL      0x1181
 #define PCI_DEVICE_ID_MOXA_CP132        0x1320
 #define PCI_DEVICE_ID_MOXA_CP132U       0x1321
 #define PCI_DEVICE_ID_MOXA_CP134U       0x1340
 #define PCI_DEVICE_ID_MOXA_C168         0x1680
 #define PCI_DEVICE_ID_MOXA_CP168U       0x1681
+#define PCI_DEVICE_ID_MOXA_CP168EL      0x1682
 
 #define PCI_VENDOR_ID_CCD               0x1397
 #define PCI_DEVICE_ID_CCD_2BD0          0x2bd0
@@ -1860,6 +1871,7 @@
 #define PCI_DEVICE_ID_OXSEMI_16PCI95N   0x9511
 #define PCI_DEVICE_ID_OXSEMI_16PCI954PP 0x9513
 #define PCI_DEVICE_ID_OXSEMI_16PCI952   0x9521
+#define PCI_DEVICE_ID_OXSEMI_16PCI952PP 0x9523
 
 #define PCI_VENDOR_ID_SAMSUNG           0x144d
 
@@ -1893,6 +1905,7 @@
 #define PCI_VENDOR_ID_BROADCOM          0x14e4
 #define PCI_DEVICE_ID_TIGON3_5752       0x1600
 #define PCI_DEVICE_ID_TIGON3_5752M      0x1601
+#define PCI_DEVICE_ID_NX2_5709          0x1639
 #define PCI_DEVICE_ID_TIGON3_5700       0x1644
 #define PCI_DEVICE_ID_TIGON3_5701       0x1645
 #define PCI_DEVICE_ID_TIGON3_5702       0x1646
@@ -1926,6 +1939,7 @@
 #define PCI_DEVICE_ID_TIGON3_5750M      0x167c
 #define PCI_DEVICE_ID_TIGON3_5751M      0x167d
 #define PCI_DEVICE_ID_TIGON3_5751F      0x167e
+#define PCI_DEVICE_ID_TIGON3_5787F      0x167f
 #define PCI_DEVICE_ID_TIGON3_5787M      0x1693
 #define PCI_DEVICE_ID_TIGON3_5782       0x1696
 #define PCI_DEVICE_ID_TIGON3_5786       0x169a
@@ -1997,6 +2011,8 @@
 #define PCI_DEVICE_ID_FARSITE_TE1       0x1610
 #define PCI_DEVICE_ID_FARSITE_TE1C      0x1612
 
+#define PCI_VENDOR_ID_ARIMA             0x161f
+
 #define PCI_VENDOR_ID_SIBYTE            0x166d
 #define PCI_DEVICE_ID_BCM1250_PCI       0x0001
 #define PCI_DEVICE_ID_BCM1250_HT        0x0002
@@ -2056,6 +2072,10 @@
 #define PCI_DEVICE_ID_JMICRON_JMB366    0x2366
 #define PCI_DEVICE_ID_JMICRON_JMB368    0x2368
 
+#define PCI_VENDOR_ID_KORENIX           0x1982
+#define PCI_DEVICE_ID_KORENIX_JETCARDF0 0x1600
+#define PCI_DEVICE_ID_KORENIX_JETCARDF1 0x16ff
+
 #define PCI_VENDOR_ID_TEKRAM            0x1de1
 #define PCI_DEVICE_ID_TEKRAM_DC290      0xdc29
 
@@ -2211,6 +2231,13 @@
 #define PCI_DEVICE_ID_INTEL_ICH8_4      0x2815
 #define PCI_DEVICE_ID_INTEL_ICH8_5      0x283e
 #define PCI_DEVICE_ID_INTEL_ICH8_6      0x2850
+#define PCI_DEVICE_ID_INTEL_ICH9_0      0x2910
+#define PCI_DEVICE_ID_INTEL_ICH9_1      0x2911
+#define PCI_DEVICE_ID_INTEL_ICH9_2      0x2912
+#define PCI_DEVICE_ID_INTEL_ICH9_3      0x2913
+#define PCI_DEVICE_ID_INTEL_ICH9_4      0x2914
+#define PCI_DEVICE_ID_INTEL_ICH9_5      0x2915
+#define PCI_DEVICE_ID_INTEL_ICH9_6      0x2930
 #define PCI_DEVICE_ID_INTEL_82855PM_HB  0x3340
 #define PCI_DEVICE_ID_INTEL_82830_HB    0x3575
 #define PCI_DEVICE_ID_INTEL_82830_CGC   0x3577
diff --git a/include/linux/pci_regs.h b/include/linux/pci_regs.h
index c321316f1bc..7a6d34ee5ab 100644
--- a/include/linux/pci_regs.h
+++ b/include/linux/pci_regs.h
@@ -292,6 +292,12 @@
 #define PCI_MSI_DATA_64         12      /* 16 bits of data for 64-bit devices */
 #define PCI_MSI_MASK_BIT        16      /* Mask bits register */
 
+/* MSI-X registers (these are at offset PCI_MSI_FLAGS) */
+#define PCI_MSIX_FLAGS_QSIZE    0x7FF
+#define PCI_MSIX_FLAGS_ENABLE   (1 << 15)
+#define PCI_MSIX_FLAGS_BIRMASK  (7 << 0)
+#define PCI_MSIX_FLAGS_BITMASK  (1 << 0)
+
 /* CompactPCI Hotswap Register */
 
 #define PCI_CHSWP_CSR           2       /* Control and Status Register */
@@ -469,15 +475,32 @@
 #define PCI_PWR_CAP             12      /* Capability */
 #define  PCI_PWR_CAP_BUDGET(x)  ((x) & 1)       /* Included in system budget */
 
-/* Hypertransport sub capability types */
+/*
+ * Hypertransport sub capability types
+ *
+ * Unfortunately there are both 3 bit and 5 bit capability types defined
+ * in the HT spec, catering for that is a little messy. You probably don't
+ * want to use these directly, just use pci_find_ht_capability() and it
+ * will do the right thing for you.
+ */
+#define HT_3BIT_CAP_MASK        0xE0
 #define HT_CAPTYPE_SLAVE        0x00    /* Slave/Primary link configuration */
 #define HT_CAPTYPE_HOST         0x20    /* Host/Secondary link configuration */
+
+#define HT_5BIT_CAP_MASK        0xF8
 #define HT_CAPTYPE_IRQ          0x80    /* IRQ Configuration */
 #define HT_CAPTYPE_REMAPPING_40 0xA0    /* 40 bit address remapping */
 #define HT_CAPTYPE_REMAPPING_64 0xA2    /* 64 bit address remapping */
 #define HT_CAPTYPE_UNITID_CLUMP 0x90    /* Unit ID clumping */
 #define HT_CAPTYPE_EXTCONF      0x98    /* Extended Configuration Space Access */
 #define HT_CAPTYPE_MSI_MAPPING  0xA8    /* MSI Mapping Capability */
+#define  HT_MSI_FLAGS           0x02            /* Offset to flags */
+#define  HT_MSI_FLAGS_ENABLE    0x1             /* Mapping enable */
+#define  HT_MSI_FLAGS_FIXED     0x2             /* Fixed mapping only */
+#define  HT_MSI_FIXED_ADDR      0x00000000FEE00000ULL   /* Fixed addr */
+#define  HT_MSI_ADDR_LO         0x04            /* Offset to low addr bits */
+#define  HT_MSI_ADDR_LO_MASK    0xFFF00000      /* Low address bit mask */
+#define  HT_MSI_ADDR_HI         0x08            /* Offset to high addr bits */
 #define HT_CAPTYPE_DIRECT_ROUTE 0xB0    /* Direct routing configuration */
 #define HT_CAPTYPE_VCSET        0xB8    /* Virtual Channel configuration */
 #define HT_CAPTYPE_ERROR_RETRY  0xC0    /* Retry on error configuration */
diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h
index d5dd471da22..265bafab649 100644
--- a/include/linux/pfkeyv2.h
+++ b/include/linux/pfkeyv2.h
@@ -32,7 +32,7 @@ struct sadb_ext {
 struct sadb_sa {
         uint16_t        sadb_sa_len;
         uint16_t        sadb_sa_exttype;
-        uint32_t        sadb_sa_spi;
+        __be32          sadb_sa_spi;
         uint8_t         sadb_sa_replay;
         uint8_t         sadb_sa_state;
         uint8_t         sadb_sa_auth;
@@ -211,7 +211,7 @@ struct sadb_x_nat_t_type {
 struct sadb_x_nat_t_port {
         uint16_t        sadb_x_nat_t_port_len;
         uint16_t        sadb_x_nat_t_port_exttype;
-        uint16_t        sadb_x_nat_t_port_port;
+        __be16          sadb_x_nat_t_port_port;
         uint16_t        sadb_x_nat_t_port_reserved;
 } __attribute__((packed));
 /* sizeof(struct sadb_x_nat_t_port) == 8 */
@@ -285,6 +285,7 @@ struct sadb_x_sec_ctx {
 #define SADB_X_AALG_SHA2_384HMAC        6
 #define SADB_X_AALG_SHA2_512HMAC        7
 #define SADB_X_AALG_RIPEMD160HMAC       8
+#define SADB_X_AALG_AES_XCBC_MAC        9
 #define SADB_X_AALG_NULL                251     /* kame */
 #define SADB_AALG_MAX                   251
 
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 9447a57ee8a..edd4c88ca7d 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -20,6 +20,10 @@
 
 #include <linux/spinlock.h>
 #include <linux/device.h>
+#include <linux/ethtool.h>
+#include <linux/mii.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
 
 #define PHY_BASIC_FEATURES      (SUPPORTED_10baseT_Half | \
                                  SUPPORTED_10baseT_Full | \
@@ -43,15 +47,26 @@
 #define PHY_HAS_INTERRUPT       0x00000001
 #define PHY_HAS_MAGICANEG       0x00000002
 
+/* Interface Mode definitions */
+typedef enum {
+        PHY_INTERFACE_MODE_MII,
+        PHY_INTERFACE_MODE_GMII,
+        PHY_INTERFACE_MODE_SGMII,
+        PHY_INTERFACE_MODE_TBI,
+        PHY_INTERFACE_MODE_RMII,
+        PHY_INTERFACE_MODE_RGMII,
+        PHY_INTERFACE_MODE_RTBI
+} phy_interface_t;
+
 #define MII_BUS_MAX 4
 
 
-#define PHY_INIT_TIMEOUT 100000
+#define PHY_INIT_TIMEOUT        100000
 #define PHY_STATE_TIME          1
 #define PHY_FORCE_TIMEOUT       10
 #define PHY_AN_TIMEOUT          10
 
-#define PHY_MAX_ADDR 32
+#define PHY_MAX_ADDR    32
 
 /* Used when trying to connect to a specific phy (mii bus id:phy device id) */
 #define PHY_ID_FMT "%x:%02x"
@@ -83,8 +98,8 @@ struct mii_bus {
         int *irq;
 };
 
-#define PHY_INTERRUPT_DISABLED 0x0
-#define PHY_INTERRUPT_ENABLED 0x80000000
+#define PHY_INTERRUPT_DISABLED  0x0
+#define PHY_INTERRUPT_ENABLED   0x80000000
 
 /* PHY state machine states:
  *
@@ -226,6 +241,8 @@ struct phy_device {
 
         u32 dev_flags;
 
+        phy_interface_t interface;
+
         /* Bus address of the PHY (0-32) */
         int addr;
 
@@ -341,9 +358,10 @@ struct phy_device* get_phy_device(struct mii_bus *bus, int addr);
 int phy_clear_interrupt(struct phy_device *phydev);
 int phy_config_interrupt(struct phy_device *phydev, u32 interrupts);
 struct phy_device * phy_attach(struct net_device *dev,
-                const char *phy_id, u32 flags);
+                const char *phy_id, u32 flags, phy_interface_t interface);
 struct phy_device * phy_connect(struct net_device *dev, const char *phy_id,
-                void (*handler)(struct net_device *), u32 flags);
+                void (*handler)(struct net_device *), u32 flags,
+                phy_interface_t interface);
 void phy_disconnect(struct phy_device *phydev);
 void phy_detach(struct phy_device *phydev);
 void phy_start(struct phy_device *phydev);
diff --git a/include/linux/pid.h b/include/linux/pid.h
index 2c0007d1721..4dec047b183 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -35,8 +35,9 @@ enum pid_type
  *
  * Holding a reference to struct pid solves both of these problems.
  * It is small so holding a reference does not consume a lot of
- * resources, and since a new struct pid is allocated when the numeric
- * pid value is reused we don't mistakenly refer to new processes.
+ * resources, and since a new struct pid is allocated when the numeric pid
+ * value is reused (when pids wrap around) we don't mistakenly refer to new
+ * processes.
  */
 
 struct pid
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
new file mode 100644
index 00000000000..d2a9d419f01
--- /dev/null
+++ b/include/linux/pid_namespace.h
@@ -0,0 +1,45 @@
+#ifndef _LINUX_PID_NS_H
+#define _LINUX_PID_NS_H
+
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <linux/threads.h>
+#include <linux/pid.h>
+#include <linux/nsproxy.h>
+#include <linux/kref.h>
+
+struct pidmap {
+       atomic_t nr_free;
+       void *page;
+};
+
+#define PIDMAP_ENTRIES         ((PID_MAX_LIMIT + 8*PAGE_SIZE - 1)/PAGE_SIZE/8)
+
+struct pid_namespace {
+        struct kref kref;
+        struct pidmap pidmap[PIDMAP_ENTRIES];
+        int last_pid;
+        struct task_struct *child_reaper;
+};
+
+extern struct pid_namespace init_pid_ns;
+
+static inline void get_pid_ns(struct pid_namespace *ns)
+{
+        kref_get(&ns->kref);
+}
+
+extern int copy_pid_ns(int flags, struct task_struct *tsk);
+extern void free_pid_ns(struct kref *kref);
+
+static inline void put_pid_ns(struct pid_namespace *ns)
+{
+        kref_put(&ns->kref, free_pid_ns);
+}
+
+static inline struct task_struct *child_reaper(struct task_struct *tsk)
+{
+        return tsk->nsproxy->pid_ns->child_reaper;
+}
+
+#endif /* _LINUX_PID_NS_H */
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index ea4f7cd7bfd..2e19478e9e8 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -12,7 +12,7 @@
 struct pipe_buffer {
         struct page *page;
         unsigned int offset, len;
-        struct pipe_buf_operations *ops;
+        const struct pipe_buf_operations *ops;
         unsigned int flags;
 };
 
@@ -41,9 +41,7 @@ struct pipe_buf_operations {
 struct pipe_inode_info {
         wait_queue_head_t wait;
         unsigned int nrbufs, curbuf;
-        struct pipe_buffer bufs[PIPE_BUFFERS];
         struct page *tmp_page;
-        unsigned int start;
         unsigned int readers;
         unsigned int writers;
         unsigned int waiting_writers;
@@ -52,6 +50,7 @@ struct pipe_inode_info {
         struct fasync_struct *fasync_readers;
         struct fasync_struct *fasync_writers;
         struct inode *inode;
+        struct pipe_buffer bufs[PIPE_BUFFERS];
 };
 
 /* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual
diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h
index 8a94c717c26..5ea4f05683f 100644
--- a/include/linux/pktcdvd.h
+++ b/include/linux/pktcdvd.h
@@ -111,6 +111,13 @@ struct pkt_ctrl_command {
 #include <linux/blkdev.h>
 #include <linux/completion.h>
 #include <linux/cdrom.h>
+#include <linux/kobject.h>
+#include <linux/sysfs.h>
+
+/* default bio write queue congestion marks */
+#define PKT_WRITE_CONGESTION_ON    10000
+#define PKT_WRITE_CONGESTION_OFF   9000
+
 
 struct packet_settings
 {
@@ -241,6 +248,14 @@ struct packet_stacked_data
 };
 #define PSD_POOL_SIZE           64
 
+struct pktcdvd_kobj
+{
+        struct kobject          kobj;
+        struct pktcdvd_device   *pd;
+};
+#define to_pktcdvdkobj(_k) \
+  ((struct pktcdvd_kobj*)container_of(_k,struct pktcdvd_kobj,kobj))
+
 struct pktcdvd_device
 {
         struct block_device     *bdev;          /* dev attached */
@@ -271,6 +286,16 @@ struct pktcdvd_device
 
         struct packet_iosched   iosched;
         struct gendisk          *disk;
+
+        int                     write_congestion_off;
+        int                     write_congestion_on;
+
+        struct class_device     *clsdev;        /* sysfs pktcdvd[0-7] class dev */
+        struct pktcdvd_kobj     *kobj_stat;     /* sysfs pktcdvd[0-7]/stat/     */
+        struct pktcdvd_kobj     *kobj_wqueue;   /* sysfs pktcdvd[0-7]/write_queue/ */
+
+        struct dentry           *dfs_d_root;    /* debugfs: devname directory */
+        struct dentry           *dfs_f_info;    /* debugfs: info file */
 };
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 29cd6dee13d..8bbd459eafd 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -39,7 +39,7 @@ extern struct platform_device *platform_device_register_simple(char *, unsigned
 
 extern struct platform_device *platform_device_alloc(const char *name, unsigned int id);
 extern int platform_device_add_resources(struct platform_device *pdev, struct resource *res, unsigned int num);
-extern int platform_device_add_data(struct platform_device *pdev, void *data, size_t size);
+extern int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size);
 extern int platform_device_add(struct platform_device *pdev);
 extern void platform_device_del(struct platform_device *pdev);
 extern void platform_device_put(struct platform_device *pdev);
@@ -58,6 +58,12 @@ struct platform_driver {
 extern int platform_driver_register(struct platform_driver *);
 extern void platform_driver_unregister(struct platform_driver *);
 
+/* non-hotpluggable platform devices may use this so that probe() and
+ * its support may live in __init sections, conserving runtime memory.
+ */
+extern int platform_driver_probe(struct platform_driver *driver,
+                int (*probe)(struct platform_device *));
+
 #define platform_get_drvdata(_dev)      dev_get_drvdata(&(_dev)->dev)
 #define platform_set_drvdata(_dev,data) dev_set_drvdata(&(_dev)->dev, (data))
 
diff --git a/include/linux/poll.h b/include/linux/poll.h
index 51e1b56741f..27690798623 100644
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -8,7 +8,8 @@
 #include <linux/compiler.h>
 #include <linux/wait.h>
 #include <linux/string.h>
-#include <linux/mm.h>
+#include <linux/fs.h>
+#include <linux/sched.h>
 #include <asm/uaccess.h>
 
 /* ~832 bytes of stack space used max in sys_select/sys_poll before allocating
diff --git a/include/linux/profile.h b/include/linux/profile.h
index acce53fd38b..eec48f5f934 100644
--- a/include/linux/profile.h
+++ b/include/linux/profile.h
@@ -6,10 +6,16 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/cpumask.h>
+#include <linux/cache.h>
+
 #include <asm/errno.h>
 
+extern int prof_on __read_mostly;
+
 #define CPU_PROFILING   1
 #define SCHED_PROFILING 2
+#define SLEEP_PROFILING 3
+#define KVM_PROFILING   4
 
 struct proc_dir_entry;
 struct pt_regs;
@@ -18,7 +24,24 @@ struct notifier_block;
 /* init basic kernel profiler */
 void __init profile_init(void);
 void profile_tick(int);
-void profile_hit(int, void *);
+
+/*
+ * Add multiple profiler hits to a given address:
+ */
+void profile_hits(int, void *ip, unsigned int nr_hits);
+
+/*
+ * Single profiler hit:
+ */
+static inline void profile_hit(int type, void *ip)
+{
+        /*
+         * Speedup for the common (no profiling enabled) case:
+         */
+        if (unlikely(prof_on == type))
+                profile_hits(type, ip, 1);
+}
+
 #ifdef CONFIG_PROC_FS
 void create_prof_cpu_mask(struct proc_dir_entry *);
 #else
diff --git a/include/linux/pspace.h b/include/linux/pspace.h
deleted file mode 100644
index 91d48b8b2d9..00000000000
--- a/include/linux/pspace.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _LINUX_PSPACE_H
-#define _LINUX_PSPACE_H
-
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/threads.h>
-#include <linux/pid.h>
-
-struct pidmap {
-       atomic_t nr_free;
-       void *page;
-};
-
-#define PIDMAP_ENTRIES         ((PID_MAX_LIMIT + 8*PAGE_SIZE - 1)/PAGE_SIZE/8)
-
-struct pspace {
-       struct pidmap pidmap[PIDMAP_ENTRIES];
-       int last_pid;
-};
-
-extern struct pspace init_pspace;
-
-#endif /* _LINUX_PSPACE_H */
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 5110201a415..90c23f690c0 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -37,6 +37,9 @@ extern int dquot_release(struct dquot *dquot);
 extern int dquot_commit_info(struct super_block *sb, int type);
 extern int dquot_mark_dquot_dirty(struct dquot *dquot);
 
+int remove_inode_dquot_ref(struct inode *inode, int type,
+                           struct list_head *tofree_head);
+
 extern int vfs_quota_on(struct super_block *sb, int type, int format_id, char *path);
 extern int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
                 int format_id, int type);
diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
index 9158a68140c..0deb842541a 100644
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2001 Momchil Velikov
  * Portions Copyright (C) 2001 Christoph Hellwig
+ * Copyright (C) 2006 Nick Piggin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -19,9 +20,37 @@
 #ifndef _LINUX_RADIX_TREE_H
 #define _LINUX_RADIX_TREE_H
 
-#include <linux/sched.h>
 #include <linux/preempt.h>
 #include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/rcupdate.h>
+
+/*
+ * A direct pointer (root->rnode pointing directly to a data item,
+ * rather than another radix_tree_node) is signalled by the low bit
+ * set in the root->rnode pointer.
+ *
+ * In this case root->height is also NULL, but the direct pointer tests are
+ * needed for RCU lookups when root->height is unreliable.
+ */
+#define RADIX_TREE_DIRECT_PTR   1
+
+static inline void *radix_tree_ptr_to_direct(void *ptr)
+{
+        return (void *)((unsigned long)ptr | RADIX_TREE_DIRECT_PTR);
+}
+
+static inline void *radix_tree_direct_to_ptr(void *ptr)
+{
+        return (void *)((unsigned long)ptr & ~RADIX_TREE_DIRECT_PTR);
+}
+
+static inline int radix_tree_is_direct_ptr(void *ptr)
+{
+        return (int)((unsigned long)ptr & RADIX_TREE_DIRECT_PTR);
+}
+
+/*** radix-tree API starts here ***/
 
 #define RADIX_TREE_MAX_TAGS 2
 
@@ -48,6 +77,77 @@ do {									\
         (root)->rnode = NULL;                                           \
 } while (0)
 
+/**
+ * Radix-tree synchronization
+ *
+ * The radix-tree API requires that users provide all synchronisation (with
+ * specific exceptions, noted below).
+ *
+ * Synchronization of access to the data items being stored in the tree, and
+ * management of their lifetimes must be completely managed by API users.
+ *
+ * For API usage, in general,
+ * - any function _modifying_ the the tree or tags (inserting or deleting
+ *   items, setting or clearing tags must exclude other modifications, and
+ *   exclude any functions reading the tree.
+ * - any function _reading_ the the tree or tags (looking up items or tags,
+ *   gang lookups) must exclude modifications to the tree, but may occur
+ *   concurrently with other readers.
+ *
+ * The notable exceptions to this rule are the following functions:
+ * radix_tree_lookup
+ * radix_tree_tag_get
+ * radix_tree_gang_lookup
+ * radix_tree_gang_lookup_tag
+ * radix_tree_tagged
+ *
+ * The first 4 functions are able to be called locklessly, using RCU. The
+ * caller must ensure calls to these functions are made within rcu_read_lock()
+ * regions. Other readers (lock-free or otherwise) and modifications may be
+ * running concurrently.
+ *
+ * It is still required that the caller manage the synchronization and lifetimes
+ * of the items. So if RCU lock-free lookups are used, typically this would mean
+ * that the items have their own locks, or are amenable to lock-free access; and
+ * that the items are freed by RCU (or only freed after having been deleted from
+ * the radix tree *and* a synchronize_rcu() grace period).
+ *
+ * (Note, rcu_assign_pointer and rcu_dereference are not needed to control
+ * access to data items when inserting into or looking up from the radix tree)
+ *
+ * radix_tree_tagged is able to be called without locking or RCU.
+ */
+
+/**
+ * radix_tree_deref_slot        - dereference a slot
+ * @pslot:      pointer to slot, returned by radix_tree_lookup_slot
+ * Returns:     item that was stored in that slot with any direct pointer flag
+ *              removed.
+ *
+ * For use with radix_tree_lookup_slot().  Caller must hold tree at least read
+ * locked across slot lookup and dereference.  More likely, will be used with
+ * radix_tree_replace_slot(), as well, so caller will hold tree write locked.
+ */
+static inline void *radix_tree_deref_slot(void **pslot)
+{
+        return radix_tree_direct_to_ptr(*pslot);
+}
+/**
+ * radix_tree_replace_slot      - replace item in a slot
+ * @pslot:      pointer to slot, returned by radix_tree_lookup_slot
+ * @item:       new item to store in the slot.
+ *
+ * For use with radix_tree_lookup_slot().  Caller must hold tree write locked
+ * across slot lookup and replacement.
+ */
+static inline void radix_tree_replace_slot(void **pslot, void *item)
+{
+        BUG_ON(radix_tree_is_direct_ptr(item));
+        rcu_assign_pointer(*pslot,
+                (void *)((unsigned long)item |
+                        ((unsigned long)*pslot & RADIX_TREE_DIRECT_PTR)));
+}
+
 int radix_tree_insert(struct radix_tree_root *, unsigned long, void *);
 void *radix_tree_lookup(struct radix_tree_root *, unsigned long);
 void **radix_tree_lookup_slot(struct radix_tree_root *, unsigned long);
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h
index f13299a1559..d8286db60b9 100644
--- a/include/linux/raid/raid5.h
+++ b/include/linux/raid/raid5.h
@@ -227,7 +227,10 @@ struct raid5_private_data {
         struct list_head        handle_list; /* stripes needing handling */
         struct list_head        delayed_list; /* stripes that have plugged requests */
         struct list_head        bitmap_list; /* stripes delaying awaiting bitmap update */
+        struct bio              *retry_read_aligned; /* currently retrying aligned bios   */
+        struct bio              *retry_read_aligned_list; /* aligned bios retry list  */
         atomic_t                preread_active_stripes; /* stripes with scheduled io */
+        atomic_t                active_aligned_reads;
 
         atomic_t                reshape_stripes; /* stripes with pending writes for reshape */
         /* unfortunately we need two cache names as we temporarily have
@@ -235,7 +238,7 @@ struct raid5_private_data {
          */
         int                     active_name;
         char                    cache_name[2][20];
-        kmem_cache_t            *slab_cache; /* for allocating stripes */
+        struct kmem_cache               *slab_cache; /* for allocating stripes */
 
         int                     seq_flush, seq_write;
         int                     quiesce;
diff --git a/include/linux/random.h b/include/linux/random.h
index 0248b30e306..01ad71033d6 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -51,16 +51,16 @@ extern void add_interrupt_randomness(int irq);
 extern void get_random_bytes(void *buf, int nbytes);
 void generate_random_uuid(unsigned char uuid_out[16]);
 
-extern __u32 secure_ip_id(__u32 daddr);
-extern u32 secure_ipv4_port_ephemeral(__u32 saddr, __u32 daddr, __u16 dport);
-extern u32 secure_ipv6_port_ephemeral(const __u32 *saddr, const __u32 *daddr, 
-                                      __u16 dport);
-extern __u32 secure_tcp_sequence_number(__u32 saddr, __u32 daddr,
-                                        __u16 sport, __u16 dport);
-extern __u32 secure_tcpv6_sequence_number(__u32 *saddr, __u32 *daddr,
-                                          __u16 sport, __u16 dport);
-extern u64 secure_dccp_sequence_number(__u32 saddr, __u32 daddr,
-                                       __u16 sport, __u16 dport);
+extern __u32 secure_ip_id(__be32 daddr);
+extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
+extern u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
+                                      __be16 dport);
+extern __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
+                                        __be16 sport, __be16 dport);
+extern __u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
+                                          __be16 sport, __be16 dport);
+extern u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
+                                       __be16 sport, __be16 dport);
 
 #ifndef MODULE
 extern struct file_operations random_fops, urandom_fops;
diff --git a/include/linux/reciprocal_div.h b/include/linux/reciprocal_div.h
new file mode 100644
index 00000000000..f9c90b33285
--- /dev/null
+++ b/include/linux/reciprocal_div.h
@@ -0,0 +1,32 @@
+#ifndef _LINUX_RECIPROCAL_DIV_H
+#define _LINUX_RECIPROCAL_DIV_H
+
+#include <linux/types.h>
+
+/*
+ * This file describes reciprocical division.
+ *
+ * This optimizes the (A/B) problem, when A and B are two u32
+ * and B is a known value (but not known at compile time)
+ *
+ * The math principle used is :
+ *   Let RECIPROCAL_VALUE(B) be (((1LL << 32) + (B - 1))/ B)
+ *   Then A / B = (u32)(((u64)(A) * (R)) >> 32)
+ *
+ * This replaces a divide by a multiply (and a shift), and
+ * is generally less expensive in CPU cycles.
+ */
+
+/*
+ * Computes the reciprocal value (R) for the value B of the divisor.
+ * Should not be called before each reciprocal_divide(),
+ * or else the performance is slower than a normal divide.
+ */
+extern u32 reciprocal_value(u32 B);
+
+
+static inline u32 reciprocal_divide(u32 A, u32 R)
+{
+        return (u32)(((u64)A * R) >> 32);
+}
+#endif
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 7bc6bfb8625..c3fc6caaad3 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -739,7 +739,7 @@ struct block_head {
 #define PUT_B_FREE_SPACE(p_s_bh,val)  do { set_blkh_free_space(B_BLK_HEAD(p_s_bh),val); } while (0)
 
 /* Get right delimiting key. -- little endian */
-#define B_PRIGHT_DELIM_KEY(p_s_bh)   (&(blk_right_delim_key(B_BLK_HEAD(p_s_bh))
+#define B_PRIGHT_DELIM_KEY(p_s_bh)   (&(blk_right_delim_key(B_BLK_HEAD(p_s_bh))))
 
 /* Does the buffer contain a disk leaf. */
 #define B_IS_ITEMS_LEVEL(p_s_bh)     (B_LEVEL(p_s_bh) == DISK_LEAF_NODE_LEVEL)
@@ -1159,7 +1159,7 @@ znodes are the way! */
 #define PATH_READA      0x1     /* do read ahead */
 #define PATH_READA_BACK 0x2     /* read backwards */
 
-struct path {
+struct treepath {
         int path_length;        /* Length of the array above.   */
         int reada;
         struct path_element path_elements[EXTENDED_MAX_HEIGHT]; /* Array of the path elements.  */
@@ -1169,7 +1169,7 @@ struct path {
 #define pos_in_item(path) ((path)->pos_in_item)
 
 #define INITIALIZE_PATH(var) \
-struct path var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}
+struct treepath var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}
 
 /* Get path element by path and path position. */
 #define PATH_OFFSET_PELEMENT(p_s_path,n_offset)  ((p_s_path)->path_elements +(n_offset))
@@ -1327,7 +1327,7 @@ struct tree_balance {
         int need_balance_dirty;
         struct super_block *tb_sb;
         struct reiserfs_transaction_handle *transaction_handle;
-        struct path *tb_path;
+        struct treepath *tb_path;
         struct buffer_head *L[MAX_HEIGHT];      /* array of left neighbors of nodes in the path */
         struct buffer_head *R[MAX_HEIGHT];      /* array of right neighbors of nodes in the path */
         struct buffer_head *FL[MAX_HEIGHT];     /* array of fathers of the left  neighbors      */
@@ -1793,41 +1793,41 @@ static inline void copy_key(struct reiserfs_key *to,
         memcpy(to, from, KEY_SIZE);
 }
 
-int comp_items(const struct item_head *stored_ih, const struct path *p_s_path);
-const struct reiserfs_key *get_rkey(const struct path *p_s_chk_path,
+int comp_items(const struct item_head *stored_ih, const struct treepath *p_s_path);
+const struct reiserfs_key *get_rkey(const struct treepath *p_s_chk_path,
                                     const struct super_block *p_s_sb);
 int search_by_key(struct super_block *, const struct cpu_key *,
-                  struct path *, int);
+                  struct treepath *, int);
 #define search_item(s,key,path) search_by_key (s, key, path, DISK_LEAF_NODE_LEVEL)
 int search_for_position_by_key(struct super_block *p_s_sb,
                                const struct cpu_key *p_s_cpu_key,
-                               struct path *p_s_search_path);
+                               struct treepath *p_s_search_path);
 extern void decrement_bcount(struct buffer_head *p_s_bh);
-void decrement_counters_in_path(struct path *p_s_search_path);
-void pathrelse(struct path *p_s_search_path);
-int reiserfs_check_path(struct path *p);
-void pathrelse_and_restore(struct super_block *s, struct path *p_s_search_path);
+void decrement_counters_in_path(struct treepath *p_s_search_path);
+void pathrelse(struct treepath *p_s_search_path);
+int reiserfs_check_path(struct treepath *p);
+void pathrelse_and_restore(struct super_block *s, struct treepath *p_s_search_path);
 
 int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
-                         struct path *path,
+                         struct treepath *path,
                          const struct cpu_key *key,
                          struct item_head *ih,
                          struct inode *inode, const char *body);
 
 int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th,
-                             struct path *path,
+                             struct treepath *path,
                              const struct cpu_key *key,
                              struct inode *inode,
                              const char *body, int paste_size);
 
 int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th,
-                           struct path *path,
+                           struct treepath *path,
                            struct cpu_key *key,
                            struct inode *inode,
                            struct page *page, loff_t new_file_size);
 
 int reiserfs_delete_item(struct reiserfs_transaction_handle *th,
-                         struct path *path,
+                         struct treepath *path,
                          const struct cpu_key *key,
                          struct inode *inode, struct buffer_head *p_s_un_bh);
 
@@ -1858,7 +1858,7 @@ void padd_item(char *item, int total_length, int length);
 #define GET_BLOCK_NO_DANGLE   16        /* don't leave any transactions running */
 
 int restart_transaction(struct reiserfs_transaction_handle *th,
-                        struct inode *inode, struct path *path);
+                        struct inode *inode, struct treepath *path);
 void reiserfs_read_locked_inode(struct inode *inode,
                                 struct reiserfs_iget_args *args);
 int reiserfs_find_actor(struct inode *inode, void *p);
@@ -1905,7 +1905,7 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
 /* namei.c */
 void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
 int search_by_entry_key(struct super_block *sb, const struct cpu_key *key,
-                        struct path *path, struct reiserfs_dir_entry *de);
+                        struct treepath *path, struct reiserfs_dir_entry *de);
 struct dentry *reiserfs_get_parent(struct dentry *);
 /* procfs.c */
 
@@ -1956,9 +1956,9 @@ extern const struct file_operations reiserfs_dir_operations;
 
 /* tail_conversion.c */
 int direct2indirect(struct reiserfs_transaction_handle *, struct inode *,
-                    struct path *, struct buffer_head *, loff_t);
+                    struct treepath *, struct buffer_head *, loff_t);
 int indirect2direct(struct reiserfs_transaction_handle *, struct inode *,
-                    struct page *, struct path *, const struct cpu_key *,
+                    struct page *, struct treepath *, const struct cpu_key *,
                     loff_t, char *);
 void reiserfs_unmap_buffer(struct buffer_head *);
 
@@ -2045,7 +2045,7 @@ struct __reiserfs_blocknr_hint {
         struct inode *inode;    /* inode passed to allocator, if we allocate unf. nodes */
         long block;             /* file offset, in blocks */
         struct in_core_key key;
-        struct path *path;      /* search path, used by allocator to deternine search_start by
+        struct treepath *path;  /* search path, used by allocator to deternine search_start by
                                  * various ways */
         struct reiserfs_transaction_handle *th; /* transaction handle is needed to log super blocks and
                                                  * bitmap blocks changes  */
@@ -2101,7 +2101,7 @@ static inline int reiserfs_new_form_blocknrs(struct tree_balance *tb,
 static inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle
                                             *th, struct inode *inode,
                                             b_blocknr_t * new_blocknrs,
-                                            struct path *path, long block)
+                                            struct treepath *path, long block)
 {
         reiserfs_blocknr_hint_t hint = {
                 .th = th,
@@ -2118,7 +2118,7 @@ static inline int reiserfs_new_unf_blocknrs(struct reiserfs_transaction_handle
 static inline int reiserfs_new_unf_blocknrs2(struct reiserfs_transaction_handle
                                              *th, struct inode *inode,
                                              b_blocknr_t * new_blocknrs,
-                                             struct path *path, long block)
+                                             struct treepath *path, long block)
 {
         reiserfs_blocknr_hint_t hint = {
                 .th = th,
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
index 73e0becec08..3a28742d86f 100644
--- a/include/linux/reiserfs_fs_sb.h
+++ b/include/linux/reiserfs_fs_sb.h
@@ -249,7 +249,8 @@ struct reiserfs_journal {
         int j_errno;
 
         /* when flushing ordered buffers, throttle new ordered writers */
-        struct work_struct j_work;
+        struct delayed_work j_work;
+        struct super_block *j_work_sb;
         atomic_t j_async_throttle;
 };
 
@@ -429,7 +430,7 @@ enum reiserfs_mount_options {
 /* -o hash={tea, rupasov, r5, detect} is meant for properly mounting 
 ** reiserfs disks from 3.5.19 or earlier.  99% of the time, this option
 ** is not required.  If the normal autodection code can't determine which
-** hash to use (because both hases had the same value for a file)
+** hash to use (because both hashes had the same value for a file)
 ** use this option to force a specific hash.  It won't allow you to override
 ** the existing hash on the FS, so if you have a tea hash disk, and mount
 ** with -o hash=rupasov, the mount will fail.
diff --git a/include/linux/relay.h b/include/linux/relay.h
index 24accb48384..c6a48bfc8b1 100644
--- a/include/linux/relay.h
+++ b/include/linux/relay.h
@@ -38,7 +38,7 @@ struct rchan_buf
         size_t subbufs_consumed;        /* count of sub-buffers consumed */
         struct rchan *chan;             /* associated channel */
         wait_queue_head_t read_wait;    /* reader wait queue */
-        struct work_struct wake_readers; /* reader wake-up work struct */
+        struct delayed_work wake_readers; /* reader wake-up work struct */
         struct dentry *dentry;          /* channel file dentry */
         struct kref kref;               /* channel buffer refcount */
         struct page **page_array;       /* array of current buffer pages */
@@ -274,7 +274,7 @@ static inline void subbuf_start_reserve(struct rchan_buf *buf,
 /*
  * exported relay file operations, kernel/relay.c
  */
-extern struct file_operations relay_file_operations;
+extern const struct file_operations relay_file_operations;
 
 #endif /* _LINUX_RELAY_H */
 
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index db2c1df4fef..bdd277223af 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -30,11 +30,11 @@ struct anon_vma {
 
 #ifdef CONFIG_MMU
 
-extern kmem_cache_t *anon_vma_cachep;
+extern struct kmem_cache *anon_vma_cachep;
 
 static inline struct anon_vma *anon_vma_alloc(void)
 {
-        return kmem_cache_alloc(anon_vma_cachep, SLAB_KERNEL);
+        return kmem_cache_alloc(anon_vma_cachep, GFP_KERNEL);
 }
 
 static inline void anon_vma_free(struct anon_vma *anon_vma)
@@ -72,7 +72,7 @@ void __anon_vma_link(struct vm_area_struct *);
 void page_add_anon_rmap(struct page *, struct vm_area_struct *, unsigned long);
 void page_add_new_anon_rmap(struct page *, struct vm_area_struct *, unsigned long);
 void page_add_file_rmap(struct page *);
-void page_remove_rmap(struct page *);
+void page_remove_rmap(struct page *, struct vm_area_struct *);
 
 /**
  * page_dup_rmap - duplicate pte mapping to a page
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 09ff4c3e271..5e22d4510d1 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -106,6 +106,7 @@ extern int rtc_year_days(unsigned int day, unsigned int month, unsigned int year
 extern int rtc_valid_tm(struct rtc_time *tm);
 extern int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time);
 extern void rtc_time_to_tm(unsigned long time, struct rtc_time *tm);
+extern void rtc_merge_alarm(struct rtc_time *now, struct rtc_time *alarm);
 
 #include <linux/device.h>
 #include <linux/seq_file.h>
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
index 5d41dee82f8..b0090e9f788 100644
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
@@ -63,7 +63,7 @@ struct hrtimer_sleeper;
 #endif
 
 #define __RT_MUTEX_INITIALIZER(mutexname) \
-        { .wait_lock = SPIN_LOCK_UNLOCKED \
+        { .wait_lock = __SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
         , .wait_list = PLIST_HEAD_INIT(mutexname.wait_list, mutexname.wait_lock) \
         , .owner = NULL \
         __DEBUG_RT_MUTEX_INITIALIZER(mutexname)}
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 3a18addaed4..4a629ea70cc 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -3,6 +3,8 @@
 
 #include <linux/netlink.h>
 #include <linux/if_link.h>
+#include <linux/if_addr.h>
+#include <linux/neighbour.h>
 
 /****
  *              Routing/neighbour discovery messages.
@@ -81,8 +83,6 @@ enum {
 
         RTM_NEWPREFIX   = 52,
 #define RTM_NEWPREFIX   RTM_NEWPREFIX
-        RTM_GETPREFIX   = 54,
-#define RTM_GETPREFIX   RTM_GETPREFIX
 
         RTM_GETMULTICAST = 58,
 #define RTM_GETMULTICAST RTM_GETMULTICAST
@@ -587,6 +587,9 @@ extern int rtnl_notify(struct sk_buff *skb, u32 pid, u32 group,
                        struct nlmsghdr *nlh, gfp_t flags);
 extern void rtnl_set_sk_err(u32 group, int error);
 extern int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics);
+extern int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst,
+                              u32 id, u32 ts, u32 tsage, long expires,
+                              u32 error);
 
 extern void __rta_fill(struct sk_buff *skb, int attrtype, int attrlen, const void *data);
 
diff --git a/include/linux/rwsem-spinlock.h b/include/linux/rwsem-spinlock.h
index ae1fcadd598..813cee13da0 100644
--- a/include/linux/rwsem-spinlock.h
+++ b/include/linux/rwsem-spinlock.h
@@ -44,7 +44,8 @@ struct rw_semaphore {
 #endif
 
 #define __RWSEM_INITIALIZER(name) \
-{ 0, SPIN_LOCK_UNLOCKED, LIST_HEAD_INIT((name).wait_list) __RWSEM_DEP_MAP_INIT(name) }
+{ 0, __SPIN_LOCK_UNLOCKED(name.wait_lock), LIST_HEAD_INIT((name).wait_list) \
+  __RWSEM_DEP_MAP_INIT(name) }
 
 #define DECLARE_RWSEM(name) \
         struct rw_semaphore name = __RWSEM_INITIALIZER(name)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index eafe4a7b823..44637353519 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -82,6 +82,7 @@ struct sched_param {
 #include <linux/resource.h>
 #include <linux/timer.h>
 #include <linux/hrtimer.h>
+#include <linux/task_io_accounting.h>
 
 #include <asm/processor.h>
 
@@ -194,7 +195,16 @@ extern void init_idle(struct task_struct *idle, int cpu);
 
 extern cpumask_t nohz_cpu_mask;
 
-extern void show_state(void);
+/*
+ * Only dump TASK_* tasks. (-1 for all tasks)
+ */
+extern void show_state_filter(unsigned long state_filter);
+
+static inline void show_state(void)
+{
+        show_state_filter(-1);
+}
+
 extern void show_regs(struct pt_regs *);
 
 /*
@@ -338,15 +348,23 @@ struct mm_struct {
 
         unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */
 
-        unsigned dumpable:2;
         cpumask_t cpu_vm_mask;
 
         /* Architecture-specific MM context */
         mm_context_t context;
 
-        /* Token based thrashing protection. */
-        unsigned long swap_token_time;
-        char recent_pagein;
+        /* Swap token stuff */
+        /*
+         * Last value of global fault stamp as seen by this process.
+         * In other words, this value gives an indication of how long
+         * it has been since this task got the token.
+         * Look at mm/thrash.c
+         */
+        unsigned int faultstamp;
+        unsigned int token_priority;
+        unsigned int last_interval;
+
+        unsigned char dumpable:2;
 
         /* coredumping support */
         int core_waiters;
@@ -419,7 +437,12 @@ struct signal_struct {
         /* job control IDs */
         pid_t pgrp;
         pid_t tty_old_pgrp;
-        pid_t session;
+
+        union {
+                pid_t session __deprecated;
+                pid_t __session;
+        };
+
         /* boolean value for session group leader */
         int leader;
 
@@ -556,7 +579,7 @@ struct sched_info {
 #endif /* defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) */
 
 #ifdef CONFIG_SCHEDSTATS
-extern struct file_operations proc_schedstat_operations;
+extern const struct file_operations proc_schedstat_operations;
 #endif /* CONFIG_SCHEDSTATS */
 
 #ifdef CONFIG_TASK_DELAY_ACCT
@@ -625,6 +648,7 @@ enum idle_type
 #define SD_SHARE_CPUPOWER       128     /* Domain members share cpu power */
 #define SD_POWERSAVINGS_BALANCE 256     /* Balance for power savings */
 #define SD_SHARE_PKG_RESOURCES  512     /* Domain members share cpu pkg resources */
+#define SD_SERIALIZE            1024    /* Only a single load balancing instance */
 
 #define BALANCE_FOR_MC_POWER    \
         (sched_smt_power_savings ? SD_POWERSAVINGS_BALANCE : 0)
@@ -991,6 +1015,7 @@ struct task_struct {
         wait_queue_t *io_wait;
 /* i/o counters(bytes read/written, #syscalls */
         u64 rchar, wchar, syscr, syscw;
+        struct task_io_accounting ioac;
 #if defined(CONFIG_TASK_XACCT)
         u64 acct_rss_mem1;      /* accumulated rss usage */
         u64 acct_vm_mem1;       /* accumulated virtual memory usage */
@@ -1023,6 +1048,9 @@ struct task_struct {
 #ifdef  CONFIG_TASK_DELAY_ACCT
         struct task_delay_info *delays;
 #endif
+#ifdef CONFIG_FAULT_INJECTION
+        int make_it_fail;
+#endif
 };
 
 static inline pid_t process_group(struct task_struct *tsk)
@@ -1030,6 +1058,21 @@ static inline pid_t process_group(struct task_struct *tsk)
         return tsk->signal->pgrp;
 }
 
+static inline pid_t signal_session(struct signal_struct *sig)
+{
+        return sig->__session;
+}
+
+static inline pid_t process_session(struct task_struct *tsk)
+{
+        return signal_session(tsk->signal);
+}
+
+static inline void set_signal_session(struct signal_struct *sig, pid_t session)
+{
+        sig->__session = session;
+}
+
 static inline struct pid *task_pid(struct task_struct *task)
 {
         return task->pids[PIDTYPE_PID].pid;
@@ -1101,7 +1144,6 @@ static inline void put_task_struct(struct task_struct *t)
 #define PF_MEMALLOC     0x00000800      /* Allocating memory */
 #define PF_FLUSHER      0x00001000      /* responsible for disk writeback */
 #define PF_USED_MATH    0x00002000      /* if unset the fpu must be initialized before use */
-#define PF_FREEZE       0x00004000      /* this task is being frozen for suspend now */
 #define PF_NOFREEZE     0x00008000      /* this thread should not be frozen */
 #define PF_FROZEN       0x00010000      /* frozen for system suspend */
 #define PF_FSTRANS      0x00020000      /* inside a filesystem transaction */
@@ -1223,7 +1265,6 @@ extern struct   mm_struct init_mm;
 
 #define find_task_by_pid(nr)    find_task_by_pid_type(PIDTYPE_PID, nr)
 extern struct task_struct *find_task_by_pid_type(int type, int pid);
-extern void set_special_pids(pid_t session, pid_t pgrp);
 extern void __set_special_pids(pid_t session, pid_t pgrp);
 
 /* per-UID process charging. */
@@ -1288,7 +1329,6 @@ extern int kill_pgrp(struct pid *pid, int sig, int priv);
 extern int kill_pid(struct pid *pid, int sig, int priv);
 extern int __kill_pg_info(int sig, struct siginfo *info, pid_t pgrp);
 extern int kill_pg_info(int, struct siginfo *, pid_t);
-extern int kill_proc_info(int, struct siginfo *, pid_t);
 extern void do_notify_parent(struct task_struct *, int);
 extern void force_sig(int, struct task_struct *);
 extern void force_sig_specific(int, struct task_struct *);
@@ -1365,7 +1405,6 @@ extern NORET_TYPE void do_group_exit(int);
 extern void daemonize(const char *, ...);
 extern int allow_signal(int);
 extern int disallow_signal(int);
-extern struct task_struct *child_reaper;
 
 extern int do_execve(char *, char __user * __user *, char __user * __user *, struct pt_regs *);
 extern long do_fork(unsigned long, unsigned long, struct pt_regs *, unsigned long, int __user *, int __user *);
@@ -1610,87 +1649,6 @@ extern int sched_create_sysfs_power_savings_entries(struct sysdev_class *cls);
 
 extern void normalize_rt_tasks(void);
 
-#ifdef CONFIG_PM
-/*
- * Check if a process has been frozen
- */
-static inline int frozen(struct task_struct *p)
-{
-        return p->flags & PF_FROZEN;
-}
-
-/*
- * Check if there is a request to freeze a process
- */
-static inline int freezing(struct task_struct *p)
-{
-        return p->flags & PF_FREEZE;
-}
-
-/*
- * Request that a process be frozen
- * FIXME: SMP problem. We may not modify other process' flags!
- */
-static inline void freeze(struct task_struct *p)
-{
-        p->flags |= PF_FREEZE;
-}
-
-/*
- * Sometimes we may need to cancel the previous 'freeze' request
- */
-static inline void do_not_freeze(struct task_struct *p)
-{
-        p->flags &= ~PF_FREEZE;
-}
-
-/*
- * Wake up a frozen process
- */
-static inline int thaw_process(struct task_struct *p)
-{
-        if (frozen(p)) {
-                p->flags &= ~PF_FROZEN;
-                wake_up_process(p);
-                return 1;
-        }
-        return 0;
-}
-
-/*
- * freezing is complete, mark process as frozen
- */
-static inline void frozen_process(struct task_struct *p)
-{
-        p->flags = (p->flags & ~PF_FREEZE) | PF_FROZEN;
-}
-
-extern void refrigerator(void);
-extern int freeze_processes(void);
-extern void thaw_processes(void);
-
-static inline int try_to_freeze(void)
-{
-        if (freezing(current)) {
-                refrigerator();
-                return 1;
-        } else
-                return 0;
-}
-#else
-static inline int frozen(struct task_struct *p) { return 0; }
-static inline int freezing(struct task_struct *p) { return 0; }
-static inline void freeze(struct task_struct *p) { BUG(); }
-static inline int thaw_process(struct task_struct *p) { return 1; }
-static inline void frozen_process(struct task_struct *p) { BUG(); }
-
-static inline void refrigerator(void) {}
-static inline int freeze_processes(void) { BUG(); return 0; }
-static inline void thaw_processes(void) {}
-
-static inline int try_to_freeze(void) { return 0; }
-
-#endif /* CONFIG_PM */
 #endif /* __KERNEL__ */
 
 #endif
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index 2925e66a673..b02308ee766 100644
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -42,7 +42,8 @@ struct screen_info {
         u16 pages;              /* 0x32 */
         u16 vesa_attributes;    /* 0x34 */
         u32 capabilities;       /* 0x36 */
-                                /* 0x3a -- 0x3f reserved for future expansion */
+                                /* 0x3a -- 0x3b reserved for future expansion */
+                                /* 0x3c -- 0x3f micro stack for relocatable kernels */
 };
 
 extern struct screen_info screen_info;
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 6ec66dec29f..d4f86560bff 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -57,17 +57,17 @@
 
 /* Section 3.1.  SCTP Common Header Format */
 typedef struct sctphdr {
-        __u16 source;
-        __u16 dest;
-        __u32 vtag;
-        __u32 checksum;
+        __be16 source;
+        __be16 dest;
+        __be32 vtag;
+        __be32 checksum;
 } __attribute__((packed)) sctp_sctphdr_t;
 
 /* Section 3.2.  Chunk Field Descriptions. */
 typedef struct sctp_chunkhdr {
         __u8 type;
         __u8 flags;
-        __u16 length;
+        __be16 length;
 } __attribute__((packed)) sctp_chunkhdr_t;
 
 
@@ -153,8 +153,8 @@ enum { SCTP_CHUNK_FLAG_T = 0x01 };
  */
 
 typedef struct sctp_paramhdr {
-        __u16 type;
-        __u16 length;
+        __be16 type;
+        __be16 length;
 } __attribute__((packed)) sctp_paramhdr_t;
 
 typedef enum {
@@ -180,7 +180,7 @@ typedef enum {
         SCTP_PARAM_ERR_CAUSE            = __constant_htons(0xc003),
         SCTP_PARAM_SET_PRIMARY          = __constant_htons(0xc004),
         SCTP_PARAM_SUCCESS_REPORT       = __constant_htons(0xc005),
-        SCTP_PARAM_ADAPTION_LAYER_IND   = __constant_htons(0xc006),
+        SCTP_PARAM_ADAPTATION_LAYER_IND = __constant_htons(0xc006),
 
 } sctp_param_t; /* enum */
 
@@ -203,10 +203,10 @@ enum { SCTP_PARAM_ACTION_MASK = __constant_htons(0xc000), };
 /* RFC 2960 Section 3.3.1 Payload Data (DATA) (0) */
 
 typedef struct sctp_datahdr {
-        __u32 tsn;
-        __u16 stream;
-        __u16 ssn;
-        __u32 ppid;
+        __be32 tsn;
+        __be16 stream;
+        __be16 ssn;
+        __be32 ppid;
         __u8  payload[0];
 } __attribute__((packed)) sctp_datahdr_t;
 
@@ -232,11 +232,11 @@ enum { SCTP_DATA_FRAG_MASK = 0x03, };
  *  endpoints.
  */
 typedef struct sctp_inithdr {
-        __u32 init_tag;
-        __u32 a_rwnd;
-        __u16 num_outbound_streams;
-        __u16 num_inbound_streams;
-        __u32 initial_tsn;
+        __be32 init_tag;
+        __be32 a_rwnd;
+        __be16 num_outbound_streams;
+        __be16 num_inbound_streams;
+        __be32 initial_tsn;
         __u8  params[0];
 } __attribute__((packed)) sctp_inithdr_t;
 
@@ -261,7 +261,7 @@ typedef struct sctp_ipv6addr_param {
 /* Section 3.3.2.1 Cookie Preservative (9) */
 typedef struct sctp_cookie_preserve_param {
         sctp_paramhdr_t param_hdr;
-        uint32_t        lifespan_increment;
+        __be32          lifespan_increment;
 } __attribute__((packed)) sctp_cookie_preserve_param_t;
 
 /* Section 3.3.2.1 Host Name Address (11) */
@@ -273,7 +273,7 @@ typedef struct sctp_hostname_param {
 /* Section 3.3.2.1 Supported Address Types (12) */
 typedef struct sctp_supported_addrs_param {
         sctp_paramhdr_t param_hdr;
-        uint16_t types[0];
+        __be16 types[0];
 } __attribute__((packed)) sctp_supported_addrs_param_t;
 
 /* Appendix A. ECN Capable (32768) */
@@ -281,11 +281,11 @@ typedef struct sctp_ecn_capable_param {
         sctp_paramhdr_t param_hdr;
 } __attribute__((packed)) sctp_ecn_capable_param_t;
 
-/* ADDIP Section 3.2.6 Adaption Layer Indication */
-typedef struct sctp_adaption_ind_param {
+/* ADDIP Section 3.2.6 Adaptation Layer Indication */
+typedef struct sctp_adaptation_ind_param {
         struct sctp_paramhdr param_hdr;
-        __u32 adaption_ind;
-} __attribute__((packed)) sctp_adaption_ind_param_t;
+        __be32 adaptation_ind;
+} __attribute__((packed)) sctp_adaptation_ind_param_t;
 
 /* RFC 2960.  Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2):
  *   The INIT ACK chunk is used to acknowledge the initiation of an SCTP
@@ -316,11 +316,11 @@ typedef struct sctp_unrecognized_param {
  */
 
 typedef struct sctp_gap_ack_block {
-        __u16 start;
-        __u16 end;
+        __be16 start;
+        __be16 end;
 } __attribute__((packed)) sctp_gap_ack_block_t;
 
-typedef uint32_t sctp_dup_tsn_t;
+typedef __be32 sctp_dup_tsn_t;
 
 typedef union {
         sctp_gap_ack_block_t    gab;
@@ -328,10 +328,10 @@ typedef union {
 } sctp_sack_variable_t;
 
 typedef struct sctp_sackhdr {
-        __u32 cum_tsn_ack;
-        __u32 a_rwnd;
-        __u16 num_gap_ack_blocks;
-        __u16 num_dup_tsns;
+        __be32 cum_tsn_ack;
+        __be32 a_rwnd;
+        __be16 num_gap_ack_blocks;
+        __be16 num_dup_tsns;
         sctp_sack_variable_t variable[0];
 } __attribute__((packed)) sctp_sackhdr_t;
 
@@ -371,7 +371,7 @@ typedef struct sctp_abort_chunk {
  * and the highest consecutive acking value.
  */
 typedef struct sctp_shutdownhdr {
-        __u32 cum_tsn_ack;
+        __be32 cum_tsn_ack;
 } __attribute__((packed)) sctp_shutdownhdr_t;
 
 struct sctp_shutdown_chunk_t {
@@ -382,8 +382,8 @@ struct sctp_shutdown_chunk_t {
 /* RFC 2960.  Section 3.3.10 Operation Error (ERROR) (9) */
 
 typedef struct sctp_errhdr {
-        __u16 cause;
-        __u16 length;
+        __be16 cause;
+        __be16 length;
         __u8  variable[0];
 } __attribute__((packed)) sctp_errhdr_t;
 
@@ -462,7 +462,7 @@ typedef enum {
  *   Explicit Congestion Notification Echo (ECNE) (12)
  */
 typedef struct sctp_ecnehdr {
-        __u32 lowest_tsn;
+        __be32 lowest_tsn;
 } sctp_ecnehdr_t;
 
 typedef struct sctp_ecne_chunk {
@@ -474,7 +474,7 @@ typedef struct sctp_ecne_chunk {
  *   Congestion Window Reduced (CWR) (13)
  */
 typedef struct sctp_cwrhdr {
-        __u32 lowest_tsn;
+        __be32 lowest_tsn;
 } sctp_cwrhdr_t;
 
 typedef struct sctp_cwr_chunk {
@@ -529,12 +529,12 @@ typedef struct sctp_cwr_chunk {
  *       chunks this field MUST be filled in.
  */
 struct sctp_fwdtsn_skip {
-        __u16 stream;
-        __u16 ssn;
+        __be16 stream;
+        __be16 ssn;
 } __attribute__((packed));
 
 struct sctp_fwdtsn_hdr {
-        __u32 new_cum_tsn;
+        __be32 new_cum_tsn;
         struct sctp_fwdtsn_skip skip[0];
 } __attribute((packed));
 
@@ -578,11 +578,11 @@ struct sctp_fwdtsn_chunk {
  */
 typedef struct sctp_addip_param {
         sctp_paramhdr_t param_hdr;
-        __u32           crr_id; 
+        __be32          crr_id;
 } __attribute__((packed)) sctp_addip_param_t;
 
 typedef struct sctp_addiphdr {
-        __u32   serial;
+        __be32  serial;
         __u8    params[0];
 } __attribute__((packed)) sctp_addiphdr_t;
 
diff --git a/include/linux/security.h b/include/linux/security.h
index b200b9856f3..83cdefae993 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -826,6 +826,8 @@ struct request_sock;
  *      Sets the openreq's sid to socket's sid with MLS portion taken from peer sid.
  * @inet_csk_clone:
  *      Sets the new child socket's sid to the openreq sid.
+ * @inet_conn_established:
+ *     Sets the connection's peersid to the secmark on skb.
  * @req_classify_flow:
  *      Sets the flow's sid to the openreq sid.
  *
@@ -836,10 +838,8 @@ struct request_sock;
  *      used by the XFRM system.
  *      @sec_ctx contains the security context information being provided by
  *      the user-level policy update program (e.g., setkey).
- *      @sk refers to the sock from which to derive the security context.
  *      Allocate a security structure to the xp->security field; the security
- *      field is initialized to NULL when the xfrm_policy is allocated. Only
- *      one of sec_ctx or sock can be specified.
+ *      field is initialized to NULL when the xfrm_policy is allocated.
  *      Return 0 if operation was successful (memory to allocate, legal context)
  * @xfrm_policy_clone_security:
  *      @old contains an existing xfrm_policy in the SPD.
@@ -858,9 +858,6 @@ struct request_sock;
  *      Database by the XFRM system.
  *      @sec_ctx contains the security context information being provided by
  *      the user-level SA generation program (e.g., setkey or racoon).
- *      @polsec contains the security context information associated with a xfrm
- *      policy rule from which to take the base context. polsec must be NULL
- *      when sec_ctx is specified.
  *      @secid contains the secid from which to take the mls portion of the context.
  *      Allocate a security structure to the x->security field; the security
  *      field is initialized to NULL when the xfrm_state is allocated. Set the
@@ -889,11 +886,6 @@ struct request_sock;
  *      @xp contains the policy to check for a match.
  *      @fl contains the flow to check for a match.
  *      Return 1 if there is a match.
- * @xfrm_flow_state_match:
- *      @fl contains the flow key to match.
- *      @xfrm points to the xfrm_state to match.
- *      @xp points to the xfrm_policy to match.
- *      Return 1 if there is a match.
  * @xfrm_decode_session:
  *      @skb points to skb to decode.
  *      @secid points to the flow key secid to set.
@@ -1373,25 +1365,24 @@ struct security_operations {
         int (*inet_conn_request)(struct sock *sk, struct sk_buff *skb,
                                         struct request_sock *req);
         void (*inet_csk_clone)(struct sock *newsk, const struct request_sock *req);
+        void (*inet_conn_established)(struct sock *sk, struct sk_buff *skb);
         void (*req_classify_flow)(const struct request_sock *req, struct flowi *fl);
 #endif  /* CONFIG_SECURITY_NETWORK */
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
         int (*xfrm_policy_alloc_security) (struct xfrm_policy *xp,
-                        struct xfrm_user_sec_ctx *sec_ctx, struct sock *sk);
+                        struct xfrm_user_sec_ctx *sec_ctx);
         int (*xfrm_policy_clone_security) (struct xfrm_policy *old, struct xfrm_policy *new);
         void (*xfrm_policy_free_security) (struct xfrm_policy *xp);
         int (*xfrm_policy_delete_security) (struct xfrm_policy *xp);
         int (*xfrm_state_alloc_security) (struct xfrm_state *x,
-                struct xfrm_user_sec_ctx *sec_ctx, struct xfrm_sec_ctx *polsec,
+                struct xfrm_user_sec_ctx *sec_ctx,
                 u32 secid);
         void (*xfrm_state_free_security) (struct xfrm_state *x);
         int (*xfrm_state_delete_security) (struct xfrm_state *x);
         int (*xfrm_policy_lookup)(struct xfrm_policy *xp, u32 fl_secid, u8 dir);
         int (*xfrm_state_pol_flow_match)(struct xfrm_state *x,
                         struct xfrm_policy *xp, struct flowi *fl);
-        int (*xfrm_flow_state_match)(struct flowi *fl, struct xfrm_state *xfrm,
-                        struct xfrm_policy *xp);
         int (*xfrm_decode_session)(struct sk_buff *skb, u32 *secid, int ckall);
 #endif  /* CONFIG_SECURITY_NETWORK_XFRM */
 
@@ -2966,9 +2957,15 @@ static inline void security_inet_csk_clone(struct sock *newsk,
 {
         security_ops->inet_csk_clone(newsk, req);
 }
+
+static inline void security_inet_conn_established(struct sock *sk,
+                        struct sk_buff *skb)
+{
+        security_ops->inet_conn_established(sk, skb);
+}
 #else   /* CONFIG_SECURITY_NETWORK */
 static inline int security_unix_stream_connect(struct socket * sock,
-                                               struct socket * other, 
+                                               struct socket * other,
                                                struct sock * newsk)
 {
         return 0;
@@ -3115,12 +3112,17 @@ static inline void security_inet_csk_clone(struct sock *newsk,
                         const struct request_sock *req)
 {
 }
+
+static inline void security_inet_conn_established(struct sock *sk,
+                        struct sk_buff *skb)
+{
+}
 #endif  /* CONFIG_SECURITY_NETWORK */
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
 static inline int security_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx)
 {
-        return security_ops->xfrm_policy_alloc_security(xp, sec_ctx, NULL);
+        return security_ops->xfrm_policy_alloc_security(xp, sec_ctx);
 }
 
 static inline int security_xfrm_policy_clone(struct xfrm_policy *old, struct xfrm_policy *new)
@@ -3141,7 +3143,7 @@ static inline int security_xfrm_policy_delete(struct xfrm_policy *xp)
 static inline int security_xfrm_state_alloc(struct xfrm_state *x,
                         struct xfrm_user_sec_ctx *sec_ctx)
 {
-        return security_ops->xfrm_state_alloc_security(x, sec_ctx, NULL, 0);
+        return security_ops->xfrm_state_alloc_security(x, sec_ctx, 0);
 }
 
 static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x,
@@ -3149,7 +3151,11 @@ static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x,
 {
         if (!polsec)
                 return 0;
-        return security_ops->xfrm_state_alloc_security(x, NULL, polsec, secid);
+        /*
+         * We want the context to be taken from secid which is usually
+         * from the sock.
+         */
+        return security_ops->xfrm_state_alloc_security(x, NULL, secid);
 }
 
 static inline int security_xfrm_state_delete(struct xfrm_state *x)
@@ -3173,12 +3179,6 @@ static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
         return security_ops->xfrm_state_pol_flow_match(x, xp, fl);
 }
 
-static inline int security_xfrm_flow_state_match(struct flowi *fl,
-                        struct xfrm_state *xfrm, struct xfrm_policy *xp)
-{
-        return security_ops->xfrm_flow_state_match(fl, xfrm, xp);
-}
-
 static inline int security_xfrm_decode_session(struct sk_buff *skb, u32 *secid)
 {
         return security_ops->xfrm_decode_session(skb, secid, 1);
@@ -3242,12 +3242,6 @@ static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
         return 1;
 }
 
-static inline int security_xfrm_flow_state_match(struct flowi *fl,
-                        struct xfrm_state *xfrm, struct xfrm_policy *xp)
-{
-        return 1;
-}
-
 static inline int security_xfrm_decode_session(struct sk_buff *skb, u32 *secid)
 {
         return 0;
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index b95f6eb7254..3e3cccbb1ca 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -20,7 +20,7 @@ struct seq_file {
         loff_t index;
         loff_t version;
         struct mutex lock;
-        struct seq_operations *op;
+        const struct seq_operations *op;
         void *private;
 };
 
@@ -31,7 +31,7 @@ struct seq_operations {
         int (*show) (struct seq_file *m, void *v);
 };
 
-int seq_open(struct file *, struct seq_operations *);
+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);
 int seq_release(struct inode *, struct file *);
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index 46000936f8f..6b0648cfdff 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -44,8 +44,11 @@ typedef struct {
 #define SEQLOCK_UNLOCKED \
                  __SEQLOCK_UNLOCKED(old_style_seqlock_init)
 
-#define seqlock_init(x) \
-                do { *(x) = (seqlock_t) __SEQLOCK_UNLOCKED(x); } while (0)
+#define seqlock_init(x)                                 \
+        do {                                            \
+                (x)->sequence = 0;                      \
+                spin_lock_init(&(x)->lock);             \
+        } while (0)
 
 #define DEFINE_SEQLOCK(x) \
                 seqlock_t x = __SEQLOCK_UNLOCKED(x)
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 8e968141372..71310d80c09 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -41,6 +41,7 @@ enum {
         PLAT8250_DEV_FOURPORT,
         PLAT8250_DEV_ACCENT,
         PLAT8250_DEV_BOCA,
+        PLAT8250_DEV_EXAR_ST16C554,
         PLAT8250_DEV_HUB6,
         PLAT8250_DEV_MCA,
         PLAT8250_DEV_AU1X00,
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 463ab953b09..cf23813cbec 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -132,6 +132,8 @@
 
 #define PORT_S3C2412    73
 
+/* Xilinx uartlite */
+#define PORT_UARTLITE   74
 
 #ifdef __KERNEL__
 
@@ -164,8 +166,8 @@ struct uart_ops {
         void            (*break_ctl)(struct uart_port *, int ctl);
         int             (*startup)(struct uart_port *);
         void            (*shutdown)(struct uart_port *);
-        void            (*set_termios)(struct uart_port *, struct termios *new,
-                                       struct termios *old);
+        void            (*set_termios)(struct uart_port *, struct ktermios *new,
+                                       struct ktermios *old);
         void            (*pm)(struct uart_port *, unsigned int state,
                               unsigned int oldstate);
         int             (*set_wake)(struct uart_port *, unsigned int state);
@@ -359,8 +361,8 @@ void uart_write_wakeup(struct uart_port *port);
  */
 void uart_update_timeout(struct uart_port *port, unsigned int cflag,
                          unsigned int baud);
-unsigned int uart_get_baud_rate(struct uart_port *port, struct termios *termios,
-                                struct termios *old, unsigned int min,
+unsigned int uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,
+                                struct ktermios *old, unsigned int min,
                                 unsigned int max);
 unsigned int uart_get_divisor(struct uart_port *port, unsigned int baud);
 
diff --git a/include/linux/serio.h b/include/linux/serio.h
index b99c5ca9708..0f478a8791a 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -85,18 +85,8 @@ static inline void serio_register_port(struct serio *serio)
 
 void serio_unregister_port(struct serio *serio);
 void serio_unregister_child_port(struct serio *serio);
-void __serio_unregister_port_delayed(struct serio *serio, struct module *owner);
-static inline void serio_unregister_port_delayed(struct serio *serio)
-{
-        __serio_unregister_port_delayed(serio, THIS_MODULE);
-}
-
-void __serio_register_driver(struct serio_driver *drv, struct module *owner);
-static inline void serio_register_driver(struct serio_driver *drv)
-{
-        __serio_register_driver(drv, THIS_MODULE);
-}
 
+int serio_register_driver(struct serio_driver *drv);
 void serio_unregister_driver(struct serio_driver *drv);
 
 static inline int serio_write(struct serio *serio, unsigned char data)
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 117135e33d6..14749056dd6 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -241,6 +241,8 @@ extern int sigprocmask(int, sigset_t *, sigset_t *);
 struct pt_regs;
 extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie);
 
+extern struct kmem_cache *sighand_cachep;
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_SIGNAL_H */
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 85577a4ffa6..4ff3940210d 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -22,12 +22,10 @@
 #include <asm/atomic.h>
 #include <asm/types.h>
 #include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/highmem.h>
-#include <linux/poll.h>
 #include <linux/net.h>
 #include <linux/textsearch.h>
 #include <net/checksum.h>
+#include <linux/rcupdate.h>
 #include <linux/dmaengine.h>
 
 #define HAVE_ALLOC_SKB          /* For the drivers to know */
@@ -139,7 +137,7 @@ struct skb_shared_info {
         /* Warning: this field is not always filled in (UFO)! */
         unsigned short  gso_segs;
         unsigned short  gso_type;
-        unsigned int    ip6_frag_id;
+        __be32          ip6_frag_id;
         struct sk_buff  *frag_list;
         skb_frag_t      frags[MAX_SKB_FRAGS];
 };
@@ -216,7 +214,7 @@ enum {
  *      @tail: Tail pointer
  *      @end: End pointer
  *      @destructor: Destruct function
- *      @nfmark: Can be used for communication between hooks
+ *      @mark: Generic packet mark
  *      @nfct: Associated connection, if any
  *      @ipvs_property: skbuff is owned by ipvs
  *      @nfctinfo: Relationship of this skb to the connection
@@ -273,8 +271,11 @@ struct sk_buff {
 
         unsigned int            len,
                                 data_len,
-                                mac_len,
-                                csum;
+                                mac_len;
+        union {
+                __wsum          csum;
+                __u32           csum_offset;
+        };
         __u32                   priority;
         __u8                    local_df:1,
                                 cloned:1,
@@ -295,7 +296,6 @@ struct sk_buff {
 #ifdef CONFIG_BRIDGE_NETFILTER
         struct nf_bridge_info   *nf_bridge;
 #endif
-        __u32                   nfmark;
 #endif /* CONFIG_NETFILTER */
 #ifdef CONFIG_NET_SCHED
         __u16                   tc_index;       /* traffic control index */
@@ -310,6 +310,7 @@ struct sk_buff {
         __u32                   secmark;
 #endif
 
+        __u32                   mark;
 
         /* These elements must be at the end, see alloc_skb() for details.  */
         unsigned int            truesize;
@@ -331,20 +332,20 @@ struct sk_buff {
 extern void kfree_skb(struct sk_buff *skb);
 extern void            __kfree_skb(struct sk_buff *skb);
 extern struct sk_buff *__alloc_skb(unsigned int size,
-                                   gfp_t priority, int fclone);
+                                   gfp_t priority, int fclone, int node);
 static inline struct sk_buff *alloc_skb(unsigned int size,
                                         gfp_t priority)
 {
-        return __alloc_skb(size, priority, 0);
+        return __alloc_skb(size, priority, 0, -1);
 }
 
 static inline struct sk_buff *alloc_skb_fclone(unsigned int size,
                                                gfp_t priority)
 {
-        return __alloc_skb(size, priority, 1);
+        return __alloc_skb(size, priority, 1, -1);
 }
 
-extern struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp,
+extern struct sk_buff *alloc_skb_from_cache(struct kmem_cache *cp,
                                             unsigned int size,
                                             gfp_t priority);
 extern void            kfree_skbmem(struct sk_buff *skb);
@@ -1199,8 +1200,7 @@ static inline int skb_add_data(struct sk_buff *skb,
 
         if (skb->ip_summed == CHECKSUM_NONE) {
                 int err = 0;
-                unsigned int csum = csum_and_copy_from_user(from,
-                                                            skb_put(skb, copy),
+                __wsum csum = csum_and_copy_from_user(from, skb_put(skb, copy),
                                                             copy, 0, &err);
                 if (!err) {
                         skb->csum = csum_block_add(skb->csum, csum, off);
@@ -1293,24 +1293,6 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)
         return __pskb_trim(skb, len);
 }
 
-static inline void *kmap_skb_frag(const skb_frag_t *frag)
-{
-#ifdef CONFIG_HIGHMEM
-        BUG_ON(in_irq());
-
-        local_bh_disable();
-#endif
-        return kmap_atomic(frag->page, KM_SKB_DATA_SOFTIRQ);
-}
-
-static inline void kunmap_skb_frag(void *vaddr)
-{
-        kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
-#ifdef CONFIG_HIGHMEM
-        local_bh_enable();
-#endif
-}
-
 #define skb_queue_walk(queue, skb) \
                 for (skb = (queue)->next;                                       \
                      prefetch(skb->next), (skb != (struct sk_buff *)(queue));   \
@@ -1335,15 +1317,15 @@ extern int	       skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
 extern void            skb_free_datagram(struct sock *sk, struct sk_buff *skb);
 extern void            skb_kill_datagram(struct sock *sk, struct sk_buff *skb,
                                          unsigned int flags);
-extern unsigned int    skb_checksum(const struct sk_buff *skb, int offset,
-                                    int len, unsigned int csum);
+extern __wsum          skb_checksum(const struct sk_buff *skb, int offset,
+                                    int len, __wsum csum);
 extern int             skb_copy_bits(const struct sk_buff *skb, int offset,
                                      void *to, int len);
 extern int             skb_store_bits(const struct sk_buff *skb, int offset,
                                       void *from, int len);
-extern unsigned int    skb_copy_and_csum_bits(const struct sk_buff *skb,
+extern __wsum          skb_copy_and_csum_bits(const struct sk_buff *skb,
                                               int offset, u8 *to, int len,
-                                              unsigned int csum);
+                                              __wsum csum);
 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);
@@ -1399,7 +1381,7 @@ static inline void skb_set_timestamp(struct sk_buff *skb, const struct timeval *
 
 extern void __net_timestamp(struct sk_buff *skb);
 
-extern unsigned int __skb_checksum_complete(struct sk_buff *skb);
+extern __sum16 __skb_checksum_complete(struct sk_buff *skb);
 
 /**
  *      skb_checksum_complete - Calculate checksum of an entire packet
diff --git a/include/linux/slab.h b/include/linux/slab.h
index c4947b8a2c0..1ef822e31c7 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -1,82 +1,106 @@
 /*
- * linux/include/linux/slab.h
- * Written by Mark Hemment, 1996.
- * (markhe@nextd.demon.co.uk)
+ * Written by Mark Hemment, 1996 (markhe@nextd.demon.co.uk).
+ *
+ * (C) SGI 2006, Christoph Lameter <clameter@sgi.com>
+ *      Cleaned up and restructured to ease the addition of alternative
+ *      implementations of SLAB allocators.
  */
 
 #ifndef _LINUX_SLAB_H
 #define _LINUX_SLAB_H
 
-#if     defined(__KERNEL__)
-
-typedef struct kmem_cache kmem_cache_t;
+#ifdef __KERNEL__
 
-#include        <linux/gfp.h>
-#include        <linux/init.h>
-#include        <linux/types.h>
-#include        <asm/page.h>            /* kmalloc_sizes.h needs PAGE_SIZE */
-#include        <asm/cache.h>           /* kmalloc_sizes.h needs L1_CACHE_BYTES */
+#include <linux/gfp.h>
+#include <linux/types.h>
 
-/* flags for kmem_cache_alloc() */
-#define SLAB_NOFS               GFP_NOFS
-#define SLAB_NOIO               GFP_NOIO
-#define SLAB_ATOMIC             GFP_ATOMIC
-#define SLAB_USER               GFP_USER
-#define SLAB_KERNEL             GFP_KERNEL
-#define SLAB_DMA                GFP_DMA
+typedef struct kmem_cache kmem_cache_t __deprecated;
 
-#define SLAB_LEVEL_MASK         GFP_LEVEL_MASK
+/*
+ * Flags to pass to kmem_cache_create().
+ * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
+ */
+#define SLAB_DEBUG_FREE         0x00000100UL    /* DEBUG: Perform (expensive) checks on free */
+#define SLAB_DEBUG_INITIAL      0x00000200UL    /* DEBUG: Call constructor (as verifier) */
+#define SLAB_RED_ZONE           0x00000400UL    /* DEBUG: Red zone objs in a cache */
+#define SLAB_POISON             0x00000800UL    /* DEBUG: Poison objects */
+#define SLAB_HWCACHE_ALIGN      0x00002000UL    /* Align objs on cache lines */
+#define SLAB_CACHE_DMA          0x00004000UL    /* Use GFP_DMA memory */
+#define SLAB_MUST_HWCACHE_ALIGN 0x00008000UL    /* Force alignment even if debuggin is active */
+#define SLAB_STORE_USER         0x00010000UL    /* DEBUG: Store the last owner for bug hunting */
+#define SLAB_RECLAIM_ACCOUNT    0x00020000UL    /* Objects are reclaimable */
+#define SLAB_PANIC              0x00040000UL    /* Panic if kmem_cache_create() fails */
+#define SLAB_DESTROY_BY_RCU     0x00080000UL    /* Defer freeing slabs to RCU */
+#define SLAB_MEM_SPREAD         0x00100000UL    /* Spread some memory over cpuset */
 
-#define SLAB_NO_GROW            __GFP_NO_GROW   /* don't grow a cache */
+/* Flags passed to a constructor functions */
+#define SLAB_CTOR_CONSTRUCTOR   0x001UL         /* If not set, then deconstructor */
+#define SLAB_CTOR_ATOMIC        0x002UL         /* Tell constructor it can't sleep */
+#define SLAB_CTOR_VERIFY        0x004UL         /* Tell constructor it's a verify call */
 
-/* flags to pass to kmem_cache_create().
- * The first 3 are only valid when the allocator as been build
- * SLAB_DEBUG_SUPPORT.
+/*
+ * struct kmem_cache related prototypes
  */
-#define SLAB_DEBUG_FREE         0x00000100UL    /* Peform (expensive) checks on free */
-#define SLAB_DEBUG_INITIAL      0x00000200UL    /* Call constructor (as verifier) */
-#define SLAB_RED_ZONE           0x00000400UL    /* Red zone objs in a cache */
-#define SLAB_POISON             0x00000800UL    /* Poison objects */
-#define SLAB_HWCACHE_ALIGN      0x00002000UL    /* align objs on a h/w cache lines */
-#define SLAB_CACHE_DMA          0x00004000UL    /* use GFP_DMA memory */
-#define SLAB_MUST_HWCACHE_ALIGN 0x00008000UL    /* force alignment */
-#define SLAB_STORE_USER         0x00010000UL    /* store the last owner for bug hunting */
-#define SLAB_RECLAIM_ACCOUNT    0x00020000UL    /* track pages allocated to indicate
-                                                   what is reclaimable later*/
-#define SLAB_PANIC              0x00040000UL    /* panic if kmem_cache_create() fails */
-#define SLAB_DESTROY_BY_RCU     0x00080000UL    /* defer freeing pages to RCU */
-#define SLAB_MEM_SPREAD         0x00100000UL    /* Spread some memory over cpuset */
+void __init kmem_cache_init(void);
+extern int slab_is_available(void);
 
-/* flags passed to a constructor func */
-#define SLAB_CTOR_CONSTRUCTOR   0x001UL         /* if not set, then deconstructor */
-#define SLAB_CTOR_ATOMIC        0x002UL         /* tell constructor it can't sleep */
-#define SLAB_CTOR_VERIFY        0x004UL         /* tell constructor it's a verify call */
+struct kmem_cache *kmem_cache_create(const char *, size_t, size_t,
+                        unsigned long,
+                        void (*)(void *, struct kmem_cache *, unsigned long),
+                        void (*)(void *, struct kmem_cache *, unsigned long));
+void kmem_cache_destroy(struct kmem_cache *);
+int kmem_cache_shrink(struct kmem_cache *);
+void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
+void *kmem_cache_zalloc(struct kmem_cache *, gfp_t);
+void kmem_cache_free(struct kmem_cache *, void *);
+unsigned int kmem_cache_size(struct kmem_cache *);
+const char *kmem_cache_name(struct kmem_cache *);
+int kmem_ptr_validate(struct kmem_cache *cachep, const void *ptr);
 
-#ifndef CONFIG_SLOB
+#ifdef CONFIG_NUMA
+extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
+#else
+static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
+                                        gfp_t flags, int node)
+{
+        return kmem_cache_alloc(cachep, flags);
+}
+#endif
 
-/* prototypes */
-extern void __init kmem_cache_init(void);
+/*
+ * Common kmalloc functions provided by all allocators
+ */
+void *__kmalloc(size_t, gfp_t);
+void *__kzalloc(size_t, gfp_t);
+void kfree(const void *);
+unsigned int ksize(const void *);
 
-extern kmem_cache_t *kmem_cache_create(const char *, size_t, size_t, unsigned long,
-                                       void (*)(void *, kmem_cache_t *, unsigned long),
-                                       void (*)(void *, kmem_cache_t *, unsigned long));
-extern void kmem_cache_destroy(kmem_cache_t *);
-extern int kmem_cache_shrink(kmem_cache_t *);
-extern void *kmem_cache_alloc(kmem_cache_t *, gfp_t);
-extern void *kmem_cache_zalloc(struct kmem_cache *, gfp_t);
-extern void kmem_cache_free(kmem_cache_t *, void *);
-extern unsigned int kmem_cache_size(kmem_cache_t *);
-extern const char *kmem_cache_name(kmem_cache_t *);
+/**
+ * kcalloc - allocate memory for an array. The memory is set to zero.
+ * @n: number of elements.
+ * @size: element size.
+ * @flags: the type of memory to allocate.
+ */
+static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
+{
+        if (n != 0 && size > ULONG_MAX / n)
+                return NULL;
+        return __kzalloc(n * size, flags);
+}
 
-/* Size description struct for general caches. */
-struct cache_sizes {
-        size_t           cs_size;
-        kmem_cache_t    *cs_cachep;
-        kmem_cache_t    *cs_dmacachep;
-};
-extern struct cache_sizes malloc_sizes[];
+/*
+ * Allocator specific definitions. These are mainly used to establish optimized
+ * ways to convert kmalloc() calls to kmem_cache_alloc() invocations by selecting
+ * the appropriate general cache at compile time.
+ */
 
-extern void *__kmalloc(size_t, gfp_t);
+#ifdef CONFIG_SLAB
+#include <linux/slab_def.h>
+#else
+/*
+ * Fallback definitions for an allocator not wanting to provide
+ * its own optimized kmalloc definitions (like SLOB).
+ */
 
 /**
  * kmalloc - allocate memory
@@ -125,46 +149,9 @@ extern void *__kmalloc(size_t, gfp_t);
  */
 static inline void *kmalloc(size_t size, gfp_t flags)
 {
-        if (__builtin_constant_p(size)) {
-                int i = 0;
-#define CACHE(x) \
-                if (size <= x) \
-                        goto found; \
-                else \
-                        i++;
-#include "kmalloc_sizes.h"
-#undef CACHE
-                {
-                        extern void __you_cannot_kmalloc_that_much(void);
-                        __you_cannot_kmalloc_that_much();
-                }
-found:
-                return kmem_cache_alloc((flags & GFP_DMA) ?
-                        malloc_sizes[i].cs_dmacachep :
-                        malloc_sizes[i].cs_cachep, flags);
-        }
         return __kmalloc(size, flags);
 }
 
-/*
- * kmalloc_track_caller is a special version of kmalloc that records the
- * calling function of the routine calling it for slab leak tracking instead
- * of just the calling function (confusing, eh?).
- * It's useful when the call to kmalloc comes from a widely-used standard
- * allocator where we care about the real place the memory allocation
- * request comes from.
- */
-#ifndef CONFIG_DEBUG_SLAB
-#define kmalloc_track_caller(size, flags) \
-        __kmalloc(size, flags)
-#else
-extern void *__kmalloc_track_caller(size_t, gfp_t, void*);
-#define kmalloc_track_caller(size, flags) \
-        __kmalloc_track_caller(size, flags, __builtin_return_address(0))
-#endif
-
-extern void *__kzalloc(size_t, gfp_t);
-
 /**
  * kzalloc - allocate memory. The memory is set to zero.
  * @size: how many bytes of memory are required.
@@ -172,128 +159,65 @@ extern void *__kzalloc(size_t, gfp_t);
  */
 static inline void *kzalloc(size_t size, gfp_t flags)
 {
-        if (__builtin_constant_p(size)) {
-                int i = 0;
-#define CACHE(x) \
-                if (size <= x) \
-                        goto found; \
-                else \
-                        i++;
-#include "kmalloc_sizes.h"
-#undef CACHE
-                {
-                        extern void __you_cannot_kzalloc_that_much(void);
-                        __you_cannot_kzalloc_that_much();
-                }
-found:
-                return kmem_cache_zalloc((flags & GFP_DMA) ?
-                        malloc_sizes[i].cs_dmacachep :
-                        malloc_sizes[i].cs_cachep, flags);
-        }
         return __kzalloc(size, flags);
 }
+#endif
 
-/**
- * kcalloc - allocate memory for an array. The memory is set to zero.
- * @n: number of elements.
- * @size: element size.
- * @flags: the type of memory to allocate.
- */
-static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
-{
-        if (n != 0 && size > ULONG_MAX / n)
-                return NULL;
-        return kzalloc(n * size, flags);
-}
-
-extern void kfree(const void *);
-extern unsigned int ksize(const void *);
-extern int slab_is_available(void);
-
-#ifdef CONFIG_NUMA
-extern void *kmem_cache_alloc_node(kmem_cache_t *, gfp_t flags, int node);
-extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
-
-static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
-{
-        if (__builtin_constant_p(size)) {
-                int i = 0;
-#define CACHE(x) \
-                if (size <= x) \
-                        goto found; \
-                else \
-                        i++;
-#include "kmalloc_sizes.h"
-#undef CACHE
-                {
-                        extern void __you_cannot_kmalloc_that_much(void);
-                        __you_cannot_kmalloc_that_much();
-                }
-found:
-                return kmem_cache_alloc_node((flags & GFP_DMA) ?
-                        malloc_sizes[i].cs_dmacachep :
-                        malloc_sizes[i].cs_cachep, flags, node);
-        }
-        return __kmalloc_node(size, flags, node);
-}
-#else
-static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, gfp_t flags, int node)
-{
-        return kmem_cache_alloc(cachep, flags);
-}
+#ifndef CONFIG_NUMA
 static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 {
         return kmalloc(size, flags);
 }
-#endif
-
-extern int FASTCALL(kmem_cache_reap(int));
-extern int FASTCALL(kmem_ptr_validate(kmem_cache_t *cachep, void *ptr));
-
-#else /* CONFIG_SLOB */
-
-/* SLOB allocator routines */
-
-void kmem_cache_init(void);
-struct kmem_cache *kmem_cache_create(const char *c, size_t, size_t,
-        unsigned long,
-        void (*)(void *, struct kmem_cache *, unsigned long),
-        void (*)(void *, struct kmem_cache *, unsigned long));
-void kmem_cache_destroy(struct kmem_cache *c);
-void *kmem_cache_alloc(struct kmem_cache *c, gfp_t flags);
-void *kmem_cache_zalloc(struct kmem_cache *, gfp_t);
-void kmem_cache_free(struct kmem_cache *c, void *b);
-const char *kmem_cache_name(struct kmem_cache *);
-void *kmalloc(size_t size, gfp_t flags);
-void *__kzalloc(size_t size, gfp_t flags);
-void kfree(const void *m);
-unsigned int ksize(const void *m);
-unsigned int kmem_cache_size(struct kmem_cache *c);
 
-static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
+static inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
 {
-        return __kzalloc(n * size, flags);
+        return __kmalloc(size, flags);
 }
+#endif /* !CONFIG_NUMA */
 
-#define kmem_cache_shrink(d) (0)
-#define kmem_cache_reap(a)
-#define kmem_ptr_validate(a, b) (0)
-#define kmem_cache_alloc_node(c, f, n) kmem_cache_alloc(c, f)
-#define kmalloc_node(s, f, n) kmalloc(s, f)
-#define kzalloc(s, f) __kzalloc(s, f)
-#define kmalloc_track_caller kmalloc
+/*
+ * kmalloc_track_caller is a special version of kmalloc that records the
+ * calling function of the routine calling it for slab leak tracking instead
+ * of just the calling function (confusing, eh?).
+ * It's useful when the call to kmalloc comes from a widely-used standard
+ * allocator where we care about the real place the memory allocation
+ * request comes from.
+ */
+#ifdef CONFIG_DEBUG_SLAB
+extern void *__kmalloc_track_caller(size_t, gfp_t, void*);
+#define kmalloc_track_caller(size, flags) \
+        __kmalloc_track_caller(size, flags, __builtin_return_address(0))
+#else
+#define kmalloc_track_caller(size, flags) \
+        __kmalloc(size, flags)
+#endif /* DEBUG_SLAB */
 
-#endif /* CONFIG_SLOB */
+#ifdef CONFIG_NUMA
+/*
+ * kmalloc_node_track_caller is a special version of kmalloc_node that
+ * records the calling function of the routine calling it for slab leak
+ * tracking instead of just the calling function (confusing, eh?).
+ * It's useful when the call to kmalloc_node comes from a widely-used
+ * standard allocator where we care about the real place the memory
+ * allocation request comes from.
+ */
+#ifdef CONFIG_DEBUG_SLAB
+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, void *);
+#define kmalloc_node_track_caller(size, flags, node) \
+        __kmalloc_node_track_caller(size, flags, node, \
+                        __builtin_return_address(0))
+#else
+#define kmalloc_node_track_caller(size, flags, node) \
+        __kmalloc_node(size, flags, node)
+#endif
 
-/* System wide caches */
-extern kmem_cache_t     *vm_area_cachep;
-extern kmem_cache_t     *names_cachep;
-extern kmem_cache_t     *files_cachep;
-extern kmem_cache_t     *filp_cachep;
-extern kmem_cache_t     *fs_cachep;
-extern kmem_cache_t     *sighand_cachep;
-extern kmem_cache_t     *bio_cachep;
+#else /* CONFIG_NUMA */
 
-#endif  /* __KERNEL__ */
+#define kmalloc_node_track_caller(size, flags, node) \
+        kmalloc_track_caller(size, flags)
 
+#endif /* DEBUG_SLAB */
+
+#endif  /* __KERNEL__ */
 #endif  /* _LINUX_SLAB_H */
+
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
new file mode 100644
index 00000000000..4b463e66dde
--- /dev/null
+++ b/include/linux/slab_def.h
@@ -0,0 +1,100 @@
+#ifndef _LINUX_SLAB_DEF_H
+#define _LINUX_SLAB_DEF_H
+
+/*
+ * Definitions unique to the original Linux SLAB allocator.
+ *
+ * What we provide here is a way to optimize the frequent kmalloc
+ * calls in the kernel by selecting the appropriate general cache
+ * if kmalloc was called with a size that can be established at
+ * compile time.
+ */
+
+#include <linux/init.h>
+#include <asm/page.h>           /* kmalloc_sizes.h needs PAGE_SIZE */
+#include <asm/cache.h>          /* kmalloc_sizes.h needs L1_CACHE_BYTES */
+#include <linux/compiler.h>
+
+/* Size description struct for general caches. */
+struct cache_sizes {
+        size_t                  cs_size;
+        struct kmem_cache       *cs_cachep;
+        struct kmem_cache       *cs_dmacachep;
+};
+extern struct cache_sizes malloc_sizes[];
+
+static inline void *kmalloc(size_t size, gfp_t flags)
+{
+        if (__builtin_constant_p(size)) {
+                int i = 0;
+#define CACHE(x) \
+                if (size <= x) \
+                        goto found; \
+                else \
+                        i++;
+#include "kmalloc_sizes.h"
+#undef CACHE
+                {
+                        extern void __you_cannot_kmalloc_that_much(void);
+                        __you_cannot_kmalloc_that_much();
+                }
+found:
+                return kmem_cache_alloc((flags & GFP_DMA) ?
+                        malloc_sizes[i].cs_dmacachep :
+                        malloc_sizes[i].cs_cachep, flags);
+        }
+        return __kmalloc(size, flags);
+}
+
+static inline void *kzalloc(size_t size, gfp_t flags)
+{
+        if (__builtin_constant_p(size)) {
+                int i = 0;
+#define CACHE(x) \
+                if (size <= x) \
+                        goto found; \
+                else \
+                        i++;
+#include "kmalloc_sizes.h"
+#undef CACHE
+                {
+                        extern void __you_cannot_kzalloc_that_much(void);
+                        __you_cannot_kzalloc_that_much();
+                }
+found:
+                return kmem_cache_zalloc((flags & GFP_DMA) ?
+                        malloc_sizes[i].cs_dmacachep :
+                        malloc_sizes[i].cs_cachep, flags);
+        }
+        return __kzalloc(size, flags);
+}
+
+#ifdef CONFIG_NUMA
+extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
+
+static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
+{
+        if (__builtin_constant_p(size)) {
+                int i = 0;
+#define CACHE(x) \
+                if (size <= x) \
+                        goto found; \
+                else \
+                        i++;
+#include "kmalloc_sizes.h"
+#undef CACHE
+                {
+                        extern void __you_cannot_kmalloc_that_much(void);
+                        __you_cannot_kmalloc_that_much();
+                }
+found:
+                return kmem_cache_alloc_node((flags & GFP_DMA) ?
+                        malloc_sizes[i].cs_dmacachep :
+                        malloc_sizes[i].cs_cachep, flags, node);
+        }
+        return __kmalloc_node(size, flags, node);
+}
+
+#endif  /* CONFIG_NUMA */
+
+#endif  /* _LINUX_SLAB_DEF_H */
diff --git a/include/linux/smb_fs_sb.h b/include/linux/smb_fs_sb.h
index 5b4ae2cc445..3aa97aa4277 100644
--- a/include/linux/smb_fs_sb.h
+++ b/include/linux/smb_fs_sb.h
@@ -55,7 +55,7 @@ struct smb_sb_info {
          * generation is incremented.
          */
         unsigned int generation;
-        pid_t conn_pid;
+        struct pid *conn_pid;
         struct smb_conn_opt opt;
         wait_queue_head_t conn_wq;
         int conn_complete;
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 51649987f69..7ba23ec8211 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -99,6 +99,13 @@ static inline int up_smp_call_function(void)
 static inline void smp_send_reschedule(int cpu) { }
 #define num_booting_cpus()                      1
 #define smp_prepare_boot_cpu()                  do {} while (0)
+static inline int smp_call_function_single(int cpuid, void (*func) (void *info),
+                                void *info, int retry, int wait)
+{
+        /* Disable interrupts here? */
+        func(info);
+        return 0;
+}
 
 #endif /* !SMP */
 
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 36140909464..92cd38efad7 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -264,6 +264,7 @@ struct ucred {
 #define SOL_IPV6        41
 #define SOL_ICMPV6      58
 #define SOL_SCTP        132
+#define SOL_UDPLITE     136     /* UDP-Lite (RFC 3828) */
 #define SOL_RAW         255
 #define SOL_IPX         256
 #define SOL_AX25        257
@@ -292,7 +293,7 @@ extern int memcpy_fromiovecend(unsigned char *kdata, struct iovec *iov,
 extern int csum_partial_copy_fromiovecend(unsigned char *kdata, 
                                           struct iovec *iov, 
                                           int offset, 
-                                          unsigned int len, int *csump);
+                                          unsigned int len, __wsum *csump);
 
 extern int verify_iovec(struct msghdr *m, struct iovec *iov, char *address, int mode);
 extern int memcpy_toiovec(struct iovec *v, unsigned char *kdata, int len);
diff --git a/include/linux/sockios.h b/include/linux/sockios.h
index e6b9d1d36ea..abef7596655 100644
--- a/include/linux/sockios.h
+++ b/include/linux/sockios.h
@@ -72,8 +72,8 @@
 #define SIOCGIFTXQLEN   0x8942          /* Get the tx queue length      */
 #define SIOCSIFTXQLEN   0x8943          /* Set the tx queue length      */
 
-#define SIOCGIFDIVERT   0x8944          /* Frame diversion support */
-#define SIOCSIFDIVERT   0x8945          /* Set frame diversion options */
+/* SIOCGIFDIVERT was:   0x8944          Frame diversion support */
+/* SIOCSIFDIVERT was:   0x8945          Set frame diversion options */
 
 #define SIOCETHTOOL     0x8946          /* Ethtool interface            */
 
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index c8bb68099eb..176f6e36dbf 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -289,7 +289,7 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum);
  * the data being transferred; that may reduce overhead, when the
  * underlying driver uses dma.
  *
- * If the transmit buffer is null, undefined data will be shifted out
+ * If the transmit buffer is null, zeroes will be shifted out
  * while filling rx_buf.  If the receive buffer is null, the data
  * shifted in will be discarded.  Only "len" bytes shift out (or in).
  * It's an error to try to shift out a partial word.  (For example, by
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index 8451052ca66..94b767d6427 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -52,6 +52,7 @@
 #include <linux/thread_info.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
+#include <linux/bottom_half.h>
 
 #include <asm/system.h>
 
diff --git a/include/linux/stallion.h b/include/linux/stallion.h
index 13a37f137ea..4a0a329beaf 100644
--- a/include/linux/stallion.h
+++ b/include/linux/stallion.h
@@ -52,11 +52,11 @@
  *      protection - since "write" code only needs to change the head, and
  *      interrupt code only needs to change the tail.
  */
-typedef struct {
+struct stlrq {
         char    *buf;
         char    *head;
         char    *tail;
-} stlrq_t;
+};
 
 /*
  *      Port, panel and board structures to hold status info about each.
@@ -67,14 +67,14 @@ typedef struct {
  *      is associated with, this makes it (fairly) easy to get back to the
  *      board/panel info for a port.
  */
-typedef struct stlport {
+struct stlport {
         unsigned long           magic;
-        int                     portnr;
-        int                     panelnr;
-        int                     brdnr;
+        unsigned int            portnr;
+        unsigned int            panelnr;
+        unsigned int            brdnr;
         int                     ioaddr;
         int                     uartaddr;
-        int                     pagenr;
+        unsigned int            pagenr;
         long                    istate;
         int                     flags;
         int                     baud_base;
@@ -97,31 +97,31 @@ typedef struct stlport {
         wait_queue_head_t       close_wait;
         struct work_struct      tqueue;
         comstats_t              stats;
-        stlrq_t                 tx;
-} stlport_t;
+        struct stlrq            tx;
+};
 
-typedef struct stlpanel {
+struct stlpanel {
         unsigned long   magic;
-        int             panelnr;
-        int             brdnr;
-        int             pagenr;
-        int             nrports;
+        unsigned int    panelnr;
+        unsigned int    brdnr;
+        unsigned int    pagenr;
+        unsigned int    nrports;
         int             iobase;
         void            *uartp;
         void            (*isr)(struct stlpanel *panelp, unsigned int iobase);
         unsigned int    hwid;
         unsigned int    ackmask;
-        stlport_t       *ports[STL_PORTSPERPANEL];
-} stlpanel_t;
+        struct stlport  *ports[STL_PORTSPERPANEL];
+};
 
-typedef struct stlbrd {
+struct stlbrd {
         unsigned long   magic;
-        int             brdnr;
-        int             brdtype;
-        int             state;
-        int             nrpanels;
-        int             nrports;
-        int             nrbnks;
+        unsigned int    brdnr;
+        unsigned int    brdtype;
+        unsigned int    state;
+        unsigned int    nrpanels;
+        unsigned int    nrports;
+        unsigned int    nrbnks;
         int             irq;
         int             irqtype;
         int             (*isr)(struct stlbrd *brdp);
@@ -136,9 +136,9 @@ typedef struct stlbrd {
         unsigned long   clk;
         unsigned int    bnkpageaddr[STL_MAXBANKS];
         unsigned int    bnkstataddr[STL_MAXBANKS];
-        stlpanel_t      *bnk2panel[STL_MAXBANKS];
-        stlpanel_t      *panels[STL_MAXPANELS];
-} stlbrd_t;
+        struct stlpanel *bnk2panel[STL_MAXBANKS];
+        struct stlpanel *panels[STL_MAXPANELS];
+};
 
 
 /*
diff --git a/include/linux/start_kernel.h b/include/linux/start_kernel.h
new file mode 100644
index 00000000000..d3e5f275654
--- /dev/null
+++ b/include/linux/start_kernel.h
@@ -0,0 +1,12 @@
+#ifndef _LINUX_START_KERNEL_H
+#define _LINUX_START_KERNEL_H
+
+#include <linux/linkage.h>
+#include <linux/init.h>
+
+/* Define the prototype for start_kernel here, rather than cluttering
+   up something else. */
+
+extern asmlinkage void __init start_kernel(void);
+
+#endif /* _LINUX_START_KERNEL_H */
diff --git a/include/linux/sunrpc/auth_gss.h b/include/linux/sunrpc/auth_gss.h
index 97b62e97dd8..2db2fbf3494 100644
--- a/include/linux/sunrpc/auth_gss.h
+++ b/include/linux/sunrpc/auth_gss.h
@@ -90,8 +90,6 @@ struct gss_cred {
 #define gc_flags                gc_base.cr_flags
 #define gc_expire               gc_base.cr_expire
 
-void print_hexl(u32 *p, u_int length, u_int offset);
-
 #endif /* __KERNEL__ */
 #endif /* _LINUX_SUNRPC_AUTH_GSS_H */
 
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index f6d1d646ce0..a1be89deb3a 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -53,6 +53,7 @@ struct rpc_clnt {
         struct dentry *         cl_dentry;      /* inode */
         struct rpc_clnt *       cl_parent;      /* Points to parent of clones */
         struct rpc_rtt          cl_rtt_default;
+        struct rpc_program *    cl_program;
         char                    cl_inline_name[32];
 };
 
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index e4729aa6765..60fce3c9285 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -62,12 +62,6 @@ extern unsigned int		nlm_debug;
 # define RPC_IFDEBUG(x)
 #endif
 
-#ifdef RPC_PROFILE
-# define pprintk(args...)       printk(## args)
-#else
-# define pprintk(args...)       do ; while (0)
-#endif
-
 /*
  * Sysctl interface for RPC debugging
  */
diff --git a/include/linux/sunrpc/gss_krb5.h b/include/linux/sunrpc/gss_krb5.h
index e30ba201910..5a4b1e0206e 100644
--- a/include/linux/sunrpc/gss_krb5.h
+++ b/include/linux/sunrpc/gss_krb5.h
@@ -42,10 +42,6 @@
 
 struct krb5_ctx {
         int                     initiate; /* 1 = initiating, 0 = accepting */
-        int                     seed_init;
-        unsigned char           seed[16];
-        int                     signalg;
-        int                     sealalg;
         struct crypto_blkcipher *enc;
         struct crypto_blkcipher *seq;
         s32                     endtime;
@@ -117,7 +113,7 @@ enum seal_alg {
 #define ENCTYPE_UNKNOWN         0x01ff
 
 s32
-make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
+make_checksum(char *, char *header, int hdrlen, struct xdr_buf *body,
                    int body_offset, struct xdr_netobj *cksum);
 
 u32 gss_get_mic_kerberos(struct gss_ctx *, struct xdr_buf *,
diff --git a/include/linux/sunrpc/gss_spkm3.h b/include/linux/sunrpc/gss_spkm3.h
index 2cf3fbb40b4..e3e6a3437f8 100644
--- a/include/linux/sunrpc/gss_spkm3.h
+++ b/include/linux/sunrpc/gss_spkm3.h
@@ -12,27 +12,19 @@
 #include <linux/sunrpc/gss_asn1.h>
 
 struct spkm3_ctx {
-        struct xdr_netobj       ctx_id; /* per message context id */
-        int                     qop;         /* negotiated qop */
+        struct xdr_netobj       ctx_id;  /* per message context id */
+        int                     endtime; /* endtime of the context */
         struct xdr_netobj       mech_used;
         unsigned int            ret_flags ;
-        unsigned int            req_flags ;
-        struct xdr_netobj       share_key;
-        int                     conf_alg;
-        struct crypto_blkcipher *derived_conf_key;
-        int                     intg_alg;
-        struct crypto_blkcipher *derived_integ_key;
-        int                     keyestb_alg;   /* alg used to get share_key */
-        int                     owf_alg;   /* one way function */
+        struct xdr_netobj       conf_alg;
+        struct xdr_netobj       derived_conf_key;
+        struct xdr_netobj       intg_alg;
+        struct xdr_netobj       derived_integ_key;
 };
 
-/* from openssl/objects.h */
-/* XXX need SEAL_ALG_NONE */
-#define NID_md5         4
-#define NID_dhKeyAgreement      28 
-#define NID_des_cbc             31 
-#define NID_sha1                64
-#define NID_cast5_cbc           108
+/* OIDs declarations for K-ALG, I-ALG, C-ALG, and OWF-ALG */
+extern const struct xdr_netobj hmac_md5_oid;
+extern const struct xdr_netobj cast5_cbc_oid;
 
 /* SPKM InnerContext Token types */
 
@@ -46,11 +38,13 @@ u32 spkm3_make_token(struct spkm3_ctx *ctx, struct xdr_buf * text, struct xdr_ne
 u32 spkm3_read_token(struct spkm3_ctx *ctx, struct xdr_netobj *read_token, struct xdr_buf *message_buffer, int toktype);
 
 #define CKSUMTYPE_RSA_MD5            0x0007
+#define CKSUMTYPE_HMAC_MD5           0x0008
 
-s32 make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
-                   int body_offset, struct xdr_netobj *cksum);
+s32 make_spkm3_checksum(s32 cksumtype, struct xdr_netobj *key, char *header,
+                unsigned int hdrlen, struct xdr_buf *body,
+                unsigned int body_offset, struct xdr_netobj *cksum);
 void asn1_bitstring_len(struct xdr_netobj *in, int *enclen, int *zerobits);
-int decode_asn1_bitstring(struct xdr_netobj *out, char *in, int enclen, 
+int decode_asn1_bitstring(struct xdr_netobj *out, char *in, int enclen,
                    int explen);
 void spkm3_mic_header(unsigned char **hdrbuf, unsigned int *hdrlen, 
                    unsigned char *ctxhdr, int elen, int zbit);
diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
index a2eb9b4a9de..4a68125b6de 100644
--- a/include/linux/sunrpc/rpc_pipe_fs.h
+++ b/include/linux/sunrpc/rpc_pipe_fs.h
@@ -30,7 +30,7 @@ struct rpc_inode {
 #define RPC_PIPE_WAIT_FOR_OPEN  1
         int flags;
         struct rpc_pipe_ops *ops;
-        struct work_struct queue_timeout;
+        struct delayed_work queue_timeout;
 };
 
 static inline struct rpc_inode *
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index f399c138f79..97c76165258 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -11,6 +11,7 @@
 
 #include <linux/timer.h>
 #include <linux/sunrpc/types.h>
+#include <linux/rcupdate.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
@@ -85,6 +86,7 @@ struct rpc_task {
         union {
                 struct work_struct      tk_work;        /* Async task work queue */
                 struct rpc_wait         tk_wait;        /* RPC wait */
+                struct rcu_head         tk_rcu;         /* for task deletion */
         } u;
 
         unsigned short          tk_timeouts;    /* maj timeouts */
@@ -178,13 +180,6 @@ struct rpc_call_ops {
         } while (0)
 
 #define RPC_IS_ACTIVATED(t)     (test_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate))
-#define rpc_set_active(t)       (set_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate))
-#define rpc_clear_active(t)     \
-        do { \
-                smp_mb__before_clear_bit(); \
-                clear_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate); \
-                smp_mb__after_clear_bit(); \
-        } while(0)
 
 /*
  * Task priorities.
@@ -222,7 +217,7 @@ struct rpc_wait_queue {
 
 #ifndef RPC_DEBUG
 # define RPC_WAITQ_INIT(var,qname) { \
-                .lock = SPIN_LOCK_UNLOCKED, \
+                .lock = __SPIN_LOCK_UNLOCKED(var.lock), \
                 .tasks = { \
                         [0] = LIST_HEAD_INIT(var.tasks[0]), \
                         [1] = LIST_HEAD_INIT(var.tasks[1]), \
@@ -231,7 +226,7 @@ struct rpc_wait_queue {
         }
 #else
 # define RPC_WAITQ_INIT(var,qname) { \
-                .lock = SPIN_LOCK_UNLOCKED, \
+                .lock = __SPIN_LOCK_UNLOCKED(var.lock), \
                 .tasks = { \
                         [0] = LIST_HEAD_INIT(var.tasks[0]), \
                         [1] = LIST_HEAD_INIT(var.tasks[1]), \
@@ -254,8 +249,10 @@ struct rpc_task *rpc_run_task(struct rpc_clnt *clnt, int flags,
 void            rpc_init_task(struct rpc_task *task, struct rpc_clnt *clnt,
                                 int flags, const struct rpc_call_ops *ops,
                                 void *data);
+void            rpc_put_task(struct rpc_task *);
 void            rpc_release_task(struct rpc_task *);
 void            rpc_exit_task(struct rpc_task *);
+void            rpc_release_calldata(const struct rpc_call_ops *, void *);
 void            rpc_killall_tasks(struct rpc_clnt *);
 int             rpc_execute(struct rpc_task *);
 void            rpc_init_priority_wait_queue(struct rpc_wait_queue *, const char *);
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index ac69e551160..9e340fa23c0 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -11,6 +11,7 @@
 
 #include <linux/uio.h>
 #include <asm/byteorder.h>
+#include <linux/scatterlist.h>
 
 /*
  * Buffer adjustment
@@ -139,29 +140,30 @@ xdr_adjust_iovec(struct kvec *iov, __be32 *p)
  */
 extern void xdr_shift_buf(struct xdr_buf *, size_t);
 extern void xdr_buf_from_iov(struct kvec *, struct xdr_buf *);
-extern int xdr_buf_subsegment(struct xdr_buf *, struct xdr_buf *, int, int);
-extern int xdr_buf_read_netobj(struct xdr_buf *, struct xdr_netobj *, int);
-extern int read_bytes_from_xdr_buf(struct xdr_buf *, int, void *, int);
-extern int write_bytes_to_xdr_buf(struct xdr_buf *, int, void *, int);
+extern int xdr_buf_subsegment(struct xdr_buf *, struct xdr_buf *, unsigned int, unsigned int);
+extern int xdr_buf_read_netobj(struct xdr_buf *, struct xdr_netobj *, unsigned int);
+extern int read_bytes_from_xdr_buf(struct xdr_buf *, unsigned int, void *, unsigned int);
+extern int write_bytes_to_xdr_buf(struct xdr_buf *, unsigned int, void *, unsigned int);
 
 /*
  * Helper structure for copying from an sk_buff.
  */
-typedef struct {
+struct xdr_skb_reader {
         struct sk_buff  *skb;
         unsigned int    offset;
         size_t          count;
-        unsigned int    csum;
-} skb_reader_t;
+        __wsum          csum;
+};
 
-typedef size_t (*skb_read_actor_t)(skb_reader_t *desc, void *to, size_t len);
+typedef size_t (*xdr_skb_read_actor)(struct xdr_skb_reader *desc, void *to, size_t len);
 
+size_t xdr_skb_read_bits(struct xdr_skb_reader *desc, void *to, size_t len);
 extern int csum_partial_copy_to_xdr(struct xdr_buf *, struct sk_buff *);
 extern ssize_t xdr_partial_copy_from_skb(struct xdr_buf *, unsigned int,
-                skb_reader_t *, skb_read_actor_t);
+                struct xdr_skb_reader *, xdr_skb_read_actor);
 
-extern int xdr_encode_word(struct xdr_buf *, int, u32);
-extern int xdr_decode_word(struct xdr_buf *, int, u32 *);
+extern int xdr_encode_word(struct xdr_buf *, unsigned int, u32);
+extern int xdr_decode_word(struct xdr_buf *, unsigned int, u32 *);
 
 struct xdr_array2_desc;
 typedef int (*xdr_xcode_elem_t)(struct xdr_array2_desc *desc, void *elem);
@@ -196,6 +198,7 @@ extern void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32
 extern __be32 *xdr_inline_decode(struct xdr_stream *xdr, size_t nbytes);
 extern void xdr_read_pages(struct xdr_stream *xdr, unsigned int len);
 extern void xdr_enter_page(struct xdr_stream *xdr, unsigned int len);
+extern int xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, int (*actor)(struct scatterlist *, void *), void *data);
 
 #endif /* __KERNEL__ */
 
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 60394fbc4c7..f780e72fc41 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -106,7 +106,6 @@ struct rpc_rqst {
 
 struct rpc_xprt_ops {
         void            (*set_buffer_size)(struct rpc_xprt *xprt, size_t sndsize, size_t rcvsize);
-        char *          (*print_addr)(struct rpc_xprt *xprt, enum rpc_display_format_t format);
         int             (*reserve_xprt)(struct rpc_task *task);
         void            (*release_xprt)(struct rpc_xprt *xprt, struct rpc_task *task);
         void            (*rpcbind)(struct rpc_task *task);
@@ -126,8 +125,6 @@ struct rpc_xprt_ops {
 struct rpc_xprt {
         struct kref             kref;           /* Reference count */
         struct rpc_xprt_ops *   ops;            /* transport methods */
-        struct socket *         sock;           /* BSD socket layer */
-        struct sock *           inet;           /* INET layer */
 
         struct rpc_timeout      timeout;        /* timeout parms */
         struct sockaddr_storage addr;           /* server address */
@@ -137,9 +134,6 @@ struct rpc_xprt {
         unsigned long           cong;           /* current congestion */
         unsigned long           cwnd;           /* congestion window */
 
-        size_t                  rcvsize,        /* transport rcv buffer size */
-                                sndsize;        /* transport send buffer size */
-
         size_t                  max_payload;    /* largest RPC payload size,
                                                    in bytes */
         unsigned int            tsh_size;       /* size of transport specific
@@ -158,27 +152,11 @@ struct rpc_xprt {
                                 resvport   : 1; /* use a reserved port */
 
         /*
-         * XID
-         */
-        __u32                   xid;            /* Next XID value to use */
-
-        /*
-         * State of TCP reply receive stuff
-         */
-        __be32                  tcp_recm,       /* Fragment header */
-                                tcp_xid;        /* Current XID */
-        u32                     tcp_reclen,     /* fragment length */
-                                tcp_offset;     /* fragment offset */
-        unsigned long           tcp_copied,     /* copied to request */
-                                tcp_flags;
-        /*
          * Connection of transports
          */
         unsigned long           connect_timeout,
                                 bind_timeout,
                                 reestablish_timeout;
-        struct work_struct      connect_worker;
-        unsigned short          port;
 
         /*
          * Disconnection of idle transports
@@ -193,8 +171,8 @@ struct rpc_xprt {
          */
         spinlock_t              transport_lock; /* lock transport info */
         spinlock_t              reserve_lock;   /* lock slot table */
+        u32                     xid;            /* Next XID value to use */
         struct rpc_task *       snd_task;       /* Task blocked in send */
-
         struct list_head        recv;
 
         struct {
@@ -210,18 +188,9 @@ struct rpc_xprt {
                                         bklog_u;        /* backlog queue utilization */
         } stat;
 
-        void                    (*old_data_ready)(struct sock *, int);
-        void                    (*old_state_change)(struct sock *);
-        void                    (*old_write_space)(struct sock *);
-
         char *                  address_strings[RPC_DISPLAY_MAX];
 };
 
-#define XPRT_LAST_FRAG          (1 << 0)
-#define XPRT_COPY_RECM          (1 << 1)
-#define XPRT_COPY_XID           (1 << 2)
-#define XPRT_COPY_DATA          (1 << 3)
-
 #ifdef __KERNEL__
 
 /*
@@ -270,8 +239,8 @@ void			xprt_disconnect(struct rpc_xprt *xprt);
 /*
  * Socket transport setup operations
  */
-int                     xs_setup_udp(struct rpc_xprt *xprt, struct rpc_timeout *to);
-int                     xs_setup_tcp(struct rpc_xprt *xprt, struct rpc_timeout *to);
+struct rpc_xprt *       xs_setup_udp(struct sockaddr *addr, size_t addrlen, struct rpc_timeout *to);
+struct rpc_xprt *       xs_setup_tcp(struct sockaddr *addr, size_t addrlen, struct rpc_timeout *to);
 
 /*
  * Reserved bit positions in xprt->state
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index b1237f16ecd..bf99bd49f8e 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -9,10 +9,13 @@
 #include <linux/init.h>
 #include <linux/pm.h>
 
-/* page backup entry */
+/* struct pbe is used for creating lists of pages that should be restored
+ * atomically during the resume from disk, because the page frames they have
+ * occupied before the suspend are in use.
+ */
 struct pbe {
-        unsigned long address;          /* address of the copy */
-        unsigned long orig_address;     /* original address of page */
+        void *address;          /* address of the copy */
+        void *orig_address;     /* original address of a page */
         struct pbe *next;
 };
 
diff --git a/include/linux/swap.h b/include/linux/swap.h
index e7c36ba2a2d..5423559a44a 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -218,8 +218,6 @@ extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *);
 /* linux/mm/page_io.c */
 extern int swap_readpage(struct file *, struct page *);
 extern int swap_writepage(struct page *page, struct writeback_control *wbc);
-extern int rw_swap_page_sync(int rw, swp_entry_t entry, struct page *page,
-                                struct bio **bio_chain);
 extern int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err);
 
 /* linux/mm/swap_state.c */
@@ -247,9 +245,10 @@ extern int swap_duplicate(swp_entry_t);
 extern int valid_swaphandles(swp_entry_t, unsigned long *);
 extern void swap_free(swp_entry_t);
 extern void free_swap_and_cache(swp_entry_t);
-extern int swap_type_of(dev_t);
+extern int swap_type_of(dev_t, sector_t, struct block_device **);
 extern unsigned int count_swap_pages(int, int);
 extern sector_t map_swap_page(struct swap_info_struct *, pgoff_t);
+extern sector_t swapdev_block(int, pgoff_t);
 extern struct swap_info_struct *get_swap_info_struct(unsigned);
 extern int can_share_swap_page(struct page *);
 extern int remove_exclusive_swap_page(struct page *);
@@ -259,7 +258,6 @@ extern spinlock_t swap_lock;
 
 /* linux/mm/thrash.c */
 extern struct mm_struct * swap_token_mm;
-extern unsigned long swap_token_default_timeout;
 extern void grab_swap_token(void);
 extern void __put_swap_token(struct mm_struct *);
 
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index d98562f1df7..81480e61346 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -11,7 +11,7 @@
  **  the sysctl() binary interface.  Do *NOT* change the
  **  numbering of any existing values here, and do not change
  **  any numbers within any one set of values.  If you have to
- **  have to redefine an existing interface, use a new number for it.
+ **  redefine an existing interface, use a new number for it.
  **  The kernel will then return -ENOTDIR to any application using
  **  the old binary interface.
  **
@@ -426,6 +426,8 @@ enum
         NET_CIPSOV4_CACHE_BUCKET_SIZE=119,
         NET_CIPSOV4_RBM_OPTFMT=120,
         NET_CIPSOV4_RBM_STRICTVALID=121,
+        NET_TCP_AVAIL_CONG_CONTROL=122,
+        NET_TCP_ALLOWED_CONG_CONTROL=123,
 };
 
 enum {
@@ -604,16 +606,6 @@ enum {
         NET_DCCP_DEFAULT=1,
 };
 
-/* /proc/sys/net/dccp/default */
-enum {
-        NET_DCCP_DEFAULT_SEQ_WINDOW  = 1,
-        NET_DCCP_DEFAULT_RX_CCID     = 2,
-        NET_DCCP_DEFAULT_TX_CCID     = 3,
-        NET_DCCP_DEFAULT_ACK_RATIO   = 4,
-        NET_DCCP_DEFAULT_SEND_ACKVEC = 5,
-        NET_DCCP_DEFAULT_SEND_NDP    = 6,
-};
-
 /* /proc/sys/net/ipx */
 enum {
         NET_IPX_PPROP_BROADCASTING=1,
@@ -926,8 +918,7 @@ typedef struct ctl_table ctl_table;
 
 typedef int ctl_handler (ctl_table *table, int __user *name, int nlen,
                          void __user *oldval, size_t __user *oldlenp,
-                         void __user *newval, size_t newlen, 
-                         void **context);
+                         void __user *newval, size_t newlen);
 
 typedef int proc_handler (ctl_table *ctl, int write, struct file * filp,
                           void __user *buffer, size_t *lenp, loff_t *ppos);
@@ -958,7 +949,7 @@ extern int do_sysctl (int __user *name, int nlen,
 extern int do_sysctl_strategy (ctl_table *table, 
                                int __user *name, int nlen,
                                void __user *oldval, size_t __user *oldlenp,
-                               void __user *newval, size_t newlen, void ** context);
+                               void __user *newval, size_t newlen);
 
 extern ctl_handler sysctl_string;
 extern ctl_handler sysctl_intvec;
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 6d5c43d31de..2129d1b6c87 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -97,6 +97,9 @@ extern int __must_check
 sysfs_rename_dir(struct kobject *, const char *new_name);
 
 extern int __must_check
+sysfs_move_dir(struct kobject *, struct kobject *);
+
+extern int __must_check
 sysfs_create_file(struct kobject *, const struct attribute *);
 
 extern int __must_check
@@ -142,6 +145,11 @@ static inline int sysfs_rename_dir(struct kobject * k, const char *new_name)
         return 0;
 }
 
+static inline int sysfs_move_dir(struct kobject * k, struct kobject * new_parent)
+{
+        return 0;
+}
+
 static inline int sysfs_create_file(struct kobject * k, const struct attribute * a)
 {
         return 0;
diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
index 9df8833670c..98a1d8cfb73 100644
--- a/include/linux/sysrq.h
+++ b/include/linux/sysrq.h
@@ -37,23 +37,37 @@ struct sysrq_key_op {
 
 #ifdef CONFIG_MAGIC_SYSRQ
 
+extern int sysrq_on(void);
+
+/*
+ * Do not use this one directly:
+ */
+extern int __sysrq_enabled;
+
 /* Generic SysRq interface -- you may call it from any device driver, supplying
  * ASCII code of the key, pointer to registers and kbd/tty structs (if they
  * are available -- else NULL's).
  */
 
-void handle_sysrq(int, struct tty_struct *);
-void __handle_sysrq(int, struct tty_struct *, int check_mask);
-int register_sysrq_key(int, struct sysrq_key_op *);
-int unregister_sysrq_key(int, struct sysrq_key_op *);
+void handle_sysrq(int key, struct tty_struct *tty);
+void __handle_sysrq(int key, struct tty_struct *tty, int check_mask);
+int register_sysrq_key(int key, struct sysrq_key_op *op);
+int unregister_sysrq_key(int key, struct sysrq_key_op *op);
 struct sysrq_key_op *__sysrq_get_key_op(int key);
 
 #else
 
+static inline int sysrq_on(void)
+{
+        return 0;
+}
 static inline int __reterr(void)
 {
         return -EINVAL;
 }
+static inline void handle_sysrq(int key, struct tty_struct *tty)
+{
+}
 
 #define register_sysrq_key(ig,nore) __reterr()
 #define unregister_sysrq_key(ig,nore) __reterr()
diff --git a/include/linux/task_io_accounting.h b/include/linux/task_io_accounting.h
new file mode 100644
index 00000000000..44d00e9ccee
--- /dev/null
+++ b/include/linux/task_io_accounting.h
@@ -0,0 +1,37 @@
+/*
+ * task_io_accounting: a structure which is used for recording a single task's
+ * IO statistics.
+ *
+ * Don't include this header file directly - it is designed to be dragged in via
+ * sched.h.
+ *
+ * Blame akpm@osdl.org for all this.
+ */
+
+#ifdef CONFIG_TASK_IO_ACCOUNTING
+struct task_io_accounting {
+        /*
+         * The number of bytes which this task has caused to be read from
+         * storage.
+         */
+        u64 read_bytes;
+
+        /*
+         * The number of bytes which this task has caused, or shall cause to be
+         * written to disk.
+         */
+        u64 write_bytes;
+
+        /*
+         * A task can cause "negative" IO too.  If this task truncates some
+         * dirty pagecache, some IO which another task has been accounted for
+         * (in its write_bytes) will not be happening.  We _could_ just
+         * subtract that from the truncating task's write_bytes, but there is
+         * information loss in doing that.
+         */
+        u64 cancelled_write_bytes;
+};
+#else
+struct task_io_accounting {
+};
+#endif
diff --git a/include/linux/task_io_accounting_ops.h b/include/linux/task_io_accounting_ops.h
new file mode 100644
index 00000000000..df2a319106b
--- /dev/null
+++ b/include/linux/task_io_accounting_ops.h
@@ -0,0 +1,47 @@
+/*
+ * Task I/O accounting operations
+ */
+#ifndef __TASK_IO_ACCOUNTING_OPS_INCLUDED
+#define __TASK_IO_ACCOUNTING_OPS_INCLUDED
+
+#ifdef CONFIG_TASK_IO_ACCOUNTING
+static inline void task_io_account_read(size_t bytes)
+{
+        current->ioac.read_bytes += bytes;
+}
+
+static inline void task_io_account_write(size_t bytes)
+{
+        current->ioac.write_bytes += bytes;
+}
+
+static inline void task_io_account_cancelled_write(size_t bytes)
+{
+        current->ioac.cancelled_write_bytes += bytes;
+}
+
+static inline void task_io_accounting_init(struct task_struct *tsk)
+{
+        memset(&tsk->ioac, 0, sizeof(tsk->ioac));
+}
+
+#else
+
+static inline void task_io_account_read(size_t bytes)
+{
+}
+
+static inline void task_io_account_write(size_t bytes)
+{
+}
+
+static inline void task_io_account_cancelled_write(size_t bytes)
+{
+}
+
+static inline void task_io_accounting_init(struct task_struct *tsk)
+{
+}
+
+#endif          /* CONFIG_TASK_IO_ACCOUNTING */
+#endif          /* __TASK_IO_ACCOUNTING_OPS_INCLUDED */
diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h
index 45248806ae9..3fced479825 100644
--- a/include/linux/taskstats.h
+++ b/include/linux/taskstats.h
@@ -31,7 +31,7 @@
  */
 
 
-#define TASKSTATS_VERSION       2
+#define TASKSTATS_VERSION       3
 #define TS_COMM_LEN             32      /* should be >= TASK_COMM_LEN
                                          * in linux/sched.h */
 
@@ -115,31 +115,37 @@ struct taskstats {
         __u64   ac_majflt;              /* Major Page Fault Count */
         /* Basic Accounting Fields end */
 
-        /* Extended accounting fields start */
+        /* Extended accounting fields start */
         /* Accumulated RSS usage in duration of a task, in MBytes-usecs.
          * The current rss usage is added to this counter every time
          * a tick is charged to a task's system time. So, at the end we
          * will have memory usage multiplied by system time. Thus an
          * average usage per system time unit can be calculated.
          */
-        __u64   coremem;                /* accumulated RSS usage in MB-usec */
+        __u64   coremem;                /* accumulated RSS usage in MB-usec */
         /* Accumulated virtual memory usage in duration of a task.
          * Same as acct_rss_mem1 above except that we keep track of VM usage.
          */
-        __u64   virtmem;                /* accumulated VM  usage in MB-usec */
+        __u64   virtmem;                /* accumulated VM  usage in MB-usec */
 
         /* High watermark of RSS and virtual memory usage in duration of
          * a task, in KBytes.
          */
-        __u64   hiwater_rss;            /* High-watermark of RSS usage, in KB */
-        __u64   hiwater_vm;             /* High-water VM usage, in KB */
+        __u64   hiwater_rss;            /* High-watermark of RSS usage, in KB */
+        __u64   hiwater_vm;             /* High-water VM usage, in KB */
 
         /* The following four fields are I/O statistics of a task. */
-        __u64   read_char;              /* bytes read */
-        __u64   write_char;             /* bytes written */
-        __u64   read_syscalls;          /* read syscalls */
-        __u64   write_syscalls;         /* write syscalls */
-        /* Extended accounting fields end */
+        __u64   read_char;              /* bytes read */
+        __u64   write_char;             /* bytes written */
+        __u64   read_syscalls;          /* read syscalls */
+        __u64   write_syscalls;         /* write syscalls */
+        /* Extended accounting fields end */
+
+#define TASKSTATS_HAS_IO_ACCOUNTING
+        /* Per-task storage I/O accounting starts */
+        __u64   read_bytes;             /* bytes of read I/O */
+        __u64   write_bytes;            /* bytes of write I/O */
+        __u64   cancelled_write_bytes;  /* bytes of cancelled write I/O */
 };
 
 
diff --git a/include/linux/taskstats_kern.h b/include/linux/taskstats_kern.h
index 6562a2050a2..7e9680f4afd 100644
--- a/include/linux/taskstats_kern.h
+++ b/include/linux/taskstats_kern.h
@@ -12,64 +12,27 @@
 #include <net/genetlink.h>
 
 #ifdef CONFIG_TASKSTATS
-extern kmem_cache_t *taskstats_cache;
+extern struct kmem_cache *taskstats_cache;
 extern struct mutex taskstats_exit_mutex;
 
-static inline void taskstats_exit_free(struct taskstats *tidstats)
-{
-        if (tidstats)
-                kmem_cache_free(taskstats_cache, tidstats);
-}
-
 static inline void taskstats_tgid_init(struct signal_struct *sig)
 {
         sig->stats = NULL;
 }
 
-static inline void taskstats_tgid_alloc(struct task_struct *tsk)
-{
-        struct signal_struct *sig = tsk->signal;
-        struct taskstats *stats;
-
-        if (sig->stats != NULL)
-                return;
-
-        /* No problem if kmem_cache_zalloc() fails */
-        stats = kmem_cache_zalloc(taskstats_cache, SLAB_KERNEL);
-
-        spin_lock_irq(&tsk->sighand->siglock);
-        if (!sig->stats) {
-                sig->stats = stats;
-                stats = NULL;
-        }
-        spin_unlock_irq(&tsk->sighand->siglock);
-
-        if (stats)
-                kmem_cache_free(taskstats_cache, stats);
-}
-
 static inline void taskstats_tgid_free(struct signal_struct *sig)
 {
         if (sig->stats)
                 kmem_cache_free(taskstats_cache, sig->stats);
 }
 
-extern void taskstats_exit_alloc(struct taskstats **, unsigned int *);
-extern void taskstats_exit_send(struct task_struct *, struct taskstats *, int, unsigned int);
+extern void taskstats_exit(struct task_struct *, int group_dead);
 extern void taskstats_init_early(void);
 #else
-static inline void taskstats_exit_alloc(struct taskstats **ptidstats, unsigned int *mycpu)
-{}
-static inline void taskstats_exit_free(struct taskstats *ptidstats)
-{}
-static inline void taskstats_exit_send(struct task_struct *tsk,
-                                       struct taskstats *tidstats,
-                                       int group_dead, unsigned int cpu)
+static inline void taskstats_exit(struct task_struct *tsk, int group_dead)
 {}
 static inline void taskstats_tgid_init(struct signal_struct *sig)
 {}
-static inline void taskstats_tgid_alloc(struct task_struct *tsk)
-{}
 static inline void taskstats_tgid_free(struct signal_struct *sig)
 {}
 static inline void taskstats_init_early(void)
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 2d36f6db370..3cc70d1a350 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -19,6 +19,7 @@
 
 #include <linux/types.h>
 #include <asm/byteorder.h>
+#include <linux/socket.h>
 
 struct tcphdr {
         __be16  source;
@@ -51,7 +52,7 @@ struct tcphdr {
 #error  "Adjust your <asm/byteorder.h> defines"
 #endif  
         __be16  window;
-        __be16  check;
+        __sum16 check;
         __be16  urg_ptr;
 };
 
@@ -94,6 +95,7 @@ enum {
 #define TCP_INFO                11      /* Information about this connection. */
 #define TCP_QUICKACK            12      /* Block/reenable quick acks */
 #define TCP_CONGESTION          13      /* Congestion control algorithm */
+#define TCP_MD5SIG              14      /* TCP MD5 Signature (RFC2385) */
 
 #define TCPI_OPT_TIMESTAMPS     1
 #define TCPI_OPT_SACK           2
@@ -157,6 +159,17 @@ struct tcp_info
         __u32   tcpi_total_retrans;
 };
 
+/* for TCP_MD5SIG socket option */
+#define TCP_MD5SIG_MAXKEYLEN    80
+
+struct tcp_md5sig {
+        struct __kernel_sockaddr_storage tcpm_addr;     /* address associated */
+        __u16   __tcpm_pad1;                            /* zero */
+        __u16   tcpm_keylen;                            /* key length */
+        __u32   __tcpm_pad2;                            /* zero */
+        __u8    tcpm_key[TCP_MD5SIG_MAXKEYLEN];         /* key (binary) */
+};
+
 #ifdef __KERNEL__
 
 #include <linux/skbuff.h>
@@ -172,17 +185,17 @@ struct tcp_sack_block_wire {
 };
 
 struct tcp_sack_block {
-        __u32   start_seq;
-        __u32   end_seq;
+        u32     start_seq;
+        u32     end_seq;
 };
 
 struct tcp_options_received {
 /*      PAWS/RTTM data  */
         long    ts_recent_stamp;/* Time we stored ts_recent (for aging) */
-        __u32   ts_recent;      /* Time stamp to echo next              */
-        __u32   rcv_tsval;      /* Time stamp value                     */
-        __u32   rcv_tsecr;      /* Time stamp echo reply                */
-        __u16   saw_tstamp : 1, /* Saw TIMESTAMP on last packet         */
+        u32     ts_recent;      /* Time stamp to echo next              */
+        u32     rcv_tsval;      /* Time stamp value                     */
+        u32     rcv_tsecr;      /* Time stamp echo reply                */
+        u16     saw_tstamp : 1, /* Saw TIMESTAMP on last packet         */
                 tstamp_ok : 1,  /* TIMESTAMP seen on SYN packet         */
                 dsack : 1,      /* D-SACK is scheduled                  */
                 wscale_ok : 1,  /* Wscale seen on SYN packet            */
@@ -190,16 +203,20 @@ struct tcp_options_received {
                 snd_wscale : 4, /* Window scaling received from sender  */
                 rcv_wscale : 4; /* Window scaling to send to receiver   */
 /*      SACKs data      */
-        __u8    eff_sacks;      /* Size of SACK array to send with next packet */
-        __u8    num_sacks;      /* Number of SACK blocks                */
-        __u16   user_mss;       /* mss requested by user in ioctl */
-        __u16   mss_clamp;      /* Maximal mss, negotiated at connection setup */
+        u8      eff_sacks;      /* Size of SACK array to send with next packet */
+        u8      num_sacks;      /* Number of SACK blocks                */
+        u16     user_mss;       /* mss requested by user in ioctl */
+        u16     mss_clamp;      /* Maximal mss, negotiated at connection setup */
 };
 
 struct tcp_request_sock {
-        struct inet_request_sock req;
-        __u32                    rcv_isn;
-        __u32                    snt_isn;
+        struct inet_request_sock        req;
+#ifdef CONFIG_TCP_MD5SIG
+        /* Only used by TCP MD5 Signature so far. */
+        struct tcp_request_sock_ops     *af_specific;
+#endif
+        u32                             rcv_isn;
+        u32                             snt_isn;
 };
 
 static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)
@@ -210,7 +227,8 @@ static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)
 struct tcp_sock {
         /* inet_connection_sock has to be the first member of tcp_sock */
         struct inet_connection_sock     inet_conn;
-        int     tcp_header_len; /* Bytes of tcp header to send          */
+        u16     tcp_header_len; /* Bytes of tcp header to send          */
+        u16     xmit_size_goal; /* Goal for segmenting output packets   */
 
 /*
  *      Header prediction flags
@@ -223,13 +241,13 @@ struct tcp_sock {
  *      read the code and the spec side by side (and laugh ...)
  *      See RFC793 and RFC1122. The RFC writes these in capitals.
  */
-        __u32   rcv_nxt;        /* What we want to receive next         */
-        __u32   snd_nxt;        /* Next sequence we send                */
+        u32     rcv_nxt;        /* What we want to receive next         */
+        u32     snd_nxt;        /* Next sequence we send                */
 
-        __u32   snd_una;        /* First byte we want an ack for        */
-        __u32   snd_sml;        /* Last byte of the most recently transmitted small packet */
-        __u32   rcv_tstamp;     /* timestamp of last received ACK (for keepalives) */
-        __u32   lsndtime;       /* timestamp of last sent data packet (for restart window) */
+        u32     snd_una;        /* First byte we want an ack for        */
+        u32     snd_sml;        /* Last byte of the most recently transmitted small packet */
+        u32     rcv_tstamp;     /* timestamp of last received ACK (for keepalives) */
+        u32     lsndtime;       /* timestamp of last sent data packet (for restart window) */
 
         /* Data for direct copy to user */
         struct {
@@ -247,32 +265,30 @@ struct tcp_sock {
 #endif
         } ucopy;
 
-        __u32   snd_wl1;        /* Sequence for window update           */
-        __u32   snd_wnd;        /* The window we expect to receive      */
-        __u32   max_window;     /* Maximal window ever seen from peer   */
-        __u32   mss_cache;      /* Cached effective mss, not including SACKS */
-        __u16   xmit_size_goal; /* Goal for segmenting output packets   */
-        /* XXX Two bytes hole, try to pack */
+        u32     snd_wl1;        /* Sequence for window update           */
+        u32     snd_wnd;        /* The window we expect to receive      */
+        u32     max_window;     /* Maximal window ever seen from peer   */
+        u32     mss_cache;      /* Cached effective mss, not including SACKS */
 
-        __u32   window_clamp;   /* Maximal window to advertise          */
-        __u32   rcv_ssthresh;   /* Current window clamp                 */
+        u32     window_clamp;   /* Maximal window to advertise          */
+        u32     rcv_ssthresh;   /* Current window clamp                 */
 
-        __u32   frto_highmark;  /* snd_nxt when RTO occurred */
-        __u8    reordering;     /* Packet reordering metric.            */
-        __u8    frto_counter;   /* Number of new acks after RTO */
-        __u8    nonagle;        /* Disable Nagle algorithm?             */
-        __u8    keepalive_probes; /* num of allowed keep alive probes   */
+        u32     frto_highmark;  /* snd_nxt when RTO occurred */
+        u8      reordering;     /* Packet reordering metric.            */
+        u8      frto_counter;   /* Number of new acks after RTO */
+        u8      nonagle;        /* Disable Nagle algorithm?             */
+        u8      keepalive_probes; /* num of allowed keep alive probes   */
 
 /* RTT measurement */
-        __u32   srtt;           /* smoothed round trip time << 3        */
-        __u32   mdev;           /* medium deviation                     */
-        __u32   mdev_max;       /* maximal mdev for the last rtt period */
-        __u32   rttvar;         /* smoothed mdev_max                    */
-        __u32   rtt_seq;        /* sequence number to update rttvar     */
-
-        __u32   packets_out;    /* Packets which are "in flight"        */
-        __u32   left_out;       /* Packets which leaved network */
-        __u32   retrans_out;    /* Retransmitted packets out            */
+        u32     srtt;           /* smoothed round trip time << 3        */
+        u32     mdev;           /* medium deviation                     */
+        u32     mdev_max;       /* maximal mdev for the last rtt period */
+        u32     rttvar;         /* smoothed mdev_max                    */
+        u32     rtt_seq;        /* sequence number to update rttvar     */
+
+        u32     packets_out;    /* Packets which are "in flight"        */
+        u32     left_out;       /* Packets which leaved network */
+        u32     retrans_out;    /* Retransmitted packets out            */
 /*
  *      Options received (usually on last packet, some only on SYN packets).
  */
@@ -281,20 +297,20 @@ struct tcp_sock {
 /*
  *      Slow start and congestion control (see also Nagle, and Karn & Partridge)
  */
-        __u32   snd_ssthresh;   /* Slow start size threshold            */
-        __u32   snd_cwnd;       /* Sending congestion window            */
-        __u16   snd_cwnd_cnt;   /* Linear increase counter              */
-        __u16   snd_cwnd_clamp; /* Do not allow snd_cwnd to grow above this */
-        __u32   snd_cwnd_used;
-        __u32   snd_cwnd_stamp;
+        u32     snd_ssthresh;   /* Slow start size threshold            */
+        u32     snd_cwnd;       /* Sending congestion window            */
+        u16     snd_cwnd_cnt;   /* Linear increase counter              */
+        u16     snd_cwnd_clamp; /* Do not allow snd_cwnd to grow above this */
+        u32     snd_cwnd_used;
+        u32     snd_cwnd_stamp;
 
         struct sk_buff_head     out_of_order_queue; /* Out of order segments go here */
 
-        __u32   rcv_wnd;        /* Current receiver window              */
-        __u32   rcv_wup;        /* rcv_nxt on last window update sent   */
-        __u32   write_seq;      /* Tail(+1) of data held in tcp send buffer */
-        __u32   pushed_seq;     /* Last pushed seq, required to talk to windows */
-        __u32   copied_seq;     /* Head of yet unread data              */
+        u32     rcv_wnd;        /* Current receiver window              */
+        u32     rcv_wup;        /* rcv_nxt on last window update sent   */
+        u32     write_seq;      /* Tail(+1) of data held in tcp send buffer */
+        u32     pushed_seq;     /* Last pushed seq, required to talk to windows */
+        u32     copied_seq;     /* Head of yet unread data              */
 
 /*      SACKs data      */
         struct tcp_sack_block duplicate_sack[1]; /* D-SACK block */
@@ -315,26 +331,26 @@ struct tcp_sock {
         int     retransmit_cnt_hint;
         int     forward_cnt_hint;
 
-        __u16   advmss;         /* Advertised MSS                       */
-        __u16   prior_ssthresh; /* ssthresh saved at recovery start     */
-        __u32   lost_out;       /* Lost packets                 */
-        __u32   sacked_out;     /* SACK'd packets                       */
-        __u32   fackets_out;    /* FACK'd packets                       */
-        __u32   high_seq;       /* snd_nxt at onset of congestion       */
+        u16     advmss;         /* Advertised MSS                       */
+        u16     prior_ssthresh; /* ssthresh saved at recovery start     */
+        u32     lost_out;       /* Lost packets                 */
+        u32     sacked_out;     /* SACK'd packets                       */
+        u32     fackets_out;    /* FACK'd packets                       */
+        u32     high_seq;       /* snd_nxt at onset of congestion       */
 
-        __u32   retrans_stamp;  /* Timestamp of the last retransmit,
+        u32     retrans_stamp;  /* Timestamp of the last retransmit,
                                  * also used in SYN-SENT to remember stamp of
                                  * the first SYN. */
-        __u32   undo_marker;    /* tracking retrans started here. */
+        u32     undo_marker;    /* tracking retrans started here. */
         int     undo_retrans;   /* number of undoable retransmissions. */
-        __u32   urg_seq;        /* Seq of received urgent pointer */
-        __u16   urg_data;       /* Saved octet of OOB data and control flags */
-        __u8    urg_mode;       /* In urgent mode               */
-        __u8    ecn_flags;      /* ECN status bits.                     */
-        __u32   snd_up;         /* Urgent pointer               */
+        u32     urg_seq;        /* Seq of received urgent pointer */
+        u16     urg_data;       /* Saved octet of OOB data and control flags */
+        u8      urg_mode;       /* In urgent mode               */
+        u8      ecn_flags;      /* ECN status bits.                     */
+        u32     snd_up;         /* Urgent pointer               */
 
-        __u32   total_retrans;  /* Total retransmits for entire connection */
-        __u32   bytes_acked;    /* Appropriate Byte Counting - RFC3465 */
+        u32     total_retrans;  /* Total retransmits for entire connection */
+        u32     bytes_acked;    /* Appropriate Byte Counting - RFC3465 */
 
         unsigned int            keepalive_time;   /* time before keep alive takes place */
         unsigned int            keepalive_intvl;  /* time interval between keep alive probes */
@@ -342,27 +358,35 @@ struct tcp_sock {
 
         unsigned long last_synq_overflow; 
 
-        __u32   tso_deferred;
+        u32     tso_deferred;
 
 /* Receiver side RTT estimation */
         struct {
-                __u32   rtt;
-                __u32   seq;
-                __u32   time;
+                u32     rtt;
+                u32     seq;
+                u32     time;
         } rcv_rtt_est;
 
 /* Receiver queue space */
         struct {
                 int     space;
-                __u32   seq;
-                __u32   time;
+                u32     seq;
+                u32     time;
         } rcvq_space;
 
 /* TCP-specific MTU probe information. */
         struct {
-                __u32             probe_seq_start;
-                __u32             probe_seq_end;
+                u32               probe_seq_start;
+                u32               probe_seq_end;
         } mtu_probe;
+
+#ifdef CONFIG_TCP_MD5SIG
+/* TCP AF-Specific parts; only used by MD5 Signature support so far */
+        struct tcp_sock_af_ops  *af_specific;
+
+/* TCP MD5 Signagure Option information */
+        struct tcp_md5sig_info  *md5sig_info;
+#endif
 };
 
 static inline struct tcp_sock *tcp_sk(const struct sock *sk)
@@ -372,11 +396,15 @@ static inline struct tcp_sock *tcp_sk(const struct sock *sk)
 
 struct tcp_timewait_sock {
         struct inet_timewait_sock tw_sk;
-        __u32                     tw_rcv_nxt;
-        __u32                     tw_snd_nxt;
-        __u32                     tw_rcv_wnd;
-        __u32                     tw_ts_recent;
+        u32                       tw_rcv_nxt;
+        u32                       tw_snd_nxt;
+        u32                       tw_rcv_wnd;
+        u32                       tw_ts_recent;
         long                      tw_ts_recent_stamp;
+#ifdef CONFIG_TCP_MD5SIG
+        u16                       tw_md5_keylen;
+        u8                        tw_md5_key[TCP_MD5SIG_MAXKEYLEN];
+#endif
 };
 
 static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
diff --git a/include/linux/textsearch.h b/include/linux/textsearch.h
index 7dac8f04d28..004808a6df1 100644
--- a/include/linux/textsearch.h
+++ b/include/linux/textsearch.h
@@ -20,7 +20,7 @@ struct ts_config;
 /**
  * struct ts_state - search state
  * @offset: offset for next match
- * @cb: control buffer, for persistant variables of get_next_block()
+ * @cb: control buffer, for persistent variables of get_next_block()
  */
 struct ts_state
 {
@@ -71,7 +71,7 @@ struct ts_config
          * Called repeatedly until 0 is returned. Must assign the
          * head of the next block of data to &*dst and return the length
          * of the block or 0 if at the end. consumed == 0 indicates
-         * a new search. May store/read persistant values in state->cb.
+         * a new search. May store/read persistent values in state->cb.
          */
         unsigned int            (*get_next_block)(unsigned int consumed,
                                                   const u8 **dst,
diff --git a/include/linux/tfrc.h b/include/linux/tfrc.h
index 7dab7831c3c..8a8462b4a4d 100644
--- a/include/linux/tfrc.h
+++ b/include/linux/tfrc.h
@@ -1,7 +1,8 @@
 #ifndef _LINUX_TFRC_H_
 #define _LINUX_TFRC_H_
 /*
- *  include/linux/tfrc.h
+ *  TFRC - Data Structures for the TCP-Friendly Rate Control congestion
+ *         control mechanism as specified in RFC 3448.
  *
  *  Copyright (c) 2005 The University of Waikato, Hamilton, New Zealand.
  *  Copyright (c) 2005 Ian McDonald <iam4@cs.waikato.ac.nz>
@@ -13,18 +14,37 @@
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  */
-
 #include <linux/types.h>
 
+/**     tfrc_rx_info    -    TFRC Receiver Data Structure
+ *
+ *      @tfrcrx_x_recv: receiver estimate of sending rate (3.2.2)
+ *      @tfrcrx_rtt:    round-trip-time (communicated by sender)
+ *      @tfrcrx_p:      current estimate of loss event rate (3.2.2)
+ */
 struct tfrc_rx_info {
         __u32 tfrcrx_x_recv;
         __u32 tfrcrx_rtt;
         __u32 tfrcrx_p;
 };
 
+/**     tfrc_tx_info    -    TFRC Sender Data Structure
+ *
+ *      @tfrctx_x:      computed transmit rate (4.3 (4))
+ *      @tfrctx_x_recv: receiver estimate of send rate (4.3)
+ *      @tfrctx_x_calc: return value of throughput equation (3.1)
+ *      @tfrctx_rtt:    (moving average) estimate of RTT (4.3)
+ *      @tfrctx_p:      current loss event rate (5.4)
+ *      @tfrctx_rto:    estimate of RTO, equals 4*RTT (4.3)
+ *      @tfrctx_ipi:    inter-packet interval (4.6)
+ *
+ *  Note: X and X_recv are both maintained in units of 64 * bytes/second. This
+ *        enables a finer resolution of sending rates and avoids problems with
+ *        integer arithmetic; u32 is not sufficient as scaling consumes 6 bits.
+ */
 struct tfrc_tx_info {
-        __u32 tfrctx_x;
-        __u32 tfrctx_x_recv;
+        __u64 tfrctx_x;
+        __u64 tfrctx_x_recv;
         __u32 tfrctx_x_calc;
         __u32 tfrctx_rtt;
         __u32 tfrctx_p;
diff --git a/include/linux/timer.h b/include/linux/timer.h
index c982304dbaf..eeef6643d4c 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -98,4 +98,10 @@ extern void run_local_timers(void);
 struct hrtimer;
 extern int it_real_fn(struct hrtimer *);
 
+unsigned long __round_jiffies(unsigned long j, int cpu);
+unsigned long __round_jiffies_relative(unsigned long j, int cpu);
+unsigned long round_jiffies(unsigned long j);
+unsigned long round_jiffies_relative(unsigned long j);
+
+
 #endif
diff --git a/include/linux/tipc_config.h b/include/linux/tipc_config.h
index 33a653913d9..b0c916d1f37 100644
--- a/include/linux/tipc_config.h
+++ b/include/linux/tipc_config.h
@@ -194,34 +194,34 @@
 
 
 struct tipc_node_info {
-        __u32 addr;                     /* network address of node */
-        __u32 up;                       /* 0=down, 1= up */
+        __be32 addr;                    /* network address of node */
+        __be32 up;                      /* 0=down, 1= up */
 };
 
 struct tipc_link_info {
-        __u32 dest;                     /* network address of peer node */
-        __u32 up;                       /* 0=down, 1=up */
+        __be32 dest;                    /* network address of peer node */
+        __be32 up;                      /* 0=down, 1=up */
         char str[TIPC_MAX_LINK_NAME];   /* link name */
 };
 
 struct tipc_bearer_config {
-        __u32 priority;                 /* Range [1,31]. Override per link  */
-        __u32 detect_scope;     
+        __be32 priority;                /* Range [1,31]. Override per link  */
+        __be32 detect_scope;
         char name[TIPC_MAX_BEARER_NAME];
 };
 
 struct tipc_link_config {
-        __u32 value;
+        __be32 value;
         char name[TIPC_MAX_LINK_NAME];
 };
 
 #define TIPC_NTQ_ALLTYPES 0x80000000
 
 struct tipc_name_table_query {
-        __u32 depth;    /* 1:type, 2:+name info, 3:+port info, 4+:+debug info */
-        __u32 type;     /* {t,l,u} info ignored if high bit of "depth" is set */
-        __u32 lowbound; /* (i.e. displays all entries of name table) */
-        __u32 upbound;
+        __be32 depth;   /* 1:type, 2:+name info, 3:+port info, 4+:+debug info */
+        __be32 type;    /* {t,l,u} info ignored if high bit of "depth" is set */
+        __be32 lowbound; /* (i.e. displays all entries of name table) */
+        __be32 upbound;
 };
 
 /*
@@ -262,8 +262,8 @@ struct tipc_route_info {
  */
 
 struct tlv_desc {
-        __u16 tlv_len;          /* TLV length (descriptor + value) */
-        __u16 tlv_type;         /* TLV identifier */
+        __be16 tlv_len;         /* TLV length (descriptor + value) */
+        __be16 tlv_type;                /* TLV identifier */
 };
 
 #define TLV_ALIGNTO 4
@@ -377,9 +377,9 @@ struct tipc_genlmsghdr {
 
 struct tipc_cfg_msg_hdr
 {
-        __u32 tcm_len;          /* Message length (including header) */
-        __u16 tcm_type;         /* Command type */
-        __u16 tcm_flags;        /* Additional flags */
+        __be32 tcm_len;         /* Message length (including header) */
+        __be16 tcm_type;        /* Command type */
+        __be16 tcm_flags;       /* Additional flags */
         char  tcm_reserved[8];  /* Unused */
 };
 
diff --git a/include/linux/topology.h b/include/linux/topology.h
index da508d1998e..6c5a6e6e813 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -93,7 +93,7 @@
         .groups                 = NULL,                 \
         .min_interval           = 1,                    \
         .max_interval           = 2,                    \
-        .busy_factor            = 8,                    \
+        .busy_factor            = 64,                   \
         .imbalance_pct          = 110,                  \
         .cache_nice_tries       = 0,                    \
         .per_cpu_gain           = 25,                   \
@@ -194,7 +194,8 @@
         .wake_idx               = 0, /* unused */       \
         .forkexec_idx           = 0, /* unused */       \
         .per_cpu_gain           = 100,                  \
-        .flags                  = SD_LOAD_BALANCE,      \
+        .flags                  = SD_LOAD_BALANCE       \
+                                | SD_SERIALIZE, \
         .last_balance           = jiffies,              \
         .balance_interval       = 64,                   \
         .nr_balance_failed      = 0,                    \
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 44091c0db0b..65cbcf22c31 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -53,7 +53,7 @@ struct tty_buffer {
 };
 
 struct tty_bufhead {
-        struct work_struct              work;
+        struct delayed_work work;
         struct semaphore pty_sem;
         spinlock_t lock;
         struct tty_buffer *head;        /* Queue head */
@@ -175,7 +175,7 @@ struct tty_struct {
         int index;
         struct tty_ldisc ldisc;
         struct mutex termios_mutex;
-        struct termios *termios, *termios_locked;
+        struct ktermios *termios, *termios_locked;
         char name[64];
         int pgrp;
         int session;
@@ -258,7 +258,7 @@ struct tty_struct {
 
 extern void tty_write_flush(struct tty_struct *);
 
-extern struct termios tty_std_termios;
+extern struct ktermios tty_std_termios;
 
 extern int kmsg_redirect;
 
@@ -276,9 +276,8 @@ extern int tty_register_ldisc(int disc, struct tty_ldisc *new_ldisc);
 extern int tty_unregister_ldisc(int disc);
 extern int tty_register_driver(struct tty_driver *driver);
 extern int tty_unregister_driver(struct tty_driver *driver);
-extern struct class_device *tty_register_device(struct tty_driver *driver,
-                                                unsigned index,
-                                                struct device *dev);
+extern struct device *tty_register_device(struct tty_driver *driver,
+                                          unsigned index, struct device *dev);
 extern void tty_unregister_device(struct tty_driver *driver, unsigned index);
 extern int tty_read_raw_data(struct tty_struct *tty, unsigned char *bufp,
                              int buflen);
@@ -294,8 +293,9 @@ extern int tty_hung_up_p(struct file * filp);
 extern void do_SAK(struct tty_struct *tty);
 extern void disassociate_ctty(int priv);
 extern void tty_flip_buffer_push(struct tty_struct *tty);
-extern int tty_get_baud_rate(struct tty_struct *tty);
-extern int tty_termios_baud_rate(struct termios *termios);
+extern speed_t tty_get_baud_rate(struct tty_struct *tty);
+extern speed_t tty_termios_baud_rate(struct ktermios *termios);
+extern speed_t tty_termios_input_baud_rate(struct ktermios *termios);
 
 extern struct tty_ldisc *tty_ldisc_ref(struct tty_struct *);
 extern void tty_ldisc_deref(struct tty_ldisc *);
@@ -310,6 +310,12 @@ extern void tty_ldisc_flush(struct tty_struct *tty);
 extern int tty_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                      unsigned long arg);
 
+extern dev_t tty_devnum(struct tty_struct *tty);
+extern void proc_clear_tty(struct task_struct *p);
+extern void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
+extern void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
+extern struct tty_struct *get_current_tty(void);
+
 extern struct mutex tty_mutex;
 
 /* n_tty.c */
@@ -336,10 +342,5 @@ extern void console_print(const char *);
 extern int vt_ioctl(struct tty_struct *tty, struct file * file,
                     unsigned int cmd, unsigned long arg);
 
-static inline dev_t tty_devnum(struct tty_struct *tty)
-{
-        return MKDEV(tty->driver->major, tty->driver->minor_start) + tty->index;
-}
-
 #endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 5c8473bb688..659487e3ebe 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -53,7 +53,7 @@
  *      device-specific ioctl's.  If the ioctl number passed in cmd
  *      is not recognized by the driver, it should return ENOIOCTLCMD.
  * 
- * void (*set_termios)(struct tty_struct *tty, struct termios * old);
+ * void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
  *
  *      This routine allows the tty driver to be notified when
  *      device's termios settings have changed.  Note that a
@@ -132,7 +132,7 @@ struct tty_operations {
         int  (*chars_in_buffer)(struct tty_struct *tty);
         int  (*ioctl)(struct tty_struct *tty, struct file * file,
                     unsigned int cmd, unsigned long arg);
-        void (*set_termios)(struct tty_struct *tty, struct termios * old);
+        void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
         void (*throttle)(struct tty_struct * tty);
         void (*unthrottle)(struct tty_struct * tty);
         void (*stop)(struct tty_struct *tty);
@@ -165,7 +165,7 @@ struct tty_driver {
         int     num;            /* number of devices allocated */
         short   type;           /* type of tty driver */
         short   subtype;        /* subtype of tty driver */
-        struct termios init_termios; /* Initial termios */
+        struct ktermios init_termios; /* Initial termios */
         int     flags;          /* tty driver flags */
         int     refcount;       /* for loadable tty drivers */
         struct proc_dir_entry *proc_entry; /* /proc fs entry */
@@ -175,8 +175,8 @@ struct tty_driver {
          * Pointer to the tty data structures
          */
         struct tty_struct **ttys;
-        struct termios **termios;
-        struct termios **termios_locked;
+        struct ktermios **termios;
+        struct ktermios **termios_locked;
         void *driver_state;     /* only used for the PTY driver */
         
         /*
@@ -193,7 +193,7 @@ struct tty_driver {
         int  (*chars_in_buffer)(struct tty_struct *tty);
         int  (*ioctl)(struct tty_struct *tty, struct file * file,
                     unsigned int cmd, unsigned long arg);
-        void (*set_termios)(struct tty_struct *tty, struct termios * old);
+        void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
         void (*throttle)(struct tty_struct * tty);
         void (*unthrottle)(struct tty_struct * tty);
         void (*stop)(struct tty_struct *tty);
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 83c6e6c10eb..d75932e2771 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -59,7 +59,7 @@
  *      low-level driver can "grab" an ioctl request before the line
  *      discpline has a chance to see it.
  * 
- * void (*set_termios)(struct tty_struct *tty, struct termios * old);
+ * void (*set_termios)(struct tty_struct *tty, struct ktermios * old);
  *
  *      This function notifies the line discpline that a change has
  *      been made to the termios structure.
@@ -118,7 +118,7 @@ struct tty_ldisc {
                          const unsigned char * buf, size_t nr); 
         int     (*ioctl)(struct tty_struct * tty, struct file * file,
                          unsigned int cmd, unsigned long arg);
-        void    (*set_termios)(struct tty_struct *tty, struct termios * old);
+        void    (*set_termios)(struct tty_struct *tty, struct ktermios * old);
         unsigned int (*poll)(struct tty_struct *, struct file *,
                              struct poll_table_struct *);
         int     (*hangup)(struct tty_struct *tty);
diff --git a/include/linux/types.h b/include/linux/types.h
index 750f085fa56..0351bf2fac8 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -128,21 +128,27 @@ typedef		__s64		int64_t;
 
 /* this is a special 64bit data type that is 8-byte aligned */
 #define aligned_u64 unsigned long long __attribute__((aligned(8)))
+#define aligned_be64 __be64 __attribute__((aligned(8)))
+#define aligned_le64 __le64 __attribute__((aligned(8)))
 
 /**
  * The type used for indexing onto a disc or disc partition.
  *
  * Linux always considers sectors to be 512 bytes long independently
  * of the devices real block size.
- *
- * If required, asm/types.h can override it and define
- * HAVE_SECTOR_T
  */
-#ifndef HAVE_SECTOR_T
+#ifdef CONFIG_LBD
+typedef u64 sector_t;
+#else
 typedef unsigned long sector_t;
 #endif
 
-#ifndef HAVE_BLKCNT_T
+/*
+ * The type of the inode's block count.
+ */
+#ifdef CONFIG_LSF
+typedef u64 blkcnt_t;
+#else
 typedef unsigned long blkcnt_t;
 #endif
 
@@ -180,6 +186,8 @@ typedef __u32 __bitwise __be32;
 typedef __u64 __bitwise __le64;
 typedef __u64 __bitwise __be64;
 #endif
+typedef __u16 __bitwise __sum16;
+typedef __u32 __bitwise __wsum;
 
 #ifdef __KERNEL__
 typedef unsigned __bitwise__ gfp_t;
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index a48d7f11c7b..975c963e578 100644
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -1,8 +1,43 @@
 #ifndef __LINUX_UACCESS_H__
 #define __LINUX_UACCESS_H__
 
+#include <linux/preempt.h>
 #include <asm/uaccess.h>
 
+/*
+ * These routines enable/disable the pagefault handler in that
+ * it will not take any locks and go straight to the fixup table.
+ *
+ * They have great resemblance to the preempt_disable/enable calls
+ * and in fact they are identical; this is because currently there is
+ * no other way to make the pagefault handlers do this. So we do
+ * disable preemption but we don't necessarily care about that.
+ */
+static inline void pagefault_disable(void)
+{
+        inc_preempt_count();
+        /*
+         * make sure to have issued the store before a pagefault
+         * can hit.
+         */
+        barrier();
+}
+
+static inline void pagefault_enable(void)
+{
+        /*
+         * make sure to issue those last loads/stores before enabling
+         * the pagefault handler again.
+         */
+        barrier();
+        dec_preempt_count();
+        /*
+         * make sure we do..
+         */
+        barrier();
+        preempt_check_resched();
+}
+
 #ifndef ARCH_HAS_NOCACHE_UACCESS
 
 static inline unsigned long __copy_from_user_inatomic_nocache(void *to,
@@ -30,14 +65,22 @@ static inline unsigned long __copy_from_user_nocache(void *to,
  * do_page_fault() doesn't attempt to take mmap_sem.  This makes
  * probe_kernel_address() suitable for use within regions where the caller
  * already holds mmap_sem, or other locks which nest inside mmap_sem.
+ * This must be a macro because __get_user() needs to know the types of the
+ * args.
+ *
+ * We don't include enough header files to be able to do the set_fs().  We
+ * require that the probe_kernel_address() caller will do that.
  */
 #define probe_kernel_address(addr, retval)              \
         ({                                              \
                 long ret;                               \
+                mm_segment_t old_fs = get_fs();         \
                                                         \
-                inc_preempt_count();                    \
-                ret = __get_user(retval, addr);         \
-                dec_preempt_count();                    \
+                set_fs(KERNEL_DS);                      \
+                pagefault_disable();                    \
+                ret = __get_user(retval, (__force typeof(retval) __user *)(addr));              \
+                pagefault_enable();                     \
+                set_fs(old_fs);                         \
                 ret;                                    \
         })
 
diff --git a/include/linux/udp.h b/include/linux/udp.h
index 014b41d1e30..7e08c07efe0 100644
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -23,7 +23,7 @@ struct udphdr {
         __be16  source;
         __be16  dest;
         __be16  len;
-        __be16  check;
+        __sum16 check;
 };
 
 /* UDP socket options */
@@ -38,6 +38,7 @@ struct udphdr {
 #include <linux/types.h>
 
 #include <net/inet_sock.h>
+#define UDP_HTABLE_SIZE         128
 
 struct udp_sock {
         /* inet_sock has to be the first member */
@@ -50,12 +51,23 @@ struct udp_sock {
          * when the socket is uncorked.
          */
         __u16            len;           /* total length of pending frames */
+        /*
+         * Fields specific to UDP-Lite.
+         */
+        __u16            pcslen;
+        __u16            pcrlen;
+/* indicator bits used by pcflag: */
+#define UDPLITE_BIT      0x1            /* set by udplite proto init function */
+#define UDPLITE_SEND_CC  0x2            /* set via udplite setsockopt         */
+#define UDPLITE_RECV_CC  0x4            /* set via udplite setsocktopt        */
+        __u8             pcflag;        /* marks socket as UDP-Lite if > 0    */
 };
 
 static inline struct udp_sock *udp_sk(const struct sock *sk)
 {
         return (struct udp_sock *)sk;
 }
+#define IS_UDPLITE(__sk) (udp_sk(__sk)->pcflag)
 
 #endif
 
diff --git a/include/linux/unwind.h b/include/linux/unwind.h
index 749928c161f..7760860fa17 100644
--- a/include/linux/unwind.h
+++ b/include/linux/unwind.h
@@ -14,63 +14,6 @@
 
 struct module;
 
-#ifdef CONFIG_STACK_UNWIND
-
-#include <asm/unwind.h>
-
-#ifndef ARCH_UNWIND_SECTION_NAME
-#define ARCH_UNWIND_SECTION_NAME ".eh_frame"
-#endif
-
-/*
- * Initialize unwind support.
- */
-extern void unwind_init(void);
-extern void unwind_setup(void);
-
-#ifdef CONFIG_MODULES
-
-extern void *unwind_add_table(struct module *,
-                              const void *table_start,
-                              unsigned long table_size);
-
-extern void unwind_remove_table(void *handle, int init_only);
-
-#endif
-
-extern int unwind_init_frame_info(struct unwind_frame_info *,
-                                  struct task_struct *,
-                                  /*const*/ struct pt_regs *);
-
-/*
- * Prepare to unwind a blocked task.
- */
-extern int unwind_init_blocked(struct unwind_frame_info *,
-                               struct task_struct *);
-
-/*
- * Prepare to unwind the currently running thread.
- */
-extern int unwind_init_running(struct unwind_frame_info *,
-                               asmlinkage int (*callback)(struct unwind_frame_info *,
-                                                          void *arg),
-                               void *arg);
-
-/*
- * Unwind to previous to frame.  Returns 0 if successful, negative
- * number in case of an error.
- */
-extern int unwind(struct unwind_frame_info *);
-
-/*
- * Unwind until the return pointer is in user-land (or until an error
- * occurs).  Returns 0 if successful, negative number in case of
- * error.
- */
-extern int unwind_to_user(struct unwind_frame_info *);
-
-#else
-
 struct unwind_frame_info {};
 
 static inline void unwind_init(void) {}
@@ -85,12 +28,12 @@ static inline void *unwind_add_table(struct module *mod,
         return NULL;
 }
 
-#endif
-
 static inline void unwind_remove_table(void *handle, int init_only)
 {
 }
 
+#endif
+
 static inline int unwind_init_frame_info(struct unwind_frame_info *info,
                                          struct task_struct *tsk,
                                          const struct pt_regs *regs)
@@ -122,6 +65,4 @@ static inline int unwind_to_user(struct unwind_frame_info *info)
         return -ENOSYS;
 }
 
-#endif
-
 #endif /* _LINUX_UNWIND_H */
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 5482bfb3303..aab5b1b7202 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -313,8 +313,13 @@ struct usb_bus {
 /* This is arbitrary.
  * From USB 2.0 spec Table 11-13, offset 7, a hub can
  * have up to 255 ports. The most yet reported is 10.
+ *
+ * Current Wireless USB host hardware (Intel i1480 for example) allows
+ * up to 22 devices to connect. Upcoming hardware might raise that
+ * limit. Because the arrays need to add a bit for hub status data, we
+ * do 31, so plus one evens out to four bytes.
  */
-#define USB_MAXCHILDREN         (16)
+#define USB_MAXCHILDREN         (31)
 
 struct usb_tt;
 
@@ -357,7 +362,8 @@ struct usb_device {
         u8 portnum;                     /* Parent port number (origin 1) */
         u8 level;                       /* Number of USB hub ancestors */
 
-        int have_langid;                /* whether string_langid is valid */
+        unsigned discon_suspended:1;    /* Disconnected while suspended */
+        unsigned have_langid:1;         /* whether string_langid is valid */
         int string_langid;              /* language ID for strings */
 
         /* static strings from the device */
@@ -382,7 +388,7 @@ struct usb_device {
 
         int pm_usage_cnt;               /* usage counter for autosuspend */
 #ifdef CONFIG_PM
-        struct work_struct autosuspend; /* for delayed autosuspends */
+        struct delayed_work autosuspend; /* for delayed autosuspends */
         struct mutex pm_mutex;          /* protects PM operations */
 
         unsigned auto_pm:1;             /* autosuspend/resume in progress */
@@ -410,14 +416,37 @@ extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id);
 
 /* USB autosuspend and autoresume */
 #ifdef CONFIG_USB_SUSPEND
+extern int usb_autopm_set_interface(struct usb_interface *intf);
 extern int usb_autopm_get_interface(struct usb_interface *intf);
 extern void usb_autopm_put_interface(struct usb_interface *intf);
 
+static inline void usb_autopm_enable(struct usb_interface *intf)
+{
+        intf->pm_usage_cnt = 0;
+        usb_autopm_set_interface(intf);
+}
+
+static inline void usb_autopm_disable(struct usb_interface *intf)
+{
+        intf->pm_usage_cnt = 1;
+        usb_autopm_set_interface(intf);
+}
+
 #else
-#define usb_autopm_get_interface(intf)          0
-#define usb_autopm_put_interface(intf)          do {} while (0)
-#endif
 
+static inline int usb_autopm_set_interface(struct usb_interface *intf)
+{ return 0; }
+
+static inline int usb_autopm_get_interface(struct usb_interface *intf)
+{ return 0; }
+
+static inline void usb_autopm_put_interface(struct usb_interface *intf)
+{ }
+static inline void usb_autopm_enable(struct usb_interface *intf)
+{ }
+static inline void usb_autopm_disable(struct usb_interface *intf)
+{ }
+#endif
 
 /*-------------------------------------------------------------------------*/
 
@@ -490,17 +519,137 @@ static inline int usb_make_path (struct usb_device *dev, char *buf,
 
 /*-------------------------------------------------------------------------*/
 
-extern int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd);
-extern int usb_endpoint_dir_out(const struct usb_endpoint_descriptor *epd);
-extern int usb_endpoint_xfer_bulk(const struct usb_endpoint_descriptor *epd);
-extern int usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *epd);
-extern int usb_endpoint_xfer_isoc(const struct usb_endpoint_descriptor *epd);
-extern int usb_endpoint_is_bulk_in(const struct usb_endpoint_descriptor *epd);
-extern int usb_endpoint_is_bulk_out(const struct usb_endpoint_descriptor *epd);
-extern int usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd);
-extern int usb_endpoint_is_int_out(const struct usb_endpoint_descriptor *epd);
-extern int usb_endpoint_is_isoc_in(const struct usb_endpoint_descriptor *epd);
-extern int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor *epd);
+/**
+ * usb_endpoint_dir_in - check if the endpoint has IN direction
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type IN, otherwise it returns false.
+ */
+static inline int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
+{
+        return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN);
+}
+
+/**
+ * usb_endpoint_dir_out - check if the endpoint has OUT direction
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type OUT, otherwise it returns false.
+ */
+static inline int usb_endpoint_dir_out(const struct usb_endpoint_descriptor *epd)
+{
+        return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT);
+}
+
+/**
+ * usb_endpoint_xfer_bulk - check if the endpoint has bulk transfer type
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type bulk, otherwise it returns false.
+ */
+static inline int usb_endpoint_xfer_bulk(const struct usb_endpoint_descriptor *epd)
+{
+        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+                USB_ENDPOINT_XFER_BULK);
+}
+
+/**
+ * usb_endpoint_xfer_int - check if the endpoint has interrupt transfer type
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type interrupt, otherwise it returns
+ * false.
+ */
+static inline int usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *epd)
+{
+        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+                USB_ENDPOINT_XFER_INT);
+}
+
+/**
+ * usb_endpoint_xfer_isoc - check if the endpoint has isochronous transfer type
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint is of type isochronous, otherwise it returns
+ * false.
+ */
+static inline int usb_endpoint_xfer_isoc(const struct usb_endpoint_descriptor *epd)
+{
+        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+                USB_ENDPOINT_XFER_ISOC);
+}
+
+/**
+ * usb_endpoint_is_bulk_in - check if the endpoint is bulk IN
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has bulk transfer type and IN direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_bulk_in(const struct usb_endpoint_descriptor *epd)
+{
+        return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd));
+}
+
+/**
+ * usb_endpoint_is_bulk_out - check if the endpoint is bulk OUT
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has bulk transfer type and OUT direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_bulk_out(const struct usb_endpoint_descriptor *epd)
+{
+        return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd));
+}
+
+/**
+ * usb_endpoint_is_int_in - check if the endpoint is interrupt IN
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has interrupt transfer type and IN direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd)
+{
+        return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd));
+}
+
+/**
+ * usb_endpoint_is_int_out - check if the endpoint is interrupt OUT
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has interrupt transfer type and OUT direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_int_out(const struct usb_endpoint_descriptor *epd)
+{
+        return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd));
+}
+
+/**
+ * usb_endpoint_is_isoc_in - check if the endpoint is isochronous IN
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has isochronous transfer type and IN direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_isoc_in(const struct usb_endpoint_descriptor *epd)
+{
+        return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd));
+}
+
+/**
+ * usb_endpoint_is_isoc_out - check if the endpoint is isochronous OUT
+ * @epd: endpoint to be checked
+ *
+ * Returns true if the endpoint has isochronous transfer type and OUT direction,
+ * otherwise it returns false.
+ */
+static inline int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor *epd)
+{
+        return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd));
+}
 
 /*-------------------------------------------------------------------------*/
 
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 91b3ea2bbb1..10f99e5f1a9 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -218,7 +218,7 @@ struct usb_serial_driver {
         int  (*write)           (struct usb_serial_port *port, const unsigned char *buf, int count);
         int  (*write_room)      (struct usb_serial_port *port);
         int  (*ioctl)           (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg);
-        void (*set_termios)     (struct usb_serial_port *port, struct termios * old);
+        void (*set_termios)     (struct usb_serial_port *port, struct ktermios * old);
         void (*break_ctl)       (struct usb_serial_port *port, int break_state);
         int  (*chars_in_buffer) (struct usb_serial_port *port);
         void (*throttle)        (struct usb_serial_port *port);
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index df5c4654360..5cb380a559f 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -244,6 +244,7 @@ struct v4l2_pix_format
 #define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y','Y','U','V') /* 16  YUV 4:2:2     */
 #define V4L2_PIX_FMT_HI240   v4l2_fourcc('H','I','2','4') /*  8  8-bit color   */
 #define V4L2_PIX_FMT_HM12    v4l2_fourcc('H','M','1','2') /*  8  YUV 4:2:0 16x16 macroblocks */
+#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R','4','4','4') /* 16  xxxxrrrr ggggbbbb */
 
 /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
 #define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B','A','8','1') /*  8  BGBG.. GRGR.. */
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index c89df55f6e0..5e9803ed17f 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -10,8 +10,9 @@
 /*
  * Light weight per cpu counter implementation.
  *
- * Counters should only be incremented and no critical kernel component
- * should rely on the counter values.
+ * Counters should only be incremented.  You need to set EMBEDDED
+ * to disable VM_EVENT_COUNTERS.  Things like procps (vmstat,
+ * top, etc) use /proc/vmstat and depend on these counters.
  *
  * Counters are handled completely inline. On many platforms the code
  * generated will simply be the increment of a global address.
@@ -73,7 +74,13 @@ static inline void count_vm_events(enum vm_event_item item, long delta)
 }
 
 extern void all_vm_events(unsigned long *);
+#ifdef CONFIG_HOTPLUG
 extern void vm_events_fold_cpu(int cpu);
+#else
+static inline void vm_events_fold_cpu(int cpu)
+{
+}
+#endif
 
 #else
 
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index a50a0130fd9..7c269f4992e 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -546,6 +546,8 @@
 /* MLME requests (SIOCSIWMLME / struct iw_mlme) */
 #define IW_MLME_DEAUTH          0
 #define IW_MLME_DISASSOC        1
+#define IW_MLME_AUTH            2
+#define IW_MLME_ASSOC           3
 
 /* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */
 #define IW_AUTH_INDEX           0x0FFF
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 9bca3539a1e..2a7b38d8701 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -8,15 +8,34 @@
 #include <linux/timer.h>
 #include <linux/linkage.h>
 #include <linux/bitops.h>
+#include <asm/atomic.h>
 
 struct workqueue_struct;
 
+struct work_struct;
+typedef void (*work_func_t)(struct work_struct *work);
+
+/*
+ * The first word is the work queue pointer and the flags rolled into
+ * one
+ */
+#define work_data_bits(work) ((unsigned long *)(&(work)->data))
+
 struct work_struct {
-        unsigned long pending;
+        atomic_long_t data;
+#define WORK_STRUCT_PENDING 0           /* T if work item pending execution */
+#define WORK_STRUCT_NOAUTOREL 1         /* F if work item automatically released on exec */
+#define WORK_STRUCT_FLAG_MASK (3UL)
+#define WORK_STRUCT_WQ_DATA_MASK (~WORK_STRUCT_FLAG_MASK)
         struct list_head entry;
-        void (*func)(void *);
-        void *data;
-        void *wq_data;
+        work_func_t func;
+};
+
+#define WORK_DATA_INIT(autorelease) \
+        ATOMIC_LONG_INIT((autorelease) << WORK_STRUCT_NOAUTOREL)
+
+struct delayed_work {
+        struct work_struct work;
         struct timer_list timer;
 };
 
@@ -24,77 +43,164 @@ struct execute_work {
         struct work_struct work;
 };
 
-#define __WORK_INITIALIZER(n, f, d) {                           \
+#define __WORK_INITIALIZER(n, f) {                              \
+        .data = WORK_DATA_INIT(0),                              \
+        .entry  = { &(n).entry, &(n).entry },                   \
+        .func = (f),                                            \
+        }
+
+#define __WORK_INITIALIZER_NAR(n, f) {                          \
+        .data = WORK_DATA_INIT(1),                              \
         .entry  = { &(n).entry, &(n).entry },                   \
         .func = (f),                                            \
-        .data = (d),                                            \
+        }
+
+#define __DELAYED_WORK_INITIALIZER(n, f) {                      \
+        .work = __WORK_INITIALIZER((n).work, (f)),              \
         .timer = TIMER_INITIALIZER(NULL, 0, 0),                 \
         }
 
-#define DECLARE_WORK(n, f, d)                                   \
-        struct work_struct n = __WORK_INITIALIZER(n, f, d)
+#define __DELAYED_WORK_INITIALIZER_NAR(n, f) {                  \
+        .work = __WORK_INITIALIZER_NAR((n).work, (f)),          \
+        .timer = TIMER_INITIALIZER(NULL, 0, 0),                 \
+        }
+
+#define DECLARE_WORK(n, f)                                      \
+        struct work_struct n = __WORK_INITIALIZER(n, f)
+
+#define DECLARE_WORK_NAR(n, f)                                  \
+        struct work_struct n = __WORK_INITIALIZER_NAR(n, f)
+
+#define DECLARE_DELAYED_WORK(n, f)                              \
+        struct delayed_work n = __DELAYED_WORK_INITIALIZER(n, f)
+
+#define DECLARE_DELAYED_WORK_NAR(n, f)                  \
+        struct dwork_struct n = __DELAYED_WORK_INITIALIZER_NAR(n, f)
 
 /*
- * initialize a work-struct's func and data pointers:
+ * initialize a work item's function pointer
  */
-#define PREPARE_WORK(_work, _func, _data)                       \
+#define PREPARE_WORK(_work, _func)                              \
         do {                                                    \
-                (_work)->func = _func;                          \
-                (_work)->data = _data;                          \
+                (_work)->func = (_func);                        \
         } while (0)
 
+#define PREPARE_DELAYED_WORK(_work, _func)                      \
+        PREPARE_WORK(&(_work)->work, (_func))
+
 /*
- * initialize all of a work-struct:
+ * initialize all of a work item in one go
+ *
+ * NOTE! No point in using "atomic_long_set()": useing a direct
+ * assignment of the work data initializer allows the compiler
+ * to generate better code.
  */
-#define INIT_WORK(_work, _func, _data)                          \
+#define INIT_WORK(_work, _func)                                 \
         do {                                                    \
+                (_work)->data = (atomic_long_t) WORK_DATA_INIT(0);      \
                 INIT_LIST_HEAD(&(_work)->entry);                \
-                (_work)->pending = 0;                           \
-                PREPARE_WORK((_work), (_func), (_data));        \
+                PREPARE_WORK((_work), (_func));                 \
+        } while (0)
+
+#define INIT_WORK_NAR(_work, _func)                                     \
+        do {                                                            \
+                (_work)->data = (atomic_long_t) WORK_DATA_INIT(1);      \
+                INIT_LIST_HEAD(&(_work)->entry);                        \
+                PREPARE_WORK((_work), (_func));                         \
+        } while (0)
+
+#define INIT_DELAYED_WORK(_work, _func)                         \
+        do {                                                    \
+                INIT_WORK(&(_work)->work, (_func));             \
+                init_timer(&(_work)->timer);                    \
+        } while (0)
+
+#define INIT_DELAYED_WORK_NAR(_work, _func)                     \
+        do {                                                    \
+                INIT_WORK_NAR(&(_work)->work, (_func));         \
                 init_timer(&(_work)->timer);                    \
         } while (0)
 
+/**
+ * work_pending - Find out whether a work item is currently pending
+ * @work: The work item in question
+ */
+#define work_pending(work) \
+        test_bit(WORK_STRUCT_PENDING, work_data_bits(work))
+
+/**
+ * delayed_work_pending - Find out whether a delayable work item is currently
+ * pending
+ * @work: The work item in question
+ */
+#define delayed_work_pending(w) \
+        work_pending(&(w)->work)
+
+/**
+ * work_release - Release a work item under execution
+ * @work: The work item to release
+ *
+ * This is used to release a work item that has been initialised with automatic
+ * release mode disabled (WORK_STRUCT_NOAUTOREL is set).  This gives the work
+ * function the opportunity to grab auxiliary data from the container of the
+ * work_struct before clearing the pending bit as the work_struct may be
+ * subject to deallocation the moment the pending bit is cleared.
+ *
+ * In such a case, this should be called in the work function after it has
+ * fetched any data it may require from the containter of the work_struct.
+ * After this function has been called, the work_struct may be scheduled for
+ * further execution or it may be deallocated unless other precautions are
+ * taken.
+ *
+ * This should also be used to release a delayed work item.
+ */
+#define work_release(work) \
+        clear_bit(WORK_STRUCT_PENDING, work_data_bits(work))
+
+
 extern struct workqueue_struct *__create_workqueue(const char *name,
-                                                    int singlethread);
-#define create_workqueue(name) __create_workqueue((name), 0)
-#define create_singlethread_workqueue(name) __create_workqueue((name), 1)
+                                                    int singlethread,
+                                                    int freezeable);
+#define create_workqueue(name) __create_workqueue((name), 0, 0)
+#define create_freezeable_workqueue(name) __create_workqueue((name), 0, 1)
+#define create_singlethread_workqueue(name) __create_workqueue((name), 1, 0)
 
 extern void destroy_workqueue(struct workqueue_struct *wq);
 
 extern int FASTCALL(queue_work(struct workqueue_struct *wq, struct work_struct *work));
-extern int FASTCALL(queue_delayed_work(struct workqueue_struct *wq, struct work_struct *work, unsigned long delay));
+extern int FASTCALL(queue_delayed_work(struct workqueue_struct *wq, struct delayed_work *work, unsigned long delay));
 extern int queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
-        struct work_struct *work, unsigned long delay);
+        struct delayed_work *work, unsigned long delay);
 extern void FASTCALL(flush_workqueue(struct workqueue_struct *wq));
 
 extern int FASTCALL(schedule_work(struct work_struct *work));
-extern int FASTCALL(schedule_delayed_work(struct work_struct *work, unsigned long delay));
+extern int FASTCALL(run_scheduled_work(struct work_struct *work));
+extern int FASTCALL(schedule_delayed_work(struct delayed_work *work, unsigned long delay));
 
-extern int schedule_delayed_work_on(int cpu, struct work_struct *work, unsigned long delay);
-extern int schedule_on_each_cpu(void (*func)(void *info), void *info);
+extern int schedule_delayed_work_on(int cpu, struct delayed_work *work, unsigned long delay);
+extern int schedule_on_each_cpu(work_func_t func);
 extern void flush_scheduled_work(void);
 extern int current_is_keventd(void);
 extern int keventd_up(void);
 
 extern void init_workqueues(void);
-void cancel_rearming_delayed_work(struct work_struct *work);
+void cancel_rearming_delayed_work(struct delayed_work *work);
 void cancel_rearming_delayed_workqueue(struct workqueue_struct *,
-                                       struct work_struct *);
-int execute_in_process_context(void (*fn)(void *), void *,
-                               struct execute_work *);
+                                       struct delayed_work *);
+int execute_in_process_context(work_func_t fn, struct execute_work *);
 
 /*
  * Kill off a pending schedule_delayed_work().  Note that the work callback
  * function may still be running on return from cancel_delayed_work().  Run
  * flush_scheduled_work() to wait on it.
  */
-static inline int cancel_delayed_work(struct work_struct *work)
+static inline int cancel_delayed_work(struct delayed_work *work)
 {
         int ret;
 
         ret = del_timer_sync(&work->timer);
         if (ret)
-                clear_bit(0, &work->pending);
+                work_release(&work->work);
         return ret;
 }
 
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index 8ae7f744917..9529ea1ae39 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -211,8 +211,8 @@ struct xfrm_user_tmpl {
 
 struct xfrm_encap_tmpl {
         __u16           encap_type;
-        __u16           encap_sport;
-        __u16           encap_dport;
+        __be16          encap_sport;
+        __be16          encap_dport;
         xfrm_address_t  encap_oa;
 };
 
@@ -289,7 +289,9 @@ struct xfrm_usersa_id {
 
 struct xfrm_aevent_id {
         struct xfrm_usersa_id           sa_id;
+        xfrm_address_t                  saddr;
         __u32                           flags;
+        __u32                           reqid;
 };
 
 struct xfrm_userspi_info {
@@ -355,7 +357,7 @@ struct xfrm_user_report {
 #define XFRMGRP_EXPIRE          2
 #define XFRMGRP_SA              4
 #define XFRMGRP_POLICY          8
-#define XFRMGRP_REPORT          0x10
+#define XFRMGRP_REPORT          0x20
 #endif
 
 enum xfrm_nlgroups {
diff --git a/include/linux/zftape.h b/include/linux/zftape.h
deleted file mode 100644
index b057c65366c..00000000000
--- a/include/linux/zftape.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef _ZFTAPE_H
-#define _ZFTAPE_H
-
-/*
- * Copyright (C) 1996, 1997 Claus-Justus Heine.
-
- 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, 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; see the file COPYING.  If not, write to
- the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
- *
- * $Source: /homes/cvs/ftape-stacked/include/linux/zftape.h,v $
- * $Revision: 1.12 $
- * $Date: 1997/10/21 11:02:37 $
- *
- *      Special ioctl and other global info for the zftape VFS
- *      interface for the QIC-40/80/3010/3020 floppy-tape driver for
- *      Linux.
- */
-
-#define ZFTAPE_VERSION  "zftape for " FTAPE_VERSION
-
-#include <linux/ftape.h>
-
-#define ZFTAPE_LABEL       "Ftape - The Linux Floppy Tape Project!"
-
-/* Bits of the minor device number that control the operation mode */
-#define ZFT_Q80_MODE            (1 << 3)
-#define ZFT_ZIP_MODE            (1 << 4)
-#define ZFT_RAW_MODE            (1 << 5)
-#define ZFT_MINOR_OP_MASK       (ZFT_Q80_MODE   |       \
-                                 ZFT_ZIP_MODE   |       \
-                                 ZFT_RAW_MODE)
-#define ZFT_MINOR_MASK          (FTAPE_SEL_MASK         |       \
-                                 ZFT_MINOR_OP_MASK      |       \
-                                 FTAPE_NO_REWIND)
-
-#ifdef ZFT_OBSOLETE
-struct mtblksz {
-        unsigned int mt_blksz;
-};
-#define MTIOC_ZFTAPE_GETBLKSZ _IOR('m', 104, struct mtblksz)
-#endif
-
-#ifdef __KERNEL__
-
-extern int zft_init(void);
-
-static inline __s64 zft_div_blksz(__s64 value, __u32 blk_sz)
-{
-        if (blk_sz == 1) {
-                return value;
-        } else {
-                return (__s64)(((__u32)(value >> 10) + (blk_sz >> 10) - 1) 
-                               / (blk_sz >> 10));
-        } 
-}
-
-static inline __s64 zft_mul_blksz(__s64 value, __u32 blk_sz)
-{
-        if (blk_sz == 1) {
-                return value;
-        } else {
-                /*  if blk_sz != 1, then it is a multiple of 1024. In
-                 *  this case, `value' will also fit into 32 bits.
-                 * 
-                 *  Actually, this limits the capacity to 42
-                 *  bits. This is (2^32)*1024, roughly a thousand
-                 *  times 2GB, or 3 Terabytes. Hopefully this is enough
-                 */
-                return(__s64)(((__u32)(value)*(blk_sz>>10))<<10);
-        }
-}
-
-#endif
-
-#endif