127 files changed, 1415 insertions, 1115 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 334a3593cdfd..cff4a101f266 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -268,6 +268,10 @@ ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
                  $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
 unifdef-y += kvm.h
 endif
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
+                  $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),)
+unifdef-y += kvm_para.h
+endif
 unifdef-y += llc.h
 unifdef-y += loop.h
 unifdef-y += lp.h
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index 9b93cafa82a0..ab94335b4bb9 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -36,6 +36,11 @@ struct amba_driver {
        struct amba_id          *id_table;
 };
+enum amba_vendor {
+        AMBA_VENDOR_ARM = 0x41,
+        AMBA_VENDOR_ST = 0x80,
+};
 #define amba_get_drvdata(d)     dev_get_drvdata(&d->dev)
 #define amba_set_drvdata(d,p)   dev_set_drvdata(&d->dev, p)
diff --git a/include/linux/amba/pl093.h b/include/linux/amba/pl093.h
new file mode 100644
index 000000000000..2983e3671adb
--- /dev/null
+++ b/include/linux/amba/pl093.h
@@ -0,0 +1,80 @@
+/* linux/amba/pl093.h
+ *
+ * Copyright (c) 2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * AMBA PL093 SSMC (synchronous static memory controller)
+ *  See DDI0236.pdf (r0p4) for more details
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+#define SMB_BANK(x)     ((x) * 0x20) /* each bank control set is 0x20 apart */
+/* Offsets for SMBxxxxRy registers */
+#define SMBIDCYR        (0x00)
+#define SMBWSTRDR       (0x04)
+#define SMBWSTWRR       (0x08)
+#define SMBWSTOENR      (0x0C)
+#define SMBWSTWENR      (0x10)
+#define SMBCR           (0x14)
+#define SMBSR           (0x18)
+#define SMBWSTBRDR      (0x1C)
+/* Masks for SMB registers */
+#define IDCY_MASK       (0xf)
+#define WSTRD_MASK      (0xf)
+#define WSTWR_MASK      (0xf)
+#define WSTOEN_MASK     (0xf)
+#define WSTWEN_MASK     (0xf)
+/* Notes from datasheet:
+ *      WSTOEN <= WSTRD
+ *      WSTWEN <= WSTWR
+ *
+ * WSTOEN is not used with nWAIT
+ */
+/* SMBCR bit definitions */
+#define SMBCR_BIWRITEEN         (1 << 21)
+#define SMBCR_ADDRVALIDWRITEEN  (1 << 20)
+#define SMBCR_SYNCWRITE         (1 << 17)
+#define SMBCR_BMWRITE           (1 << 16)
+#define SMBCR_WRAPREAD          (1 << 14)
+#define SMBCR_BIREADEN          (1 << 13)
+#define SMBCR_ADDRVALIDREADEN   (1 << 12)
+#define SMBCR_SYNCREAD          (1 << 9)
+#define SMBCR_BMREAD            (1 << 8)
+#define SMBCR_SMBLSPOL          (1 << 6)
+#define SMBCR_WP                (1 << 3)
+#define SMBCR_WAITEN            (1 << 2)
+#define SMBCR_WAITPOL           (1 << 1)
+#define SMBCR_RBLE              (1 << 0)
+#define SMBCR_BURSTLENWRITE_MASK        (3 << 18)
+#define SMBCR_BURSTLENWRITE_4           (0 << 18)
+#define SMBCR_BURSTLENWRITE_8           (1 << 18)
+#define SMBCR_BURSTLENWRITE_RESERVED    (2 << 18)
+#define SMBCR_BURSTLENWRITE_CONTINUOUS  (3 << 18)
+#define SMBCR_BURSTLENREAD_MASK         (3 << 10)
+#define SMBCR_BURSTLENREAD_4            (0 << 10)
+#define SMBCR_BURSTLENREAD_8            (1 << 10)
+#define SMBCR_BURSTLENREAD_16           (2 << 10)
+#define SMBCR_BURSTLENREAD_CONTINUOUS   (3 << 10)
+#define SMBCR_MW_MASK                   (3 << 4)
+#define SMBCR_MW_8BIT                   (0 << 4)
+#define SMBCR_MW_16BIT                  (1 << 4)
+#define SMBCR_MW_M32BIT                 (2 << 4)
+/* SSMC status registers */
+#define SSMCCSR         (0x200)
+#define SSMCCR          (0x204)
+#define SSMCITCR        (0x208)
+#define SSMCITIP        (0x20C)
+#define SSMCITIOP       (0x210)
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h
index cd4bcb6989ce..7d650a0e3d8f 100644
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
@@ -337,7 +337,8 @@ struct net_device *alloc_arcdev(const char *name);
 int arcnet_open(struct net_device *dev);
 int arcnet_close(struct net_device *dev);
-int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev);
+netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
+                                     struct net_device *dev);
 void arcnet_timeout(struct net_device *dev);
 #endif                          /* __KERNEL__ */
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 2892b710771c..5be93f18d842 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -142,56 +142,51 @@ struct bio {
 *
 * bit 0 -- data direction
 *      If not set, bio is a read from device. If set, it's a write to device.
- * bit 1 -- rw-ahead when set
+ * bit 1 -- fail fast device errors
- * bit 2 -- barrier
+ * bit 2 -- fail fast transport errors
+ * bit 3 -- fail fast driver errors
+ * bit 4 -- rw-ahead when set
+ * bit 5 -- barrier
 *      Insert a serialization point in the IO queue, forcing previously
 *      submitted IO to be completed before this one is issued.
- * bit 3 -- synchronous I/O hint.
+ * bit 6 -- synchronous I/O hint.
- * bit 4 -- Unplug the device immediately after submitting this bio.
+ * bit 7 -- Unplug the device immediately after submitting this bio.
- * bit 5 -- metadata request
+ * bit 8 -- metadata request
 *      Used for tracing to differentiate metadata and data IO. May also
 *      get some preferential treatment in the IO scheduler
- * bit 6 -- discard sectors
+ * bit 9 -- discard sectors
 *      Informs the lower level device that this range of sectors is no longer
 *      used by the file system and may thus be freed by the device. Used
 *      for flash based storage.
- * bit 7 -- fail fast device errors
- * bit 8 -- fail fast transport errors
- * bit 9 -- fail fast driver errors
 *      Don't want driver retries for any fast fail whatever the reason.
 * bit 10 -- Tell the IO scheduler not to wait for more requests after this
        one has been submitted, even if it is a SYNC request.
 */
-#define BIO_RW          0       /* Must match RW in req flags (blkdev.h) */
+enum bio_rw_flags {
-#define BIO_RW_AHEAD    1       /* Must match FAILFAST in req flags */
+        BIO_RW,
-#define BIO_RW_BARRIER  2
+        BIO_RW_FAILFAST_DEV,
-#define BIO_RW_SYNCIO   3
+        BIO_RW_FAILFAST_TRANSPORT,
-#define BIO_RW_UNPLUG   4
+        BIO_RW_FAILFAST_DRIVER,
-#define BIO_RW_META     5
+        /* above flags must match REQ_* */
-#define BIO_RW_DISCARD  6
+        BIO_RW_AHEAD,
-#define BIO_RW_FAILFAST_DEV             7
+        BIO_RW_BARRIER,
-#define BIO_RW_FAILFAST_TRANSPORT       8
+        BIO_RW_SYNCIO,
-#define BIO_RW_FAILFAST_DRIVER          9
+        BIO_RW_UNPLUG,
-#define BIO_RW_NOIDLE   10
+        BIO_RW_META,
+        BIO_RW_DISCARD,
-#define bio_rw_flagged(bio, flag)       ((bio)->bi_rw & (1 << (flag)))
+        BIO_RW_NOIDLE,
+};
 /*
- * Old defines, these should eventually be replaced by direct usage of
+ * First four bits must match between bio->bi_rw and rq->cmd_flags, make
- * bio_rw_flagged()
+ * that explicit here.
 */
-#define bio_barrier(bio)        bio_rw_flagged(bio, BIO_RW_BARRIER)
+#define BIO_RW_RQ_MASK          0xf
-#define bio_sync(bio)           bio_rw_flagged(bio, BIO_RW_SYNCIO)
-#define bio_unplug(bio)         bio_rw_flagged(bio, BIO_RW_UNPLUG)
+static inline bool bio_rw_flagged(struct bio *bio, enum bio_rw_flags flag)
-#define bio_failfast_dev(bio)   bio_rw_flagged(bio, BIO_RW_FAILFAST_DEV)
+{
-#define bio_failfast_transport(bio)     \
+        return (bio->bi_rw & (1 << flag)) != 0;
-                bio_rw_flagged(bio, BIO_RW_FAILFAST_TRANSPORT)
+}
-#define bio_failfast_driver(bio)        \
-                bio_rw_flagged(bio, BIO_RW_FAILFAST_DRIVER)
-#define bio_rw_ahead(bio)       bio_rw_flagged(bio, BIO_RW_AHEAD)
-#define bio_rw_meta(bio)        bio_rw_flagged(bio, BIO_RW_META)
-#define bio_discard(bio)        bio_rw_flagged(bio, BIO_RW_DISCARD)
-#define bio_noidle(bio)         bio_rw_flagged(bio, BIO_RW_NOIDLE)
 /*
 * upper 16 bits of bi_rw define the io priority of this bio
@@ -216,7 +211,7 @@ struct bio {
 #define bio_offset(bio)         bio_iovec((bio))->bv_offset
 #define bio_segments(bio)       ((bio)->bi_vcnt - (bio)->bi_idx)
 #define bio_sectors(bio)        ((bio)->bi_size >> 9)
-#define bio_empty_barrier(bio)  (bio_barrier(bio) && !bio_has_data(bio) && !bio_discard(bio))
+#define bio_empty_barrier(bio)  (bio_rw_flagged(bio, BIO_RW_BARRIER) && !bio_has_data(bio) && !bio_rw_flagged(bio, BIO_RW_DISCARD))
 static inline unsigned int bio_cur_bytes(struct bio *bio)
 {
diff --git a/include/linux/blk-iopoll.h b/include/linux/blk-iopoll.h
new file mode 100644
index 000000000000..308734d3d4a2
--- /dev/null
+++ b/include/linux/blk-iopoll.h
@@ -0,0 +1,48 @@
+#ifndef BLK_IOPOLL_H
+#define BLK_IOPOLL_H
+struct blk_iopoll;
+typedef int (blk_iopoll_fn)(struct blk_iopoll *, int);
+struct blk_iopoll {
+        struct list_head list;
+        unsigned long state;
+        unsigned long data;
+        int weight;
+        int max;
+        blk_iopoll_fn *poll;
+};
+enum {
+        IOPOLL_F_SCHED          = 0,
+        IOPOLL_F_DISABLE        = 1,
+};
+/*
+ * Returns 0 if we successfully set the IOPOLL_F_SCHED bit, indicating
+ * that we were the first to acquire this iop for scheduling. If this iop
+ * is currently disabled, return "failure".
+ */
+static inline int blk_iopoll_sched_prep(struct blk_iopoll *iop)
+{
+        if (!test_bit(IOPOLL_F_DISABLE, &iop->state))
+                return test_and_set_bit(IOPOLL_F_SCHED, &iop->state);
+        return 1;
+}
+static inline int blk_iopoll_disable_pending(struct blk_iopoll *iop)
+{
+        return test_bit(IOPOLL_F_DISABLE, &iop->state);
+}
+extern void blk_iopoll_sched(struct blk_iopoll *);
+extern void blk_iopoll_init(struct blk_iopoll *, int, blk_iopoll_fn *);
+extern void blk_iopoll_complete(struct blk_iopoll *);
+extern void __blk_iopoll_complete(struct blk_iopoll *);
+extern void blk_iopoll_enable(struct blk_iopoll *);
+extern void blk_iopoll_disable(struct blk_iopoll *);
+extern int blk_iopoll_enabled;
+#endif
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 69103e053c92..e23a86cae5ac 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -86,13 +86,14 @@ enum {
 };
 /*
- * request type modified bits. first two bits match BIO_RW* bits, important
+ * request type modified bits. first four bits match BIO_RW* bits, important
 */
 enum rq_flag_bits {
        __REQ_RW,               /* not set, read. set, write */
        __REQ_FAILFAST_DEV,     /* no driver retries of device errors */
        __REQ_FAILFAST_TRANSPORT, /* no driver retries of transport errors */
        __REQ_FAILFAST_DRIVER,  /* no driver retries of driver errors */
+        /* above flags must match BIO_RW_* */
        __REQ_DISCARD,          /* request to discard sectors */
        __REQ_SORTED,           /* elevator knows about this request */
        __REQ_SOFTBARRIER,      /* may not be passed by ioscheduler */
@@ -114,6 +115,7 @@ enum rq_flag_bits {
        __REQ_INTEGRITY,        /* integrity metadata has been remapped */
        __REQ_NOIDLE,           /* Don't anticipate more IO after this one */
        __REQ_IO_STAT,          /* account I/O stat */
+        __REQ_MIXED_MERGE,      /* merge of different types, fail separately */
        __REQ_NR_BITS,          /* stops here */
 };
@@ -142,6 +144,10 @@ enum rq_flag_bits {
 #define REQ_INTEGRITY   (1 << __REQ_INTEGRITY)
 #define REQ_NOIDLE      (1 << __REQ_NOIDLE)
 #define REQ_IO_STAT     (1 << __REQ_IO_STAT)
+#define REQ_MIXED_MERGE (1 << __REQ_MIXED_MERGE)
+#define REQ_FAILFAST_MASK       (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | \
+                                 REQ_FAILFAST_DRIVER)
 #define BLK_MAX_CDB     16
@@ -453,10 +459,12 @@ struct request_queue
 #define QUEUE_FLAG_NONROT      14       /* non-rotational device (SSD) */
 #define QUEUE_FLAG_VIRT        QUEUE_FLAG_NONROT /* paravirt device */
 #define QUEUE_FLAG_IO_STAT     15       /* do IO stats */
+#define QUEUE_FLAG_CQ          16       /* hardware does queuing */
 #define QUEUE_FLAG_DEFAULT      ((1 << QUEUE_FLAG_IO_STAT) |            \
                                 (1 << QUEUE_FLAG_CLUSTER) |            \
-                                 (1 << QUEUE_FLAG_STACKABLE))
+                                 (1 << QUEUE_FLAG_STACKABLE)    |       \
+                                 (1 << QUEUE_FLAG_SAME_COMP))
 static inline int queue_is_locked(struct request_queue *q)
 {
@@ -575,6 +583,7 @@ enum {
 #define blk_queue_plugged(q)    test_bit(QUEUE_FLAG_PLUGGED, &(q)->queue_flags)
 #define blk_queue_tagged(q)     test_bit(QUEUE_FLAG_QUEUED, &(q)->queue_flags)
+#define blk_queue_queuing(q)    test_bit(QUEUE_FLAG_CQ, &(q)->queue_flags)
 #define blk_queue_stopped(q)    test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags)
 #define blk_queue_nomerges(q)   test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags)
 #define blk_queue_nonrot(q)     test_bit(QUEUE_FLAG_NONROT, &(q)->queue_flags)
@@ -828,11 +837,13 @@ static inline void blk_run_address_space(struct address_space *mapping)
 }
 /*
- * blk_rq_pos()         : the current sector
+ * blk_rq_pos()                 : the current sector
- * blk_rq_bytes()       : bytes left in the entire request
+ * blk_rq_bytes()               : bytes left in the entire request
- * blk_rq_cur_bytes()   : bytes left in the current segment
+ * blk_rq_cur_bytes()           : bytes left in the current segment
- * blk_rq_sectors()     : sectors left in the entire request
+ * blk_rq_err_bytes()           : bytes left till the next error boundary
- * blk_rq_cur_sectors() : sectors left in the current segment
+ * blk_rq_sectors()             : sectors left in the entire request
+ * blk_rq_cur_sectors()         : sectors left in the current segment
+ * blk_rq_err_sectors()         : sectors left till the next error boundary
 */
 static inline sector_t blk_rq_pos(const struct request *rq)
 {
@@ -849,6 +860,8 @@ static inline int blk_rq_cur_bytes(const struct request *rq)
        return rq->bio ? bio_cur_bytes(rq->bio) : 0;
 }
+extern unsigned int blk_rq_err_bytes(const struct request *rq);
 static inline unsigned int blk_rq_sectors(const struct request *rq)
 {
        return blk_rq_bytes(rq) >> 9;
@@ -859,6 +872,11 @@ static inline unsigned int blk_rq_cur_sectors(const struct request *rq)
        return blk_rq_cur_bytes(rq) >> 9;
 }
+static inline unsigned int blk_rq_err_sectors(const struct request *rq)
+{
+        return blk_rq_err_bytes(rq) >> 9;
+}
 /*
 * Request issue related functions.
 */
@@ -885,10 +903,12 @@ extern bool blk_end_request(struct request *rq, int error,
                            unsigned int nr_bytes);
 extern void blk_end_request_all(struct request *rq, int error);
 extern bool blk_end_request_cur(struct request *rq, int error);
+extern bool blk_end_request_err(struct request *rq, int error);
 extern bool __blk_end_request(struct request *rq, int error,
                              unsigned int nr_bytes);
 extern void __blk_end_request_all(struct request *rq, int error);
 extern bool __blk_end_request_cur(struct request *rq, int error);
+extern bool __blk_end_request_err(struct request *rq, int error);
 extern void blk_complete_request(struct request *);
 extern void __blk_complete_request(struct request *);
@@ -915,6 +935,7 @@ extern void blk_queue_alignment_offset(struct request_queue *q,
                                       unsigned int alignment);
 extern void blk_limits_io_min(struct queue_limits *limits, unsigned int min);
 extern void blk_queue_io_min(struct request_queue *q, unsigned int min);
+extern void blk_limits_io_opt(struct queue_limits *limits, unsigned int opt);
 extern void blk_queue_io_opt(struct request_queue *q, unsigned int opt);
 extern void blk_set_default_limits(struct queue_limits *lim);
 extern int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
@@ -977,15 +998,18 @@ static inline struct request *blk_map_queue_find_tag(struct blk_queue_tag *bqt,
 }
 extern int blkdev_issue_flush(struct block_device *, sector_t *);
-extern int blkdev_issue_discard(struct block_device *,
+#define DISCARD_FL_WAIT         0x01    /* wait for completion */
-                                sector_t sector, sector_t nr_sects, gfp_t);
+#define DISCARD_FL_BARRIER      0x02    /* issue DISCARD_BARRIER request */
+extern int blkdev_issue_discard(struct block_device *, sector_t sector,
+                sector_t nr_sects, gfp_t, int flags);
 static inline int sb_issue_discard(struct super_block *sb,
                                   sector_t block, sector_t nr_blocks)
 {
        block <<= (sb->s_blocksize_bits - 9);
        nr_blocks <<= (sb->s_blocksize_bits - 9);
-        return blkdev_issue_discard(sb->s_bdev, block, nr_blocks, GFP_KERNEL);
+        return blkdev_issue_discard(sb->s_bdev, block, nr_blocks, GFP_KERNEL,
+                                    DISCARD_FL_BARRIER);
 }
 extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm);
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 4a37a56f6cdd..5824b20b5fcb 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -66,5 +66,6 @@ void can_bus_off(struct net_device *dev);
 void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev, int idx);
 void can_get_echo_skb(struct net_device *dev, int idx);
+void can_free_echo_skb(struct net_device *dev, int idx);
 #endif /* CAN_DEV_H */
diff --git a/include/linux/connector.h b/include/linux/connector.h
index b68d27850d51..47ebf416f512 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -136,7 +136,7 @@ struct cn_callback_data {
        void *ddata;
        
        void *callback_priv;
-        void (*callback) (void *);
+        void (*callback) (struct cn_msg *);
        void *free;
 };
@@ -167,11 +167,11 @@ struct cn_dev {
        struct cn_queue_dev *cbdev;
 };
-int cn_add_callback(struct cb_id *, char *, void (*callback) (void *));
+int cn_add_callback(struct cb_id *, char *, void (*callback) (struct cn_msg *));
 void cn_del_callback(struct cb_id *);
 int cn_netlink_send(struct cn_msg *, u32, gfp_t);
-int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(void *));
+int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(struct cn_msg *));
 void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id);
 int queue_cn_work(struct cn_callback_entry *cbq, struct work_struct *work);
diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h
index 7d2e10006188..b7cdbb4373df 100644
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
@@ -50,6 +50,8 @@ struct dcbmsg {
 * @DCB_CMD_SNUMTCS: set the number of traffic classes
 * @DCB_CMD_GBCN: set backward congestion notification configuration
 * @DCB_CMD_SBCN: get backward congestion notification configration.
+ * @DCB_CMD_GAPP: get application protocol configuration
+ * @DCB_CMD_SAPP: set application protocol configuration
 */
 enum dcbnl_commands {
        DCB_CMD_UNDEFINED,
@@ -80,6 +82,9 @@ enum dcbnl_commands {
        DCB_CMD_BCN_GCFG,
        DCB_CMD_BCN_SCFG,
+        DCB_CMD_GAPP,
+        DCB_CMD_SAPP,
        __DCB_CMD_ENUM_MAX,
        DCB_CMD_MAX = __DCB_CMD_ENUM_MAX - 1,
 };
@@ -114,6 +119,7 @@ enum dcbnl_attrs {
        DCB_ATTR_CAP,
        DCB_ATTR_NUMTCS,
        DCB_ATTR_BCN,
+        DCB_ATTR_APP,
        __DCB_ATTR_ENUM_MAX,
        DCB_ATTR_MAX = __DCB_ATTR_ENUM_MAX - 1,
@@ -338,5 +344,17 @@ enum dcb_general_attr_values {
        DCB_ATTR_VALUE_UNDEFINED = 0xff
 };
+#define DCB_APP_IDTYPE_ETHTYPE  0x00
+#define DCB_APP_IDTYPE_PORTNUM  0x01
+enum dcbnl_app_attrs {
+        DCB_APP_ATTR_UNDEFINED,
+        DCB_APP_ATTR_IDTYPE,
+        DCB_APP_ATTR_ID,
+        DCB_APP_ATTR_PRIORITY,
+        __DCB_APP_ATTR_ENUM_MAX,
+        DCB_APP_ATTR_MAX = __DCB_APP_ATTR_ENUM_MAX - 1,
+};
 #endif /* __LINUX_DCBNL_H__ */
diff --git a/include/linux/device.h b/include/linux/device.h
index aebb81036db2..a28642975053 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -62,7 +62,7 @@ struct bus_type {
        int (*suspend)(struct device *dev, pm_message_t state);
        int (*resume)(struct device *dev);
-        struct dev_pm_ops *pm;
+        const struct dev_pm_ops *pm;
        struct bus_type_private *p;
 };
@@ -132,7 +132,7 @@ struct device_driver {
        int (*resume) (struct device *dev);
        struct attribute_group **groups;
-        struct dev_pm_ops *pm;
+        const struct dev_pm_ops *pm;
        struct driver_private *p;
 };
@@ -200,7 +200,8 @@ struct class {
        int (*suspend)(struct device *dev, pm_message_t state);
        int (*resume)(struct device *dev);
-        struct dev_pm_ops *pm;
+        const struct dev_pm_ops *pm;
        struct class_private *p;
 };
@@ -291,7 +292,7 @@ struct device_type {
        char *(*nodename)(struct device *dev);
        void (*release)(struct device *dev);
-        struct dev_pm_ops *pm;
+        const struct dev_pm_ops *pm;
 };
 /* interface for exporting device attributes */
diff --git a/include/linux/dtlk.h b/include/linux/dtlk.h
index 2896d90118a9..22a7b9a5f5d1 100644
--- a/include/linux/dtlk.h
+++ b/include/linux/dtlk.h
@@ -1,22 +1,3 @@
-#if 0
-#define TRACE_TXT(text) \
-        { \
-          if(dtlk_trace) \
-          { \
-            console_print(text); \
-            console_print("\n"); \
-          } \
-        }
-#define TRACE_CHR(chr) \
-        { \
-          if(dtlk_trace) \
-            console_print(chr); \
-        } \
-#endif
 #define DTLK_MINOR      0
 #define DTLK_IO_EXTENT  0x02
diff --git a/include/linux/enclosure.h b/include/linux/enclosure.h
index 4332442b1b57..90d1c2184112 100644
--- a/include/linux/enclosure.h
+++ b/include/linux/enclosure.h
@@ -122,8 +122,9 @@ enclosure_component_register(struct enclosure_device *, unsigned int,
                                 enum enclosure_component_type, const char *);
 int enclosure_add_device(struct enclosure_device *enclosure, int component,
                         struct device *dev);
-int enclosure_remove_device(struct enclosure_device *enclosure, int component);
+int enclosure_remove_device(struct enclosure_device *, struct device *);
-struct enclosure_device *enclosure_find(struct device *dev);
+struct enclosure_device *enclosure_find(struct device *dev,
+                                        struct enclosure_device *start);
 int enclosure_for_each_device(int (*fn)(struct enclosure_device *, void *),
                              void *data);
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 9b660bd2e2b3..15e4eb713694 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -362,12 +362,25 @@ struct ethtool_rxnfc {
        __u32                           rule_locs[0];
 };
+#define ETHTOOL_FLASH_MAX_FILENAME      128
+enum ethtool_flash_op_type {
+        ETHTOOL_FLASH_ALL_REGIONS       = 0,
+};
+/* for passing firmware flashing related parameters */
+struct ethtool_flash {
+        __u32   cmd;
+        __u32   region;
+        char    data[ETHTOOL_FLASH_MAX_FILENAME];
+};
 #ifdef __KERNEL__
 struct net_device;
 /* Some generic methods drivers may use in their ethtool_ops */
 u32 ethtool_op_get_link(struct net_device *dev);
+u32 ethtool_op_get_rx_csum(struct net_device *dev);
 u32 ethtool_op_get_tx_csum(struct net_device *dev);
 int ethtool_op_set_tx_csum(struct net_device *dev, u32 data);
 int ethtool_op_set_tx_hw_csum(struct net_device *dev, u32 data);
@@ -488,6 +501,7 @@ struct ethtool_ops {
        int     (*get_stats_count)(struct net_device *);/* use get_sset_count */
        int     (*get_rxnfc)(struct net_device *, struct ethtool_rxnfc *, void *);
        int     (*set_rxnfc)(struct net_device *, struct ethtool_rxnfc *);
+        int     (*flash_device)(struct net_device *, struct ethtool_flash *);
 };
 #endif /* __KERNEL__ */
@@ -544,6 +558,7 @@ struct ethtool_ops {
 #define ETHTOOL_GRXCLSRLALL     0x00000030 /* Get all RX classification rule */
 #define ETHTOOL_SRXCLSRLDEL     0x00000031 /* Delete RX classification rule */
 #define ETHTOOL_SRXCLSRLINS     0x00000032 /* Insert RX classification rule */
+#define ETHTOOL_FLASHDEV        0x00000033 /* Flash firmware to device */
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a79f48373e7e..b21cf6b9c80b 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -161,8 +161,8 @@ struct inodes_stat_t {
 * These aren't really reads or writes, they pass down information about
 * parts of device that are now unused by the file system.
 */
-#define DISCARD_NOBARRIER (1 << BIO_RW_DISCARD)
+#define DISCARD_NOBARRIER (WRITE | (1 << BIO_RW_DISCARD))
-#define DISCARD_BARRIER ((1 << BIO_RW_DISCARD) | (1 << BIO_RW_BARRIER))
+#define DISCARD_BARRIER (DISCARD_NOBARRIER | (1 << BIO_RW_BARRIER))
 #define SEL_IN          1
 #define SEL_OUT         2
@@ -1455,11 +1455,6 @@ int fiemap_check_flags(struct fiemap_extent_info *fieinfo, u32 fs_flags);
 #define DT_SOCK         12
 #define DT_WHT          14
-#define OSYNC_METADATA  (1<<0)
-#define OSYNC_DATA      (1<<1)
-#define OSYNC_INODE     (1<<2)
-int generic_osync_inode(struct inode *, struct address_space *, int);
 /*
 * This is the "filldir" function type, used by readdir() to let
 * the kernel specify what kind of dirent layout it wants to have.
@@ -2086,6 +2081,8 @@ extern int write_inode_now(struct inode *, int);
 extern int filemap_fdatawrite(struct address_space *);
 extern int filemap_flush(struct address_space *);
 extern int filemap_fdatawait(struct address_space *);
+extern int filemap_fdatawait_range(struct address_space *, loff_t lstart,
+                                   loff_t lend);
 extern int filemap_write_and_wait(struct address_space *mapping);
 extern int filemap_write_and_wait_range(struct address_space *mapping,
                                        loff_t lstart, loff_t lend);
@@ -2096,7 +2093,10 @@ extern int __filemap_fdatawrite_range(struct address_space *mapping,
 extern int filemap_fdatawrite_range(struct address_space *mapping,
                                loff_t start, loff_t end);
+extern int vfs_fsync_range(struct file *file, struct dentry *dentry,
+                           loff_t start, loff_t end, int datasync);
 extern int vfs_fsync(struct file *file, struct dentry *dentry, int datasync);
+extern int generic_write_sync(struct file *file, loff_t pos, loff_t count);
 extern void sync_supers(void);
 extern void emergency_sync(void);
 extern void emergency_remount(void);
@@ -2202,9 +2202,9 @@ extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);
 extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
 int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
 extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t);
+extern ssize_t __generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long,
+                loff_t *);
 extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t);
-extern ssize_t generic_file_aio_write_nolock(struct kiocb *, const struct iovec *,
-                unsigned long, loff_t);
 extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *,
                unsigned long *, loff_t, loff_t *, size_t, size_t);
 extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
@@ -2214,6 +2214,10 @@ extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t l
 extern int generic_segment_checks(const struct iovec *iov,
                unsigned long *nr_segs, size_t *count, int access_flags);
+/* fs/block_dev.c */
+extern ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
+                                unsigned long nr_segs, loff_t pos);
 /* fs/splice.c */
 extern ssize_t generic_file_splice_read(struct file *, loff_t *,
                struct pipe_inode_info *, size_t, unsigned int);
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 45fc320a53c6..44263cb27121 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -98,7 +98,7 @@ struct hd_struct {
        int make_it_fail;
 #endif
        unsigned long stamp;
-        int in_flight;
+        int in_flight[2];
 #ifdef  CONFIG_SMP
        struct disk_stats *dkstats;
 #else
@@ -322,18 +322,23 @@ static inline void free_part_stats(struct hd_struct *part)
 #define part_stat_sub(cpu, gendiskp, field, subnd)                      \
        part_stat_add(cpu, gendiskp, field, -subnd)
-static inline void part_inc_in_flight(struct hd_struct *part)
+static inline void part_inc_in_flight(struct hd_struct *part, int rw)
 {
-        part->in_flight++;
+        part->in_flight[rw]++;
        if (part->partno)
-                part_to_disk(part)->part0.in_flight++;
+                part_to_disk(part)->part0.in_flight[rw]++;
 }
-static inline void part_dec_in_flight(struct hd_struct *part)
+static inline void part_dec_in_flight(struct hd_struct *part, int rw)
 {
-        part->in_flight--;
+        part->in_flight[rw]--;
        if (part->partno)
-                part_to_disk(part)->part0.in_flight--;
+                part_to_disk(part)->part0.in_flight[rw]--;
+}
+static inline int part_in_flight(struct hd_struct *part)
+{
+        return part->in_flight[0] + part->in_flight[1];
 }
 /* block/blk-core.c */
@@ -546,6 +551,8 @@ extern ssize_t part_size_show(struct device *dev,
                              struct device_attribute *attr, char *buf);
 extern ssize_t part_stat_show(struct device *dev,
                              struct device_attribute *attr, char *buf);
+extern ssize_t part_inflight_show(struct device *dev,
+                              struct device_attribute *attr, char *buf);
 #ifdef CONFIG_FAIL_MAKE_REQUEST
 extern ssize_t part_fail_show(struct device *dev,
                              struct device_attribute *attr, char *buf);
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h
index c56b4bce56d0..b80c88dedbbb 100644
--- a/include/linux/gfs2_ondisk.h
+++ b/include/linux/gfs2_ondisk.h
@@ -333,6 +333,28 @@ struct gfs2_leaf {
 /*
 * Extended attribute header format
+ *
+ * This works in a similar way to dirents. There is a fixed size header
+ * followed by a variable length section made up of the name and the
+ * associated data. In the case of a "stuffed" entry, the value is
+ * inline directly after the name, the ea_num_ptrs entry will be
+ * zero in that case. For non-"stuffed" entries, there will be
+ * a set of pointers (aligned to 8 byte boundary) to the block(s)
+ * containing the value.
+ *
+ * The blocks containing the values and the blocks containing the
+ * extended attribute headers themselves all start with the common
+ * metadata header. Each inode, if it has extended attributes, will
+ * have either a single block containing the extended attribute headers
+ * or a single indirect block pointing to blocks containing the
+ * extended attribure headers.
+ *
+ * The maximim size of the data part of an extended attribute is 64k
+ * so the number of blocks required depends upon block size. Since the
+ * block size also determines the number of pointers in an indirect
+ * block, its a fairly complicated calculation to work out the maximum
+ * number of blocks that an inode may have relating to extended attributes.
+ *
 */
 #define GFS2_EA_MAX_NAME_LEN    255
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h
index 6a6e701f1631..ee275c8b3df1 100644
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.h
@@ -38,7 +38,7 @@ struct hdlc_proto {
        int (*ioctl)(struct net_device *dev, struct ifreq *ifr);
        __be16 (*type_trans)(struct sk_buff *skb, struct net_device *dev);
        int (*netif_rx)(struct sk_buff *skb);
-        int (*xmit)(struct sk_buff *skb, struct net_device *dev);
+        netdev_tx_t (*xmit)(struct sk_buff *skb, struct net_device *dev);
        struct module *module;
        struct hdlc_proto *next; /* next protocol in the list */
 };
@@ -51,7 +51,7 @@ typedef struct hdlc_device {
                      unsigned short encoding, unsigned short parity);
        /* hardware driver must handle this instead of dev->hard_start_xmit */
-        int (*xmit)(struct sk_buff *skb, struct net_device *dev);
+        netdev_tx_t (*xmit)(struct sk_buff *skb, struct net_device *dev);
        /* Things below are for HDLC layer internal use only */
        const struct hdlc_proto *proto;
@@ -60,7 +60,7 @@ typedef struct hdlc_device {
        spinlock_t state_lock;
        void *state;
        void *priv;
-}hdlc_device;
+} hdlc_device;
@@ -106,7 +106,7 @@ void hdlc_close(struct net_device *dev);
 /* May be used by hardware driver */
 int hdlc_change_mtu(struct net_device *dev, int new_mtu);
 /* Must be pointed to by hw driver's dev->netdev_ops->ndo_start_xmit */
-int hdlc_start_xmit(struct sk_buff *skb, struct net_device *dev);
+netdev_tx_t hdlc_start_xmit(struct sk_buff *skb, struct net_device *dev);
 int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto,
                         size_t size);
diff --git a/include/linux/hid-debug.h b/include/linux/hid-debug.h
index 50d568ec178a..53744fa1c8b7 100644
--- a/include/linux/hid-debug.h
+++ b/include/linux/hid-debug.h
@@ -2,7 +2,7 @@
 #define __HID_DEBUG_H
 /*
- *  Copyright (c) 2007  Jiri Kosina
+ *  Copyright (c) 2007-2009     Jiri Kosina
 */
 /*
@@ -22,24 +22,44 @@
 *
 */
-#ifdef CONFIG_HID_DEBUG
+#define HID_DEBUG_BUFSIZE 512
-void hid_dump_input(struct hid_usage *, __s32);
+#ifdef CONFIG_DEBUG_FS
-void hid_dump_device(struct hid_device *);
-void hid_dump_field(struct hid_field *, int);
+void hid_dump_input(struct hid_device *, struct hid_usage *, __s32);
-void hid_resolv_usage(unsigned);
+void hid_dump_device(struct hid_device *, struct seq_file *);
-void hid_resolv_event(__u8, __u16);
+void hid_dump_field(struct hid_field *, int, struct seq_file *);
+char *hid_resolv_usage(unsigned, struct seq_file *);
+void hid_debug_register(struct hid_device *, const char *);
+void hid_debug_unregister(struct hid_device *);
+void hid_debug_init(void);
+void hid_debug_exit(void);
+void hid_debug_event(struct hid_device *, char *);
-#else
-#define hid_dump_input(a,b)     do { } while (0)
+struct hid_debug_list {
-#define hid_dump_device(c)      do { } while (0)
+        char *hid_debug_buf;
-#define hid_dump_field(a,b)     do { } while (0)
+        int head;
-#define hid_resolv_usage(a)         do { } while (0)
+        int tail;
-#define hid_resolv_event(a,b)       do { } while (0)
+        struct fasync_struct *fasync;
+        struct hid_device *hdev;
+        struct list_head node;
+        struct mutex read_mutex;
+};
-#endif /* CONFIG_HID_DEBUG */
+#else
+#define hid_dump_input(a,b,c)           do { } while (0)
+#define hid_dump_device(a,b)            do { } while (0)
+#define hid_dump_field(a,b,c)           do { } while (0)
+#define hid_resolv_usage(a,b)           do { } while (0)
+#define hid_debug_register(a, b)        do { } while (0)
+#define hid_debug_unregister(a)         do { } while (0)
+#define hid_debug_init()                do { } while (0)
+#define hid_debug_exit()                do { } while (0)
+#define hid_debug_event(a,b)            do { } while (0)
+#endif
 #endif
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 53489fd4d700..a0ebdace7baa 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -500,6 +500,14 @@ struct hid_device {							/* device report descriptor */
        /* handler for raw output data, used by hidraw */
        int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t);
+        /* debugging support via debugfs */
+        unsigned short debug;
+        struct dentry *debug_dir;
+        struct dentry *debug_rdesc;
+        struct dentry *debug_events;
+        struct list_head debug_list;
+        wait_queue_head_t debug_wait;
 };
 static inline void *hid_get_drvdata(struct hid_device *hdev)
@@ -657,9 +665,7 @@ struct hid_ll_driver {
 /* HID core API */
-#ifdef CONFIG_HID_DEBUG
 extern int hid_debug;
-#endif
 extern int hid_add_device(struct hid_device *);
 extern void hid_destroy_device(struct hid_device *);
@@ -815,21 +821,9 @@ int hid_pidff_init(struct hid_device *hid);
 #define hid_pidff_init NULL
 #endif
-#ifdef CONFIG_HID_DEBUG
 #define dbg_hid(format, arg...) if (hid_debug) \
                                printk(KERN_DEBUG "%s: " format ,\
                                __FILE__ , ## arg)
-#define dbg_hid_line(format, arg...) if (hid_debug) \
-                                printk(format, ## arg)
-#else
-static inline int __attribute__((format(printf, 1, 2)))
-dbg_hid(const char *fmt, ...)
-{
-        return 0;
-}
-#define dbg_hid_line dbg_hid
-#endif /* HID_DEBUG */
 #define err_hid(format, arg...) printk(KERN_ERR "%s: " format "\n" , \
                __FILE__ , ## arg)
 #endif /* HID_FF */
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
index 0dc80ef24975..3fd21d7cb6bf 100644
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -25,6 +25,9 @@
 #ifndef __TWL4030_H_
 #define __TWL4030_H_
+#include <linux/types.h>
+#include <linux/input/matrix_keypad.h>
 /*
 * Using the twl4030 core we address registers using a pair
 *      { module id, relative register offset }
@@ -302,13 +305,17 @@ struct twl4030_madc_platform_data {
        int             irq_line;
 };
+/* Boards have uniqe mappings of {col, row} --> keycode.
+ * Column and row are 4 bits, but range only from 0..7.
+ * a PERSISTENT_KEY is "always on" and never reported.
+ */
+#define PERSISTENT_KEY(c, r)    KEY((c), (r), KEY_RESERVED)
 struct twl4030_keypad_data {
-        int rows;
+        const struct matrix_keymap_data *keymap_data;
-        int cols;
+        unsigned rows;
-        int *keymap;
+        unsigned cols;
-        int irq;
+        bool rep;
-        unsigned int keymapsize;
-        unsigned int rep:1;
 };
 enum twl4030_usb_mode {
diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index b6a85183c333..c0d8357917e2 100644
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -171,8 +171,6 @@ struct icmp6_filter {
 #ifdef __KERNEL__
 #include <linux/netdevice.h>
-#include <linux/skbuff.h>
 extern void                             icmpv6_send(struct sk_buff *skb,
                                                    u8 type, u8 code,
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index a9173d5434d1..52e15e079c61 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -115,7 +115,7 @@
 #define IEEE80211_MAX_SSID_LEN          32
 #define IEEE80211_MAX_MESH_ID_LEN       32
-#define IEEE80211_MESH_CONFIG_LEN       19
+#define IEEE80211_MESH_CONFIG_LEN       24
 #define IEEE80211_QOS_CTL_LEN           2
 #define IEEE80211_QOS_CTL_TID_MASK      0x000F
@@ -802,6 +802,31 @@ struct ieee80211_ht_cap {
 #define IEEE80211_HT_AMPDU_PARM_FACTOR          0x03
 #define IEEE80211_HT_AMPDU_PARM_DENSITY         0x1C
+/*
+ * Maximum length of AMPDU that the STA can receive.
+ * Length = 2 ^ (13 + max_ampdu_length_exp) - 1 (octets)
+ */
+enum ieee80211_max_ampdu_length_exp {
+        IEEE80211_HT_MAX_AMPDU_8K = 0,
+        IEEE80211_HT_MAX_AMPDU_16K = 1,
+        IEEE80211_HT_MAX_AMPDU_32K = 2,
+        IEEE80211_HT_MAX_AMPDU_64K = 3
+};
+#define IEEE80211_HT_MAX_AMPDU_FACTOR 13
+/* Minimum MPDU start spacing */
+enum ieee80211_min_mpdu_spacing {
+        IEEE80211_HT_MPDU_DENSITY_NONE = 0,     /* No restriction */
+        IEEE80211_HT_MPDU_DENSITY_0_25 = 1,     /* 1/4 usec */
+        IEEE80211_HT_MPDU_DENSITY_0_5 = 2,      /* 1/2 usec */
+        IEEE80211_HT_MPDU_DENSITY_1 = 3,        /* 1 usec */
+        IEEE80211_HT_MPDU_DENSITY_2 = 4,        /* 2 usec */
+        IEEE80211_HT_MPDU_DENSITY_4 = 5,        /* 4 usec */
+        IEEE80211_HT_MPDU_DENSITY_8 = 6,        /* 8 usec */
+        IEEE80211_HT_MPDU_DENSITY_16 = 7        /* 16 usec */
+};
 /**
 * struct ieee80211_ht_info - HT information
 *
@@ -1196,6 +1221,10 @@ enum ieee80211_sa_query_action {
 #define WLAN_CIPHER_SUITE_WEP104        0x000FAC05
 #define WLAN_CIPHER_SUITE_AES_CMAC      0x000FAC06
+/* AKM suite selectors */
+#define WLAN_AKM_SUITE_8021X            0x000FAC01
+#define WLAN_AKM_SUITE_PSK              0x000FAC02
 #define WLAN_MAX_KEY_LEN                32
 /**
diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
index a60c821be44c..fd9740466757 100644
--- a/include/linux/if_addr.h
+++ b/include/linux/if_addr.h
@@ -41,6 +41,7 @@ enum
 #define IFA_F_NODAD             0x02
 #define IFA_F_OPTIMISTIC        0x04
+#define IFA_F_DADFAILED         0x08
 #define IFA_F_HOMEADDRESS       0x10
 #define IFA_F_DEPRECATED        0x20
 #define IFA_F_TENTATIVE         0x40
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index b554300ef8bf..282eb37e2dec 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -87,7 +87,6 @@
 #define ARPHRD_IEEE80211_PRISM 802      /* IEEE 802.11 + Prism2 header  */
 #define ARPHRD_IEEE80211_RADIOTAP 803   /* IEEE 802.11 + radiotap header */
 #define ARPHRD_IEEE802154         804
-#define ARPHRD_IEEE802154_PHY     805
 #define ARPHRD_PHONET   820             /* PhoNet media type            */
 #define ARPHRD_PHONET_PIPE 821          /* PhoNet pipe header           */
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 70fdba2bbf71..580b6004d00e 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -139,10 +139,10 @@ extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);
 /*
 *      Display a 6 byte device address (MAC) in a readable format.
 */
-extern char *print_mac(char *buf, const unsigned char *addr);
+extern char *print_mac(char *buf, const unsigned char *addr) __deprecated;
 #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"
 #define MAC_BUF_SIZE    18
-#define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE] __maybe_unused
+#define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE]
 #endif
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 673f2209453d..80b3a1056a5f 100644
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -69,11 +69,6 @@ struct dlci_conf {
 #define DLCI_VALID_FLAGS        0x000B
-/* FRAD driver uses these to indicate what it did with packet */
-#define DLCI_RET_OK             0x00
-#define DLCI_RET_ERR            0x01
-#define DLCI_RET_DROP           0x02
 /* defines for the actual Frame Relay hardware */
 #define FRAD_GET_CONF   (SIOCDEVPRIVATE)
 #define FRAD_SET_CONF   (SIOCDEVPRIVATE + 1)
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 915ba5789f0e..3f5fd523b49d 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -62,6 +62,7 @@
 #define TUN_F_TSO4      0x02    /* I can handle TSO for IPv4 packets */
 #define TUN_F_TSO6      0x04    /* I can handle TSO for IPv6 packets */
 #define TUN_F_TSO_ECN   0x08    /* I can handle TSO with ECN bits. */
+#define TUN_F_UFO       0x10    /* I can handle UFO packets */
 /* Protocol info prepended to the packets (when IFF_NO_PI is not set) */
 #define TUN_PKT_STRIP   0x0001
diff --git a/include/linux/init.h b/include/linux/init.h
index 13b633ed695e..400adbb45414 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -103,8 +103,8 @@
 #define __INIT          .section        ".init.text","ax"
 #define __FINIT         .previous
-#define __INITDATA      .section        ".init.data","aw"
+#define __INITDATA      .section        ".init.data","aw",%progbits
-#define __INITRODATA    .section        ".init.rodata","a"
+#define __INITRODATA    .section        ".init.rodata","a",%progbits
 #define __FINITDATA     .previous
 #define __DEVINIT        .section       ".devinit.text", "ax"
@@ -305,9 +305,17 @@ void __init parse_early_options(char *cmdline);
 #ifdef CONFIG_MODULES
 #define __init_or_module
 #define __initdata_or_module
+#define __initconst_or_module
+#define __INIT_OR_MODULE        .text
+#define __INITDATA_OR_MODULE    .data
+#define __INITRODATA_OR_MODULE  .section ".rodata","a",%progbits
 #else
 #define __init_or_module __init
 #define __initdata_or_module __initdata
+#define __initconst_or_module __initconst
+#define __INIT_OR_MODULE __INIT
+#define __INITDATA_OR_MODULE __INITDATA
+#define __INITRODATA_OR_MODULE __INITRODATA
 #endif /*CONFIG_MODULES*/
 /* Functions marked as __devexit may be discarded at kernel link time, depending
diff --git a/include/linux/input/eeti_ts.h b/include/linux/input/eeti_ts.h
new file mode 100644
index 000000000000..f875b316249d
--- /dev/null
+++ b/include/linux/input/eeti_ts.h
@@ -0,0 +1,9 @@
+#ifndef LINUX_INPUT_EETI_TS_H
+#define LINUX_INPUT_EETI_TS_H
+struct eeti_ts_platform_data {
+        unsigned int irq_active_high;
+};
+#endif /* LINUX_INPUT_EETI_TS_H */
diff --git a/include/linux/input/matrix_keypad.h b/include/linux/input/matrix_keypad.h
index 15d5903af2dd..b3cd42d50e16 100644
--- a/include/linux/input/matrix_keypad.h
+++ b/include/linux/input/matrix_keypad.h
@@ -63,4 +63,36 @@ struct matrix_keypad_platform_data {
        bool            wakeup;
 };
+/**
+ * matrix_keypad_build_keymap - convert platform keymap into matrix keymap
+ * @keymap_data: keymap supplied by the platform code
+ * @row_shift: number of bits to shift row value by to advance to the next
+ * line in the keymap
+ * @keymap: expanded version of keymap that is suitable for use by
+ * matrix keyboad driver
+ * @keybit: pointer to bitmap of keys supported by input device
+ *
+ * This function converts platform keymap (encoded with KEY() macro) into
+ * an array of keycodes that is suitable for using in a standard matrix
+ * keyboard driver that uses row and col as indices.
+ */
+static inline void
+matrix_keypad_build_keymap(const struct matrix_keymap_data *keymap_data,
+                           unsigned int row_shift,
+                           unsigned short *keymap, unsigned long *keybit)
+{
+        int i;
+        for (i = 0; i < keymap_data->keymap_size; i++) {
+                unsigned int key = keymap_data->keymap[i];
+                unsigned int row = KEY_ROW(key);
+                unsigned int col = KEY_COL(key);
+                unsigned short code = KEY_VAL(key);
+                keymap[MATRIX_SCAN_CODE(row, col, row_shift)] = code;
+                __set_bit(code, keybit);
+        }
+        __clear_bit(KEY_RESERVED, keybit);
+}
 #endif /* _MATRIX_KEYPAD_H */
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 1ac57e522a1f..8e9e151f811e 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -348,6 +348,7 @@ enum
        NET_TX_SOFTIRQ,
        NET_RX_SOFTIRQ,
        BLOCK_SOFTIRQ,
+        BLOCK_IOPOLL_SOFTIRQ,
        TASKLET_SOFTIRQ,
        SCHED_SOFTIRQ,
        HRTIMER_SOFTIRQ,
diff --git a/include/linux/isdn/hdlc.h b/include/linux/isdn/hdlc.h
new file mode 100644
index 000000000000..4b3ecc40889a
--- /dev/null
+++ b/include/linux/isdn/hdlc.h
@@ -0,0 +1,82 @@
+/*
+ * hdlc.h  --  General purpose ISDN HDLC decoder.
+ *
+ * Implementation of a HDLC decoder/encoder in software.
+ * Neccessary because some ISDN devices don't have HDLC
+ * controllers.
+ *
+ * Copyright (C)
+ *      2009    Karsten Keil            <keil@b1-systems.de>
+ *      2002    Wolfgang Mües          <wolfgang@iksw-muees.de>
+ *      2001    Frode Isaksen           <fisaksen@bewan.com>
+ *      2001    Kai Germaschewski       <kai.germaschewski@gmx.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef __ISDNHDLC_H__
+#define __ISDNHDLC_H__
+struct isdnhdlc_vars {
+        int bit_shift;
+        int hdlc_bits1;
+        int data_bits;
+        int ffbit_shift;        /* encoding only */
+        int state;
+        int dstpos;
+        u16 crc;
+        u8 cbin;
+        u8 shift_reg;
+        u8 ffvalue;
+        /* set if transferring data */
+        u32 data_received:1;
+        /* set if D channel (send idle instead of flags) */
+        u32 dchannel:1;
+        /* set if 56K adaptation */
+        u32 do_adapt56:1;
+        /* set if in closing phase (need to send CRC + flag) */
+        u32 do_closing:1;
+        /* set if data is bitreverse */
+        u32 do_bitreverse:1;
+};
+/* Feature Flags */
+#define HDLC_56KBIT     0x01
+#define HDLC_DCHANNEL   0x02
+#define HDLC_BITREVERSE 0x04
+/*
+  The return value from isdnhdlc_decode is
+  the frame length, 0 if no complete frame was decoded,
+  or a negative error number
+*/
+#define HDLC_FRAMING_ERROR     1
+#define HDLC_CRC_ERROR         2
+#define HDLC_LENGTH_ERROR      3
+extern void     isdnhdlc_rcv_init(struct isdnhdlc_vars *hdlc, u32 features);
+extern int      isdnhdlc_decode(struct isdnhdlc_vars *hdlc, const u8 *src,
+                        int slen, int *count, u8 *dst, int dsize);
+extern void     isdnhdlc_out_init(struct isdnhdlc_vars *hdlc, u32 features);
+extern int      isdnhdlc_encode(struct isdnhdlc_vars *hdlc, const u8 *src,
+                        u16 slen, int *count, u8 *dst, int dsize);
+#endif /* __ISDNHDLC_H__ */
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 3db5d8d37485..f8f8900fc5ec 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -14,7 +14,7 @@
 #define KVM_API_VERSION 12
-/* for KVM_TRACE_ENABLE */
+/* for KVM_TRACE_ENABLE, deprecated */
 struct kvm_user_trace_setup {
        __u32 buf_size; /* sub_buffer size of each per-cpu */
        __u32 buf_nr; /* the number of sub_buffers of each per-cpu */
@@ -70,6 +70,14 @@ struct kvm_irqchip {
        } chip;
 };
+/* for KVM_CREATE_PIT2 */
+struct kvm_pit_config {
+        __u32 flags;
+        __u32 pad[15];
+};
+#define KVM_PIT_SPEAKER_DUMMY     1
 #define KVM_EXIT_UNKNOWN          0
 #define KVM_EXIT_EXCEPTION        1
 #define KVM_EXIT_IO               2
@@ -87,6 +95,10 @@ struct kvm_irqchip {
 #define KVM_EXIT_S390_RESET       14
 #define KVM_EXIT_DCR              15
 #define KVM_EXIT_NMI              16
+#define KVM_EXIT_INTERNAL_ERROR   17
+/* For KVM_EXIT_INTERNAL_ERROR */
+#define KVM_INTERNAL_ERROR_EMULATION 1
 /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */
 struct kvm_run {
@@ -173,6 +185,9 @@ struct kvm_run {
                        __u32 data;
                        __u8  is_write;
                } dcr;
+                struct {
+                        __u32 suberror;
+                } internal;
                /* Fix the size of the union. */
                char padding[256];
        };
@@ -292,6 +307,28 @@ struct kvm_guest_debug {
        struct kvm_guest_debug_arch arch;
 };
+enum {
+        kvm_ioeventfd_flag_nr_datamatch,
+        kvm_ioeventfd_flag_nr_pio,
+        kvm_ioeventfd_flag_nr_deassign,
+        kvm_ioeventfd_flag_nr_max,
+};
+#define KVM_IOEVENTFD_FLAG_DATAMATCH (1 << kvm_ioeventfd_flag_nr_datamatch)
+#define KVM_IOEVENTFD_FLAG_PIO       (1 << kvm_ioeventfd_flag_nr_pio)
+#define KVM_IOEVENTFD_FLAG_DEASSIGN  (1 << kvm_ioeventfd_flag_nr_deassign)
+#define KVM_IOEVENTFD_VALID_FLAG_MASK  ((1 << kvm_ioeventfd_flag_nr_max) - 1)
+struct kvm_ioeventfd {
+        __u64 datamatch;
+        __u64 addr;        /* legal pio/mmio address */
+        __u32 len;         /* 1, 2, 4, or 8 bytes    */
+        __s32 fd;
+        __u32 flags;
+        __u8  pad[36];
+};
 #define KVM_TRC_SHIFT           16
 /*
 * kvm trace categories
@@ -310,35 +347,6 @@ struct kvm_guest_debug {
 #define KVM_TRC_CYCLE_SIZE      8
 #define KVM_TRC_EXTRA_MAX       7
-/* This structure represents a single trace buffer record. */
-struct kvm_trace_rec {
-        /* variable rec_val
-         * is split into:
-         * bits 0 - 27  -> event id
-         * bits 28 -30  -> number of extra data args of size u32
-         * bits 31      -> binary indicator for if tsc is in record
-         */
-        __u32 rec_val;
-        __u32 pid;
-        __u32 vcpu_id;
-        union {
-                struct {
-                        __u64 timestamp;
-                        __u32 extra_u32[KVM_TRC_EXTRA_MAX];
-                } __attribute__((packed)) timestamp;
-                struct {
-                        __u32 extra_u32[KVM_TRC_EXTRA_MAX];
-                } notimestamp;
-        } u;
-};
-#define TRACE_REC_EVENT_ID(val) \
-                (0x0fffffff & (val))
-#define TRACE_REC_NUM_DATA_ARGS(val) \
-                (0x70000000 & ((val) << 28))
-#define TRACE_REC_TCS(val) \
-                (0x80000000 & ((val) << 31))
 #define KVMIO 0xAE
 /*
@@ -415,6 +423,19 @@ struct kvm_trace_rec {
 #define KVM_CAP_ASSIGN_DEV_IRQ 29
 /* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */
 #define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30
+#ifdef __KVM_HAVE_MCE
+#define KVM_CAP_MCE 31
+#endif
+#define KVM_CAP_IRQFD 32
+#ifdef __KVM_HAVE_PIT
+#define KVM_CAP_PIT2 33
+#endif
+#define KVM_CAP_SET_BOOT_CPU_ID 34
+#ifdef __KVM_HAVE_PIT_STATE2
+#define KVM_CAP_PIT_STATE2 35
+#endif
+#define KVM_CAP_IOEVENTFD 36
+#define KVM_CAP_SET_IDENTITY_MAP_ADDR 37
 #ifdef KVM_CAP_IRQ_ROUTING
@@ -454,15 +475,32 @@ struct kvm_irq_routing {
 #endif
+#ifdef KVM_CAP_MCE
+/* x86 MCE */
+struct kvm_x86_mce {
+        __u64 status;
+        __u64 addr;
+        __u64 misc;
+        __u64 mcg_status;
+        __u8 bank;
+        __u8 pad1[7];
+        __u64 pad2[3];
+};
+#endif
+#define KVM_IRQFD_FLAG_DEASSIGN (1 << 0)
+struct kvm_irqfd {
+        __u32 fd;
+        __u32 gsi;
+        __u32 flags;
+        __u8  pad[20];
+};
 /*
 * ioctls for VM fds
 */
 #define KVM_SET_MEMORY_REGION     _IOW(KVMIO, 0x40, struct kvm_memory_region)
-#define KVM_SET_NR_MMU_PAGES      _IO(KVMIO, 0x44)
-#define KVM_GET_NR_MMU_PAGES      _IO(KVMIO, 0x45)
-#define KVM_SET_USER_MEMORY_REGION _IOW(KVMIO, 0x46,\
-                                        struct kvm_userspace_memory_region)
-#define KVM_SET_TSS_ADDR          _IO(KVMIO, 0x47)
 /*
 * KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns
 * a vcpu fd.
@@ -470,6 +508,12 @@ struct kvm_irq_routing {
 #define KVM_CREATE_VCPU           _IO(KVMIO,  0x41)
 #define KVM_GET_DIRTY_LOG         _IOW(KVMIO, 0x42, struct kvm_dirty_log)
 #define KVM_SET_MEMORY_ALIAS      _IOW(KVMIO, 0x43, struct kvm_memory_alias)
+#define KVM_SET_NR_MMU_PAGES      _IO(KVMIO, 0x44)
+#define KVM_GET_NR_MMU_PAGES      _IO(KVMIO, 0x45)
+#define KVM_SET_USER_MEMORY_REGION _IOW(KVMIO, 0x46,\
+                                        struct kvm_userspace_memory_region)
+#define KVM_SET_TSS_ADDR          _IO(KVMIO, 0x47)
+#define KVM_SET_IDENTITY_MAP_ADDR _IOW(KVMIO, 0x48, __u64)
 /* Device model IOC */
 #define KVM_CREATE_IRQCHIP        _IO(KVMIO,  0x60)
 #define KVM_IRQ_LINE              _IOW(KVMIO, 0x61, struct kvm_irq_level)
@@ -498,6 +542,10 @@ struct kvm_irq_routing {
 #define KVM_ASSIGN_SET_MSIX_ENTRY \
                        _IOW(KVMIO, 0x74, struct kvm_assigned_msix_entry)
 #define KVM_DEASSIGN_DEV_IRQ       _IOW(KVMIO, 0x75, struct kvm_assigned_irq)
+#define KVM_IRQFD                  _IOW(KVMIO, 0x76, struct kvm_irqfd)
+#define KVM_CREATE_PIT2            _IOW(KVMIO, 0x77, struct kvm_pit_config)
+#define KVM_SET_BOOT_CPU_ID        _IO(KVMIO, 0x78)
+#define KVM_IOEVENTFD             _IOW(KVMIO, 0x79, struct kvm_ioeventfd)
 /*
 * ioctls for vcpu fds
@@ -541,6 +589,10 @@ struct kvm_irq_routing {
 #define KVM_NMI                   _IO(KVMIO,  0x9a)
 /* Available with KVM_CAP_SET_GUEST_DEBUG */
 #define KVM_SET_GUEST_DEBUG       _IOW(KVMIO,  0x9b, struct kvm_guest_debug)
+/* MCE for x86 */
+#define KVM_X86_SETUP_MCE         _IOW(KVMIO,  0x9c, __u64)
+#define KVM_X86_GET_MCE_CAP_SUPPORTED _IOR(KVMIO,  0x9d, __u64)
+#define KVM_X86_SET_MCE           _IOW(KVMIO,  0x9e, struct kvm_x86_mce)
 /*
 * Deprecated interfaces
@@ -563,6 +615,9 @@ struct kvm_debug_guest {
 #define KVM_IA64_VCPU_GET_STACK   _IOR(KVMIO,  0x9a, void *)
 #define KVM_IA64_VCPU_SET_STACK   _IOW(KVMIO,  0x9b, void *)
+#define KVM_GET_PIT2   _IOR(KVMIO,   0x9f, struct kvm_pit_state2)
+#define KVM_SET_PIT2   _IOW(KVMIO,   0xa0, struct kvm_pit_state2)
 #define KVM_TRC_INJ_VIRQ         (KVM_TRC_HANDLER + 0x02)
 #define KVM_TRC_REDELIVER_EVT    (KVM_TRC_HANDLER + 0x03)
 #define KVM_TRC_PEND_INTR        (KVM_TRC_HANDLER + 0x04)
@@ -633,7 +688,7 @@ struct kvm_assigned_msix_nr {
        __u16 padding;
 };
-#define KVM_MAX_MSIX_PER_DEV            512
+#define KVM_MAX_MSIX_PER_DEV            256
 struct kvm_assigned_msix_entry {
        __u32 assigned_dev_id;
        __u32 gsi;
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 3060bdc35ffe..4af56036a6bf 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -42,6 +42,7 @@
 #define KVM_USERSPACE_IRQ_SOURCE_ID     0
+struct kvm;
 struct kvm_vcpu;
 extern struct kmem_cache *kvm_vcpu_cache;
@@ -59,10 +60,18 @@ struct kvm_io_bus {
 void kvm_io_bus_init(struct kvm_io_bus *bus);
 void kvm_io_bus_destroy(struct kvm_io_bus *bus);
-struct kvm_io_device *kvm_io_bus_find_dev(struct kvm_io_bus *bus,
+int kvm_io_bus_write(struct kvm_io_bus *bus, gpa_t addr, int len,
-                                          gpa_t addr, int len, int is_write);
+                     const void *val);
-void kvm_io_bus_register_dev(struct kvm_io_bus *bus,
+int kvm_io_bus_read(struct kvm_io_bus *bus, gpa_t addr, int len,
-                             struct kvm_io_device *dev);
+                    void *val);
+int __kvm_io_bus_register_dev(struct kvm_io_bus *bus,
+                               struct kvm_io_device *dev);
+int kvm_io_bus_register_dev(struct kvm *kvm, struct kvm_io_bus *bus,
+                            struct kvm_io_device *dev);
+void __kvm_io_bus_unregister_dev(struct kvm_io_bus *bus,
+                                 struct kvm_io_device *dev);
+void kvm_io_bus_unregister_dev(struct kvm *kvm, struct kvm_io_bus *bus,
+                               struct kvm_io_device *dev);
 struct kvm_vcpu {
        struct kvm *kvm;
@@ -103,7 +112,7 @@ struct kvm_memory_slot {
        struct {
                unsigned long rmap_pde;
                int write_count;
-        } *lpage_info;
+        } *lpage_info[KVM_NR_PAGE_SIZES - 1];
        unsigned long userspace_addr;
        int user_alloc;
 };
@@ -124,7 +133,6 @@ struct kvm_kernel_irq_routing_entry {
 };
 struct kvm {
-        struct mutex lock; /* protects the vcpus array and APIC accesses */
        spinlock_t mmu_lock;
        spinlock_t requests_lock;
        struct rw_semaphore slots_lock;
@@ -132,10 +140,23 @@ struct kvm {
        int nmemslots;
        struct kvm_memory_slot memslots[KVM_MEMORY_SLOTS +
                                        KVM_PRIVATE_MEM_SLOTS];
+#ifdef CONFIG_KVM_APIC_ARCHITECTURE
+        u32 bsp_vcpu_id;
+        struct kvm_vcpu *bsp_vcpu;
+#endif
        struct kvm_vcpu *vcpus[KVM_MAX_VCPUS];
+        atomic_t online_vcpus;
        struct list_head vm_list;
+        struct mutex lock;
        struct kvm_io_bus mmio_bus;
        struct kvm_io_bus pio_bus;
+#ifdef CONFIG_HAVE_KVM_EVENTFD
+        struct {
+                spinlock_t        lock;
+                struct list_head  items;
+        } irqfds;
+        struct list_head ioeventfds;
+#endif
        struct kvm_vm_stat stat;
        struct kvm_arch arch;
        atomic_t users_count;
@@ -144,6 +165,7 @@ struct kvm {
        struct kvm_coalesced_mmio_ring *coalesced_mmio_ring;
 #endif
+        struct mutex irq_lock;
 #ifdef CONFIG_HAVE_KVM_IRQCHIP
        struct list_head irq_routing; /* of kvm_kernel_irq_routing_entry */
        struct hlist_head mask_notifier_list;
@@ -167,6 +189,17 @@ struct kvm {
 #define kvm_printf(kvm, fmt ...) printk(KERN_DEBUG fmt)
 #define vcpu_printf(vcpu, fmt...) kvm_printf(vcpu->kvm, fmt)
+static inline struct kvm_vcpu *kvm_get_vcpu(struct kvm *kvm, int i)
+{
+        smp_rmb();
+        return kvm->vcpus[i];
+}
+#define kvm_for_each_vcpu(idx, vcpup, kvm) \
+        for (idx = 0, vcpup = kvm_get_vcpu(kvm, idx); \
+             idx < atomic_read(&kvm->online_vcpus) && vcpup; \
+             vcpup = kvm_get_vcpu(kvm, ++idx))
 int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id);
 void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
@@ -201,6 +234,7 @@ int kvm_arch_set_memory_region(struct kvm *kvm,
                                struct kvm_userspace_memory_region *mem,
                                struct kvm_memory_slot old,
                                int user_alloc);
+void kvm_disable_largepages(void);
 void kvm_arch_flush_shadow(struct kvm *kvm);
 gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn);
 struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn);
@@ -243,8 +277,6 @@ long kvm_arch_dev_ioctl(struct file *filp,
                        unsigned int ioctl, unsigned long arg);
 long kvm_arch_vcpu_ioctl(struct file *filp,
                         unsigned int ioctl, unsigned long arg);
-void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu);
-void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu);
 int kvm_dev_ioctl_check_extension(long ext);
@@ -300,7 +332,6 @@ int kvm_arch_hardware_setup(void);
 void kvm_arch_hardware_unsetup(void);
 void kvm_arch_check_processor_compat(void *rtn);
 int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);
-int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu);
 void kvm_free_physmem(struct kvm *kvm);
@@ -309,8 +340,6 @@ void kvm_arch_destroy_vm(struct kvm *kvm);
 void kvm_free_all_assigned_devices(struct kvm *kvm);
 void kvm_arch_sync_events(struct kvm *kvm);
-int kvm_cpu_get_interrupt(struct kvm_vcpu *v);
-int kvm_cpu_has_interrupt(struct kvm_vcpu *v);
 int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu);
 void kvm_vcpu_kick(struct kvm_vcpu *vcpu);
@@ -366,7 +395,8 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, int irq, int level);
 void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin);
 void kvm_register_irq_ack_notifier(struct kvm *kvm,
                                   struct kvm_irq_ack_notifier *kian);
-void kvm_unregister_irq_ack_notifier(struct kvm_irq_ack_notifier *kian);
+void kvm_unregister_irq_ack_notifier(struct kvm *kvm,
+                                   struct kvm_irq_ack_notifier *kian);
 int kvm_request_irq_source_id(struct kvm *kvm);
 void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id);
@@ -459,37 +489,6 @@ struct kvm_stats_debugfs_item {
 extern struct kvm_stats_debugfs_item debugfs_entries[];
 extern struct dentry *kvm_debugfs_dir;
-#define KVMTRACE_5D(evt, vcpu, d1, d2, d3, d4, d5, name) \
-        trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \
-                                                vcpu, 5, d1, d2, d3, d4, d5)
-#define KVMTRACE_4D(evt, vcpu, d1, d2, d3, d4, name) \
-        trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \
-                                                vcpu, 4, d1, d2, d3, d4, 0)
-#define KVMTRACE_3D(evt, vcpu, d1, d2, d3, name) \
-        trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \
-                                                vcpu, 3, d1, d2, d3, 0, 0)
-#define KVMTRACE_2D(evt, vcpu, d1, d2, name) \
-        trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \
-                                                vcpu, 2, d1, d2, 0, 0, 0)
-#define KVMTRACE_1D(evt, vcpu, d1, name) \
-        trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \
-                                                vcpu, 1, d1, 0, 0, 0, 0)
-#define KVMTRACE_0D(evt, vcpu, name) \
-        trace_mark(kvm_trace_##name, "%u %p %u %u %u %u %u %u", KVM_TRC_##evt, \
-                                                vcpu, 0, 0, 0, 0, 0, 0)
-#ifdef CONFIG_KVM_TRACE
-int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg);
-void kvm_trace_cleanup(void);
-#else
-static inline
-int kvm_trace_ioctl(unsigned int ioctl, unsigned long arg)
-{
-        return -EINVAL;
-}
-#define kvm_trace_cleanup() ((void)0)
-#endif
 #ifdef KVM_ARCH_WANT_MMU_NOTIFIER
 static inline int mmu_notifier_retry(struct kvm_vcpu *vcpu, unsigned long mmu_seq)
 {
@@ -525,4 +524,33 @@ static inline void kvm_free_irq_routing(struct kvm *kvm) {}
 #endif
+#ifdef CONFIG_HAVE_KVM_EVENTFD
+void kvm_eventfd_init(struct kvm *kvm);
+int kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags);
+void kvm_irqfd_release(struct kvm *kvm);
+int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args);
+#else
+static inline void kvm_eventfd_init(struct kvm *kvm) {}
+static inline int kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)
+{
+        return -EINVAL;
+}
+static inline void kvm_irqfd_release(struct kvm *kvm) {}
+static inline int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args)
+{
+        return -ENOSYS;
+}
+#endif /* CONFIG_HAVE_KVM_EVENTFD */
+#ifdef CONFIG_KVM_APIC_ARCHITECTURE
+static inline bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu)
+{
+        return vcpu->kvm->bsp_vcpu_id == vcpu->vcpu_id;
+}
+#endif
 #endif
diff --git a/include/linux/kvm_para.h b/include/linux/kvm_para.h
index 3ddce03766ca..d73109243fda 100644
--- a/include/linux/kvm_para.h
+++ b/include/linux/kvm_para.h
@@ -13,6 +13,7 @@
 #define KVM_ENOSYS              1000
 #define KVM_EFAULT              EFAULT
 #define KVM_E2BIG               E2BIG
+#define KVM_EPERM               EPERM
 #define KVM_HC_VAPIC_POLL_IRQ           1
 #define KVM_HC_MMU_OP                   2
diff --git a/include/linux/libps2.h b/include/linux/libps2.h
index b94534b7e266..fcf5fbe6a50c 100644
--- a/include/linux/libps2.h
+++ b/include/linux/libps2.h
@@ -44,6 +44,7 @@ struct ps2dev {
 void ps2_init(struct ps2dev *ps2dev, struct serio *serio);
 int ps2_sendbyte(struct ps2dev *ps2dev, unsigned char byte, int timeout);
 void ps2_drain(struct ps2dev *ps2dev, int maxbytes, int timeout);
+int __ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command);
 int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command);
 int ps2_handle_ack(struct ps2dev *ps2dev, unsigned char data);
 int ps2_handle_response(struct ps2dev *ps2dev, unsigned char data);
diff --git a/include/linux/mISDNhw.h b/include/linux/mISDNhw.h
index 7f9831da847f..4af841408fb5 100644
--- a/include/linux/mISDNhw.h
+++ b/include/linux/mISDNhw.h
@@ -168,6 +168,7 @@ struct bchannel {
 extern int      mISDN_initdchannel(struct dchannel *, int, void *);
 extern int      mISDN_initbchannel(struct bchannel *, int);
 extern int      mISDN_freedchannel(struct dchannel *);
+extern void     mISDN_clear_bchannel(struct bchannel *);
 extern int      mISDN_freebchannel(struct bchannel *);
 extern void     queue_ch_frame(struct mISDNchannel *, u_int,
                        int, struct sk_buff *);
diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h
index 45100b39a7cf..536ca12442ca 100644
--- a/include/linux/mISDNif.h
+++ b/include/linux/mISDNif.h
@@ -37,7 +37,7 @@
 */
 #define MISDN_MAJOR_VERSION     1
 #define MISDN_MINOR_VERSION     1
-#define MISDN_RELEASE           20
+#define MISDN_RELEASE           21
 /* primitives for information exchange
 * generell format
@@ -153,6 +153,18 @@
 #define HFC_VOL_CHANGE_RX       0x2602
 #define HFC_SPL_LOOP_ON         0x2603
 #define HFC_SPL_LOOP_OFF        0x2604
+/* for T30 FAX and analog modem */
+#define HW_MOD_FRM              0x4000
+#define HW_MOD_FRH              0x4001
+#define HW_MOD_FTM              0x4002
+#define HW_MOD_FTH              0x4003
+#define HW_MOD_FTS              0x4004
+#define HW_MOD_CONNECT          0x4010
+#define HW_MOD_OK               0x4011
+#define HW_MOD_NOCARR           0x4012
+#define HW_MOD_FCERROR          0x4013
+#define HW_MOD_READY            0x4014
+#define HW_MOD_LASTDATA         0x4015
 /* DSP_TONE_PATT_ON parameter */
 #define TONE_OFF                        0x0000
@@ -224,6 +236,8 @@
 #define ISDN_P_B_L2DTMF         0x24
 #define ISDN_P_B_L2DSP          0x25
 #define ISDN_P_B_L2DSPHDLC      0x26
+#define ISDN_P_B_T30_FAX        0x27
+#define ISDN_P_B_MODEM_ASYNC    0x28
 #define OPTION_L2_PMX           1
 #define OPTION_L2_PTP           2
diff --git a/include/linux/mdio.h b/include/linux/mdio.h
index cfdf1df2875e..c779b49a1fda 100644
--- a/include/linux/mdio.h
+++ b/include/linux/mdio.h
@@ -304,7 +304,7 @@ static inline __u16 mdio_phy_id_devad(int phy_id)
 */
 struct mdio_if_info {
        int prtad;
-        u32 __bitwise mmds;
+        u32 mmds;
        unsigned mode_support;
        struct net_device *dev;
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 39751c8cde9c..2dbfb5a05994 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -22,6 +22,12 @@
 /*
 * Vendors and devices.  Sort key: vendor first, device next.
 */
+#define SDIO_VENDOR_ID_INTEL                    0x0089
+#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX      0x1402
+#define SDIO_DEVICE_ID_INTEL_IWMC3200WIFI       0x1403
+#define SDIO_DEVICE_ID_INTEL_IWMC3200TOP        0x1404
+#define SDIO_DEVICE_ID_INTEL_IWMC3200GPS        0x1405
+#define SDIO_DEVICE_ID_INTEL_IWMC3200BT         0x1406
 #define SDIO_VENDOR_ID_MARVELL                  0x02df
 #define SDIO_DEVICE_ID_MARVELL_LIBERTAS         0x9103
diff --git a/include/linux/net_dropmon.h b/include/linux/net_dropmon.h
index 3ceb0cc1bc78..2a739462caeb 100644
--- a/include/linux/net_dropmon.h
+++ b/include/linux/net_dropmon.h
@@ -3,7 +3,6 @@
 #include <linux/types.h>
 #include <linux/netlink.h>
-#include <linux/types.h>
 struct net_dm_drop_point {
        __u8 pc[8];
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index d4a4d9867794..65ee1929b2b1 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -72,10 +72,6 @@ struct wireless_dev;
 /* Backlog congestion levels */
 #define NET_RX_SUCCESS          0   /* keep 'em coming, baby */
 #define NET_RX_DROP             1  /* packet dropped */
-#define NET_RX_CN_LOW           2   /* storm alert, just in case */
-#define NET_RX_CN_MOD           3   /* Storm on its way! */
-#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
@@ -83,17 +79,19 @@ struct wireless_dev;
 #define net_xmit_eval(e)        ((e) == NET_XMIT_CN? 0 : (e))
 #define net_xmit_errno(e)       ((e) != NET_XMIT_CN ? -ENOBUFS : 0)
+/* Driver transmit return codes */
+enum netdev_tx {
+        NETDEV_TX_OK = 0,       /* driver took care of packet */
+        NETDEV_TX_BUSY,         /* driver tx path was busy*/
+        NETDEV_TX_LOCKED = -1,  /* driver tx lock was already taken */
+};
+typedef enum netdev_tx netdev_tx_t;
 #endif
 #define MAX_ADDR_LEN    32              /* Largest hardware address length */
-/* Driver transmit return codes */
-#define NETDEV_TX_OK 0          /* driver took care of packet */
-#define NETDEV_TX_BUSY 1        /* driver tx path was busy*/
-#define NETDEV_TX_LOCKED -1     /* driver tx lock was already taken */
 #ifdef  __KERNEL__
 /*
 *      Compute the worst case header length according to the protocols
 *      used.
@@ -511,9 +509,11 @@ struct netdev_queue {
 *     This function is called when network device transistions to the down
 *     state.
 *
- * int (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev);
+ * netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb,
+ *                               struct net_device *dev);
 *      Called when a packet needs to be transmitted.
- *      Must return NETDEV_TX_OK , NETDEV_TX_BUSY, or NETDEV_TX_LOCKED,
+ *      Must return NETDEV_TX_OK , NETDEV_TX_BUSY.
+ *        (can also return NETDEV_TX_LOCKED iff NETIF_F_LLTX)
 *      Required can not be NULL.
 *
 * u16 (*ndo_select_queue)(struct net_device *dev, struct sk_buff *skb);
@@ -584,7 +584,7 @@ struct net_device_ops {
        void                    (*ndo_uninit)(struct net_device *dev);
        int                     (*ndo_open)(struct net_device *dev);
        int                     (*ndo_stop)(struct net_device *dev);
-        int                     (*ndo_start_xmit) (struct sk_buff *skb,
+        netdev_tx_t             (*ndo_start_xmit) (struct sk_buff *skb,
                                                   struct net_device *dev);
        u16                     (*ndo_select_queue)(struct net_device *dev,
                                                    struct sk_buff *skb);
@@ -627,6 +627,8 @@ struct net_device_ops {
        void                    (*ndo_poll_controller)(struct net_device *dev);
 #endif
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
+        int                     (*ndo_fcoe_enable)(struct net_device *dev);
+        int                     (*ndo_fcoe_disable)(struct net_device *dev);
        int                     (*ndo_fcoe_ddp_setup)(struct net_device *dev,
                                                      u16 xid,
                                                      struct scatterlist *sgl,
@@ -705,6 +707,7 @@ struct net_device
 /* the GSO_MASK reserves bits 16 through 23 */
 #define NETIF_F_FCOE_CRC        (1 << 24) /* FCoE CRC32 */
 #define NETIF_F_SCTP_CSUM       (1 << 25) /* SCTP checksum offload */
+#define NETIF_F_FCOE_MTU        (1 << 26) /* Supports max FCoE MTU, 2158 bytes*/
        /* Segmentation offload features */
 #define NETIF_F_GSO_SHIFT       16
@@ -829,6 +832,9 @@ struct net_device
        /* Number of TX queues currently active in device  */
        unsigned int            real_num_tx_queues;
+        /* root qdisc from userspace point of view */
+        struct Qdisc            *qdisc;
        unsigned long           tx_queue_len;   /* Max frames per queue allowed */
        spinlock_t              tx_global_lock;
 /*
@@ -992,6 +998,12 @@ static inline void *netdev_priv(const struct net_device *dev)
 */
 #define SET_NETDEV_DEV(net, pdev)       ((net)->dev.parent = (pdev))
+/* Set the sysfs device type for the network logical device to allow
+ * fin grained indentification of different network device types. For
+ * example Ethernet, Wirelss LAN, Bluetooth, WiMAX etc.
+ */
+#define SET_NETDEV_DEVTYPE(net, devtype)        ((net)->dev.type = (devtype))
 /**
 *      netif_napi_add - initialize a napi context
 *      @dev:  network device
@@ -1260,7 +1272,7 @@ static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue)
 {
 #ifdef CONFIG_NETPOLL_TRAP
        if (netpoll_trap()) {
-                clear_bit(__QUEUE_STATE_XOFF, &dev_queue->state);
+                netif_tx_start_queue(dev_queue);
                return;
        }
 #endif
@@ -1366,7 +1378,8 @@ static inline int netif_running(const struct net_device *dev)
 static inline void netif_start_subqueue(struct net_device *dev, u16 queue_index)
 {
        struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
-        clear_bit(__QUEUE_STATE_XOFF, &txq->state);
+        netif_tx_start_queue(txq);
 }
 /**
@@ -1383,7 +1396,7 @@ static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index)
        if (netpoll_trap())
                return;
 #endif
-        set_bit(__QUEUE_STATE_XOFF, &txq->state);
+        netif_tx_stop_queue(txq);
 }
 /**
@@ -1397,7 +1410,8 @@ static inline int __netif_subqueue_stopped(const struct net_device *dev,
                                         u16 queue_index)
 {
        struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
-        return test_bit(__QUEUE_STATE_XOFF, &txq->state);
+        return netif_tx_queue_stopped(txq);
 }
 static inline int netif_subqueue_stopped(const struct net_device *dev,
@@ -1749,8 +1763,7 @@ static inline void netif_tx_unlock(struct net_device *dev)
                 * force a schedule.
                 */
                clear_bit(__QUEUE_STATE_FROZEN, &txq->state);
-                if (!test_bit(__QUEUE_STATE_XOFF, &txq->state))
+                netif_schedule_queue(txq);
-                        __netif_schedule(txq->qdisc);
        }
        spin_unlock(&dev->tx_global_lock);
 }
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index bff4d5741d98..9f00da287f2c 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -58,7 +58,8 @@ struct nfgenmsg {
 struct nfnl_callback
 {
        int (*call)(struct sock *nl, struct sk_buff *skb, 
-                struct nlmsghdr *nlh, struct nlattr *cda[]);
+                    const struct nlmsghdr *nlh,
+                    const struct nlattr * const cda[]);
        const struct nla_policy *policy;        /* netlink attribute policy */
        const u_int16_t attr_count;             /* number of nlattr's */
 };
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 1030b7593898..812cb153cabb 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -238,9 +238,9 @@ struct xt_mtdtor_param {
 */
 struct xt_target_param {
        const struct net_device *in, *out;
-        unsigned int hooknum;
        const struct xt_target *target;
        const void *targinfo;
+        unsigned int hooknum;
        u_int8_t family;
 };
@@ -407,7 +407,7 @@ extern int xt_check_target(struct xt_tgchk_param *,
                           unsigned int size, u_int8_t proto, bool inv_proto);
 extern struct xt_table *xt_register_table(struct net *net,
-                                          struct xt_table *table,
+                                          const struct xt_table *table,
                                          struct xt_table_info *bootstrap,
                                          struct xt_table_info *newinfo);
 extern void *xt_unregister_table(struct xt_table *table);
diff --git a/include/linux/netfilter/xt_CONNMARK.h b/include/linux/netfilter/xt_CONNMARK.h
index 7635c8ffdadb..0a8545866752 100644
--- a/include/linux/netfilter/xt_CONNMARK.h
+++ b/include/linux/netfilter/xt_CONNMARK.h
@@ -18,12 +18,6 @@ enum {
        XT_CONNMARK_RESTORE
 };
-struct xt_connmark_target_info {
-        unsigned long mark;
-        unsigned long mask;
-        __u8 mode;
-};
 struct xt_connmark_tginfo1 {
        __u32 ctmark, ctmask, nfmask;
        __u8 mode;
diff --git a/include/linux/netfilter/xt_MARK.h b/include/linux/netfilter/xt_MARK.h
index 028304bcc0b1..bc9561bdef79 100644
--- a/include/linux/netfilter/xt_MARK.h
+++ b/include/linux/netfilter/xt_MARK.h
@@ -3,23 +3,6 @@
 #include <linux/types.h>
-/* Version 0 */
-struct xt_mark_target_info {
-        unsigned long mark;
-};
-/* Version 1 */
-enum {
-        XT_MARK_SET=0,
-        XT_MARK_AND,
-        XT_MARK_OR,
-};
-struct xt_mark_target_info_v1 {
-        unsigned long mark;
-        __u8 mode;
-};
 struct xt_mark_tginfo2 {
        __u32 mark, mask;
 };
diff --git a/include/linux/netfilter/xt_connmark.h b/include/linux/netfilter/xt_connmark.h
index 571e266d004c..619e47cde01a 100644
--- a/include/linux/netfilter/xt_connmark.h
+++ b/include/linux/netfilter/xt_connmark.h
@@ -12,11 +12,6 @@
 * (at your option) any later version.
 */
-struct xt_connmark_info {
-        unsigned long mark, mask;
-        __u8 invert;
-};
 struct xt_connmark_mtinfo1 {
        __u32 mark, mask;
        __u8 invert;
diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h
index 7ae05338e94c..54f47a2f6152 100644
--- a/include/linux/netfilter/xt_conntrack.h
+++ b/include/linux/netfilter/xt_conntrack.h
@@ -32,42 +32,6 @@ enum {
        XT_CONNTRACK_DIRECTION    = 1 << 12,
 };
-/* This is exposed to userspace, so remains frozen in time. */
-struct ip_conntrack_old_tuple
-{
-        struct {
-                __be32 ip;
-                union {
-                        __u16 all;
-                } u;
-        } src;
-        struct {
-                __be32 ip;
-                union {
-                        __u16 all;
-                } u;
-                /* The protocol. */
-                __u16 protonum;
-        } dst;
-};
-struct xt_conntrack_info
-{
-        unsigned int statemask, statusmask;
-        struct ip_conntrack_old_tuple tuple[IP_CT_DIR_MAX];
-        struct in_addr sipmsk[IP_CT_DIR_MAX], dipmsk[IP_CT_DIR_MAX];
-        unsigned long expires_min, expires_max;
-        /* Flags word */
-        __u8 flags;
-        /* Inverse flags */
-        __u8 invflags;
-};
 struct xt_conntrack_mtinfo1 {
        union nf_inet_addr origsrc_addr, origsrc_mask;
        union nf_inet_addr origdst_addr, origdst_mask;
diff --git a/include/linux/netfilter/xt_mark.h b/include/linux/netfilter/xt_mark.h
index 6fa460a3cc29..6607c8f38ea5 100644
--- a/include/linux/netfilter/xt_mark.h
+++ b/include/linux/netfilter/xt_mark.h
@@ -3,11 +3,6 @@
 #include <linux/types.h>
-struct xt_mark_info {
-    unsigned long mark, mask;
-    __u8 invert;
-};
 struct xt_mark_mtinfo1 {
        __u32 mark, mask;
        __u8 invert;
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
index 590ac3d6d5d6..6fe3e6aa10db 100644
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
@@ -265,7 +265,7 @@ struct arpt_error
 }
 extern struct xt_table *arpt_register_table(struct net *net,
-                                            struct xt_table *table,
+                                            const struct xt_table *table,
                                            const struct arpt_replace *repl);
 extern void arpt_unregister_table(struct xt_table *table);
 extern unsigned int arpt_do_table(struct sk_buff *skb,
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h
index e40ddb94b1af..ea281e6a2048 100644
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
@@ -301,7 +301,7 @@ struct ebt_table
 #define EBT_ALIGN(s) (((s) + (__alignof__(struct ebt_replace)-1)) & \
                     ~(__alignof__(struct ebt_replace)-1))
 extern struct ebt_table *ebt_register_table(struct net *net,
-                                            struct ebt_table *table);
+                                            const struct ebt_table *table);
 extern void ebt_unregister_table(struct ebt_table *table);
 extern unsigned int ebt_do_table(unsigned int hook, struct sk_buff *skb,
   const struct net_device *in, const struct net_device *out,
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
index 3a7105bb8f33..431b40761920 100644
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
@@ -1,46 +1,14 @@
-header-y += ipt_CLASSIFY.h
 header-y += ipt_CLUSTERIP.h
-header-y += ipt_CONNMARK.h
-header-y += ipt_DSCP.h
 header-y += ipt_ECN.h
 header-y += ipt_LOG.h
-header-y += ipt_MARK.h
-header-y += ipt_NFQUEUE.h
 header-y += ipt_REJECT.h
 header-y += ipt_SAME.h
-header-y += ipt_TCPMSS.h
-header-y += ipt_TOS.h
 header-y += ipt_TTL.h
 header-y += ipt_ULOG.h
 header-y += ipt_addrtype.h
 header-y += ipt_ah.h
-header-y += ipt_comment.h
-header-y += ipt_connbytes.h
-header-y += ipt_connmark.h
-header-y += ipt_conntrack.h
-header-y += ipt_dccp.h
-header-y += ipt_dscp.h
 header-y += ipt_ecn.h
-header-y += ipt_esp.h
-header-y += ipt_hashlimit.h
-header-y += ipt_helper.h
-header-y += ipt_iprange.h
-header-y += ipt_length.h
-header-y += ipt_limit.h
-header-y += ipt_mac.h
-header-y += ipt_mark.h
-header-y += ipt_multiport.h
-header-y += ipt_owner.h
-header-y += ipt_physdev.h
-header-y += ipt_pkttype.h
-header-y += ipt_policy.h
 header-y += ipt_realm.h
-header-y += ipt_recent.h
-header-y += ipt_sctp.h
-header-y += ipt_state.h
-header-y += ipt_string.h
-header-y += ipt_tcpmss.h
-header-y += ipt_tos.h
 header-y += ipt_ttl.h
 unifdef-y += ip_queue.h
diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 092bd50581a9..61fafc868a7b 100644
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -245,7 +245,7 @@ ipt_get_target(struct ipt_entry *e)
 extern void ipt_init(void) __init;
 extern struct xt_table *ipt_register_table(struct net *net,
-                                           struct xt_table *table,
+                                           const struct xt_table *table,
                                           const struct ipt_replace *repl);
 extern void ipt_unregister_table(struct xt_table *table);
diff --git a/include/linux/netfilter_ipv4/ipt_CLASSIFY.h b/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
deleted file mode 100644
index a46d511b5c36..000000000000
--- a/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _IPT_CLASSIFY_H
-#define _IPT_CLASSIFY_H
-#include <linux/netfilter/xt_CLASSIFY.h>
-#define ipt_classify_target_info xt_classify_target_info
-#endif /*_IPT_CLASSIFY_H */
diff --git a/include/linux/netfilter_ipv4/ipt_CONNMARK.h b/include/linux/netfilter_ipv4/ipt_CONNMARK.h
deleted file mode 100644
index 9ecfee0a9e33..000000000000
--- a/include/linux/netfilter_ipv4/ipt_CONNMARK.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _IPT_CONNMARK_H_target
-#define _IPT_CONNMARK_H_target
-/* Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com>
- * by Henrik Nordstrom <hno@marasystems.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.
- */
-#include <linux/netfilter/xt_CONNMARK.h>
-#define IPT_CONNMARK_SET        XT_CONNMARK_SET
-#define IPT_CONNMARK_SAVE       XT_CONNMARK_SAVE
-#define IPT_CONNMARK_RESTORE    XT_CONNMARK_RESTORE
-#define ipt_connmark_target_info xt_connmark_target_info
-#endif /*_IPT_CONNMARK_H_target*/
diff --git a/include/linux/netfilter_ipv4/ipt_DSCP.h b/include/linux/netfilter_ipv4/ipt_DSCP.h
deleted file mode 100644
index 3491e524d5ea..000000000000
--- a/include/linux/netfilter_ipv4/ipt_DSCP.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* iptables module for setting the IPv4 DSCP field
- *
- * (C) 2002 Harald Welte <laforge@gnumonks.org>
- * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
- * This software is distributed under GNU GPL v2, 1991
- * 
- * See RFC2474 for a description of the DSCP field within the IP Header.
- *
- * ipt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
-*/
-#ifndef _IPT_DSCP_TARGET_H
-#define _IPT_DSCP_TARGET_H
-#include <linux/netfilter_ipv4/ipt_dscp.h>
-#include <linux/netfilter/xt_DSCP.h>
-#define ipt_DSCP_info xt_DSCP_info
-#endif /* _IPT_DSCP_TARGET_H */
diff --git a/include/linux/netfilter_ipv4/ipt_ECN.h b/include/linux/netfilter_ipv4/ipt_ECN.h
index 94e0d9866469..7ca45918ab8e 100644
--- a/include/linux/netfilter_ipv4/ipt_ECN.h
+++ b/include/linux/netfilter_ipv4/ipt_ECN.h
@@ -8,9 +8,9 @@
 */
 #ifndef _IPT_ECN_TARGET_H
 #define _IPT_ECN_TARGET_H
-#include <linux/netfilter_ipv4/ipt_DSCP.h>
+#include <linux/netfilter/xt_DSCP.h>
-#define IPT_ECN_IP_MASK (~IPT_DSCP_MASK)
+#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
 #define IPT_ECN_OP_SET_IP       0x01    /* set ECN bits of IPv4 header */
 #define IPT_ECN_OP_SET_ECE      0x10    /* set ECE bit of TCP header */
diff --git a/include/linux/netfilter_ipv4/ipt_MARK.h b/include/linux/netfilter_ipv4/ipt_MARK.h
deleted file mode 100644
index 697a486a96d3..000000000000
--- a/include/linux/netfilter_ipv4/ipt_MARK.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _IPT_MARK_H_target
-#define _IPT_MARK_H_target
-/* Backwards compatibility for old userspace */
-#include <linux/netfilter/xt_MARK.h>
-/* Version 0 */
-#define ipt_mark_target_info xt_mark_target_info
-/* Version 1 */
-#define IPT_MARK_SET    XT_MARK_SET
-#define IPT_MARK_AND    XT_MARK_AND
-#define IPT_MARK_OR     XT_MARK_OR
-#define ipt_mark_target_info_v1 xt_mark_target_info_v1
-#endif /*_IPT_MARK_H_target*/
diff --git a/include/linux/netfilter_ipv4/ipt_NFQUEUE.h b/include/linux/netfilter_ipv4/ipt_NFQUEUE.h
deleted file mode 100644
index 97a2a7557cb9..000000000000
--- a/include/linux/netfilter_ipv4/ipt_NFQUEUE.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* iptables module for using NFQUEUE mechanism
- *
- * (C) 2005 Harald Welte <laforge@netfilter.org>
- *
- * This software is distributed under GNU GPL v2, 1991
- * 
-*/
-#ifndef _IPT_NFQ_TARGET_H
-#define _IPT_NFQ_TARGET_H
-/* Backwards compatibility for old userspace */
-#include <linux/netfilter/xt_NFQUEUE.h>
-#define ipt_NFQ_info xt_NFQ_info
-#endif /* _IPT_DSCP_TARGET_H */
diff --git a/include/linux/netfilter_ipv4/ipt_TCPMSS.h b/include/linux/netfilter_ipv4/ipt_TCPMSS.h
deleted file mode 100644
index 7a850f945824..000000000000
--- a/include/linux/netfilter_ipv4/ipt_TCPMSS.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _IPT_TCPMSS_H
-#define _IPT_TCPMSS_H
-#include <linux/netfilter/xt_TCPMSS.h>
-#define ipt_tcpmss_info         xt_tcpmss_info
-#define IPT_TCPMSS_CLAMP_PMTU   XT_TCPMSS_CLAMP_PMTU
-#endif /*_IPT_TCPMSS_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_TOS.h b/include/linux/netfilter_ipv4/ipt_TOS.h
deleted file mode 100644
index 6bf9e1fdfd88..000000000000
--- a/include/linux/netfilter_ipv4/ipt_TOS.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _IPT_TOS_H_target
-#define _IPT_TOS_H_target
-#ifndef IPTOS_NORMALSVC
-#define IPTOS_NORMALSVC 0
-#endif
-struct ipt_tos_target_info {
-        u_int8_t tos;
-};
-#endif /*_IPT_TOS_H_target*/
diff --git a/include/linux/netfilter_ipv4/ipt_comment.h b/include/linux/netfilter_ipv4/ipt_comment.h
deleted file mode 100644
index ae2afc2f7481..000000000000
--- a/include/linux/netfilter_ipv4/ipt_comment.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _IPT_COMMENT_H
-#define _IPT_COMMENT_H
-#include <linux/netfilter/xt_comment.h>
-#define IPT_MAX_COMMENT_LEN XT_MAX_COMMENT_LEN
-#define ipt_comment_info xt_comment_info
-#endif /* _IPT_COMMENT_H */
diff --git a/include/linux/netfilter_ipv4/ipt_connbytes.h b/include/linux/netfilter_ipv4/ipt_connbytes.h
deleted file mode 100644
index f63e6ee91113..000000000000
--- a/include/linux/netfilter_ipv4/ipt_connbytes.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _IPT_CONNBYTES_H
-#define _IPT_CONNBYTES_H
-#include <linux/netfilter/xt_connbytes.h>
-#define ipt_connbytes_what xt_connbytes_what
-#define IPT_CONNBYTES_PKTS      XT_CONNBYTES_PKTS
-#define IPT_CONNBYTES_BYTES     XT_CONNBYTES_BYTES
-#define IPT_CONNBYTES_AVGPKT    XT_CONNBYTES_AVGPKT
-#define ipt_connbytes_direction         xt_connbytes_direction
-#define IPT_CONNBYTES_DIR_ORIGINAL      XT_CONNBYTES_DIR_ORIGINAL
-#define IPT_CONNBYTES_DIR_REPLY         XT_CONNBYTES_DIR_REPLY
-#define IPT_CONNBYTES_DIR_BOTH          XT_CONNBYTES_DIR_BOTH
-#define ipt_connbytes_info xt_connbytes_info
-#endif
diff --git a/include/linux/netfilter_ipv4/ipt_connmark.h b/include/linux/netfilter_ipv4/ipt_connmark.h
deleted file mode 100644
index c7ba6560d44c..000000000000
--- a/include/linux/netfilter_ipv4/ipt_connmark.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _IPT_CONNMARK_H
-#define _IPT_CONNMARK_H
-#include <linux/netfilter/xt_connmark.h>
-#define ipt_connmark_info xt_connmark_info
-#endif /*_IPT_CONNMARK_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_conntrack.h b/include/linux/netfilter_ipv4/ipt_conntrack.h
deleted file mode 100644
index cde6762949c5..000000000000
--- a/include/linux/netfilter_ipv4/ipt_conntrack.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Header file for kernel module to match connection tracking information.
- * GPL (C) 2001  Marc Boucher (marc@mbsi.ca).
- */
-#ifndef _IPT_CONNTRACK_H
-#define _IPT_CONNTRACK_H
-#include <linux/netfilter/xt_conntrack.h>
-#define IPT_CONNTRACK_STATE_BIT(ctinfo) XT_CONNTRACK_STATE_BIT(ctinfo)
-#define IPT_CONNTRACK_STATE_INVALID     XT_CONNTRACK_STATE_INVALID
-#define IPT_CONNTRACK_STATE_SNAT        XT_CONNTRACK_STATE_SNAT
-#define IPT_CONNTRACK_STATE_DNAT        XT_CONNTRACK_STATE_DNAT
-#define IPT_CONNTRACK_STATE_UNTRACKED   XT_CONNTRACK_STATE_UNTRACKED
-/* flags, invflags: */
-#define IPT_CONNTRACK_STATE             XT_CONNTRACK_STATE
-#define IPT_CONNTRACK_PROTO             XT_CONNTRACK_PROTO
-#define IPT_CONNTRACK_ORIGSRC           XT_CONNTRACK_ORIGSRC
-#define IPT_CONNTRACK_ORIGDST           XT_CONNTRACK_ORIGDST
-#define IPT_CONNTRACK_REPLSRC           XT_CONNTRACK_REPLSRC
-#define IPT_CONNTRACK_REPLDST           XT_CONNTRACK_REPLDST
-#define IPT_CONNTRACK_STATUS            XT_CONNTRACK_STATUS
-#define IPT_CONNTRACK_EXPIRES           XT_CONNTRACK_EXPIRES
-#define ipt_conntrack_info              xt_conntrack_info
-#endif /*_IPT_CONNTRACK_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_dccp.h b/include/linux/netfilter_ipv4/ipt_dccp.h
deleted file mode 100644
index e70d11e1f53c..000000000000
--- a/include/linux/netfilter_ipv4/ipt_dccp.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _IPT_DCCP_H_
-#define _IPT_DCCP_H_
-#include <linux/netfilter/xt_dccp.h>
-#define IPT_DCCP_SRC_PORTS      XT_DCCP_SRC_PORTS
-#define IPT_DCCP_DEST_PORTS     XT_DCCP_DEST_PORTS
-#define IPT_DCCP_TYPE           XT_DCCP_TYPE
-#define IPT_DCCP_OPTION         XT_DCCP_OPTION
-#define IPT_DCCP_VALID_FLAGS    XT_DCCP_VALID_FLAGS
-#define ipt_dccp_info xt_dccp_info
-#endif /* _IPT_DCCP_H_ */
diff --git a/include/linux/netfilter_ipv4/ipt_dscp.h b/include/linux/netfilter_ipv4/ipt_dscp.h
deleted file mode 100644
index 4b82ca912b0e..000000000000
--- a/include/linux/netfilter_ipv4/ipt_dscp.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* iptables module for matching the IPv4 DSCP field
- *
- * (C) 2002 Harald Welte <laforge@gnumonks.org>
- * This software is distributed under GNU GPL v2, 1991
- * 
- * See RFC2474 for a description of the DSCP field within the IP Header.
- *
- * ipt_dscp.h,v 1.3 2002/08/05 19:00:21 laforge Exp
-*/
-#ifndef _IPT_DSCP_H
-#define _IPT_DSCP_H
-#include <linux/netfilter/xt_dscp.h>
-#define IPT_DSCP_MASK   XT_DSCP_MASK
-#define IPT_DSCP_SHIFT  XT_DSCP_SHIFT
-#define IPT_DSCP_MAX    XT_DSCP_MAX
-#define ipt_dscp_info   xt_dscp_info
-#endif /* _IPT_DSCP_H */
diff --git a/include/linux/netfilter_ipv4/ipt_ecn.h b/include/linux/netfilter_ipv4/ipt_ecn.h
index 1f0d9a4d3378..9945baa4ccd7 100644
--- a/include/linux/netfilter_ipv4/ipt_ecn.h
+++ b/include/linux/netfilter_ipv4/ipt_ecn.h
@@ -8,9 +8,9 @@
 */
 #ifndef _IPT_ECN_H
 #define _IPT_ECN_H
-#include <linux/netfilter_ipv4/ipt_dscp.h>
+#include <linux/netfilter/xt_dscp.h>
-#define IPT_ECN_IP_MASK (~IPT_DSCP_MASK)
+#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
 #define IPT_ECN_OP_MATCH_IP     0x01
 #define IPT_ECN_OP_MATCH_ECE    0x10
diff --git a/include/linux/netfilter_ipv4/ipt_esp.h b/include/linux/netfilter_ipv4/ipt_esp.h
deleted file mode 100644
index 78296e7eeff9..000000000000
--- a/include/linux/netfilter_ipv4/ipt_esp.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _IPT_ESP_H
-#define _IPT_ESP_H
-#include <linux/netfilter/xt_esp.h>
-#define ipt_esp xt_esp
-#define IPT_ESP_INV_SPI         XT_ESP_INV_SPI
-#define IPT_ESP_INV_MASK        XT_ESP_INV_MASK
-#endif /*_IPT_ESP_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_hashlimit.h b/include/linux/netfilter_ipv4/ipt_hashlimit.h
deleted file mode 100644
index 5662120a3d7b..000000000000
--- a/include/linux/netfilter_ipv4/ipt_hashlimit.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _IPT_HASHLIMIT_H
-#define _IPT_HASHLIMIT_H
-#include <linux/netfilter/xt_hashlimit.h>
-#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_info xt_hashlimit_info
-#endif /* _IPT_HASHLIMIT_H */
diff --git a/include/linux/netfilter_ipv4/ipt_helper.h b/include/linux/netfilter_ipv4/ipt_helper.h
deleted file mode 100644
index 80452c218551..000000000000
--- a/include/linux/netfilter_ipv4/ipt_helper.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _IPT_HELPER_H
-#define _IPT_HELPER_H
-#include <linux/netfilter/xt_helper.h>
-#define ipt_helper_info xt_helper_info
-#endif /* _IPT_HELPER_H */
diff --git a/include/linux/netfilter_ipv4/ipt_iprange.h b/include/linux/netfilter_ipv4/ipt_iprange.h
deleted file mode 100644
index 5f1aebde4d2f..000000000000
--- a/include/linux/netfilter_ipv4/ipt_iprange.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _IPT_IPRANGE_H
-#define _IPT_IPRANGE_H
-#include <linux/types.h>
-#include <linux/netfilter/xt_iprange.h>
-struct ipt_iprange {
-        /* Inclusive: network order. */
-        __be32 min_ip, max_ip;
-};
-struct ipt_iprange_info
-{
-        struct ipt_iprange src;
-        struct ipt_iprange dst;
-        /* Flags from above */
-        u_int8_t flags;
-};
-#endif /* _IPT_IPRANGE_H */
diff --git a/include/linux/netfilter_ipv4/ipt_length.h b/include/linux/netfilter_ipv4/ipt_length.h
deleted file mode 100644
index 9b45206ffcef..000000000000
--- a/include/linux/netfilter_ipv4/ipt_length.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _IPT_LENGTH_H
-#define _IPT_LENGTH_H
-#include <linux/netfilter/xt_length.h>
-#define ipt_length_info xt_length_info
-#endif /*_IPT_LENGTH_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_limit.h b/include/linux/netfilter_ipv4/ipt_limit.h
deleted file mode 100644
index 92f5cd07bbc4..000000000000
--- a/include/linux/netfilter_ipv4/ipt_limit.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _IPT_RATE_H
-#define _IPT_RATE_H
-#include <linux/netfilter/xt_limit.h>
-#define IPT_LIMIT_SCALE XT_LIMIT_SCALE
-#define ipt_rateinfo xt_rateinfo
-#endif /*_IPT_RATE_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_mac.h b/include/linux/netfilter_ipv4/ipt_mac.h
deleted file mode 100644
index b186008a3c47..000000000000
--- a/include/linux/netfilter_ipv4/ipt_mac.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _IPT_MAC_H
-#define _IPT_MAC_H
-#include <linux/netfilter/xt_mac.h>
-#define ipt_mac_info xt_mac_info
-#endif /*_IPT_MAC_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_mark.h b/include/linux/netfilter_ipv4/ipt_mark.h
deleted file mode 100644
index bfde67c61224..000000000000
--- a/include/linux/netfilter_ipv4/ipt_mark.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _IPT_MARK_H
-#define _IPT_MARK_H
-/* Backwards compatibility for old userspace */
-#include <linux/netfilter/xt_mark.h>
-#define ipt_mark_info xt_mark_info
-#endif /*_IPT_MARK_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_multiport.h b/include/linux/netfilter_ipv4/ipt_multiport.h
deleted file mode 100644
index 55fe85eca88c..000000000000
--- a/include/linux/netfilter_ipv4/ipt_multiport.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _IPT_MULTIPORT_H
-#define _IPT_MULTIPORT_H
-#include <linux/netfilter/xt_multiport.h>
-#define IPT_MULTIPORT_SOURCE            XT_MULTIPORT_SOURCE
-#define IPT_MULTIPORT_DESTINATION       XT_MULTIPORT_DESTINATION
-#define IPT_MULTIPORT_EITHER            XT_MULTIPORT_EITHER
-#define IPT_MULTI_PORTS                 XT_MULTI_PORTS
-#define ipt_multiport                   xt_multiport
-#define ipt_multiport_v1                xt_multiport_v1
-#endif /*_IPT_MULTIPORT_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_owner.h b/include/linux/netfilter_ipv4/ipt_owner.h
deleted file mode 100644
index a78445be9992..000000000000
--- a/include/linux/netfilter_ipv4/ipt_owner.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _IPT_OWNER_H
-#define _IPT_OWNER_H
-/* match and invert flags */
-#define IPT_OWNER_UID   0x01
-#define IPT_OWNER_GID   0x02
-#define IPT_OWNER_PID   0x04
-#define IPT_OWNER_SID   0x08
-#define IPT_OWNER_COMM  0x10
-struct ipt_owner_info {
-    __kernel_uid32_t uid;
-    __kernel_gid32_t gid;
-    __kernel_pid_t pid;
-    __kernel_pid_t sid;
-    char comm[16];
-    u_int8_t match, invert;     /* flags */
-};
-#endif /*_IPT_OWNER_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_physdev.h b/include/linux/netfilter_ipv4/ipt_physdev.h
deleted file mode 100644
index 2400e7140f26..000000000000
--- a/include/linux/netfilter_ipv4/ipt_physdev.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _IPT_PHYSDEV_H
-#define _IPT_PHYSDEV_H
-/* Backwards compatibility for old userspace */
-#include <linux/netfilter/xt_physdev.h>
-#define IPT_PHYSDEV_OP_IN               XT_PHYSDEV_OP_IN
-#define IPT_PHYSDEV_OP_OUT              XT_PHYSDEV_OP_OUT
-#define IPT_PHYSDEV_OP_BRIDGED          XT_PHYSDEV_OP_BRIDGED
-#define IPT_PHYSDEV_OP_ISIN             XT_PHYSDEV_OP_ISIN
-#define IPT_PHYSDEV_OP_ISOUT            XT_PHYSDEV_OP_ISOUT
-#define IPT_PHYSDEV_OP_MASK             XT_PHYSDEV_OP_MASK
-#define ipt_physdev_info xt_physdev_info
-#endif /*_IPT_PHYSDEV_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_pkttype.h b/include/linux/netfilter_ipv4/ipt_pkttype.h
deleted file mode 100644
index ff1fbc949a0c..000000000000
--- a/include/linux/netfilter_ipv4/ipt_pkttype.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _IPT_PKTTYPE_H
-#define _IPT_PKTTYPE_H
-#include <linux/netfilter/xt_pkttype.h>
-#define ipt_pkttype_info xt_pkttype_info
-#endif /*_IPT_PKTTYPE_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_policy.h b/include/linux/netfilter_ipv4/ipt_policy.h
deleted file mode 100644
index 1037fb2cd206..000000000000
--- a/include/linux/netfilter_ipv4/ipt_policy.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _IPT_POLICY_H
-#define _IPT_POLICY_H
-#include <linux/netfilter/xt_policy.h>
-#define IPT_POLICY_MAX_ELEM             XT_POLICY_MAX_ELEM
-/* ipt_policy_flags */
-#define IPT_POLICY_MATCH_IN             XT_POLICY_MATCH_IN
-#define IPT_POLICY_MATCH_OUT            XT_POLICY_MATCH_OUT
-#define IPT_POLICY_MATCH_NONE           XT_POLICY_MATCH_NONE
-#define IPT_POLICY_MATCH_STRICT         XT_POLICY_MATCH_STRICT
-/* ipt_policy_modes */
-#define IPT_POLICY_MODE_TRANSPORT       XT_POLICY_MODE_TRANSPORT
-#define IPT_POLICY_MODE_TUNNEL          XT_POLICY_MODE_TUNNEL
-#define ipt_policy_spec                 xt_policy_spec
-#define ipt_policy_addr                 xt_policy_addr
-#define ipt_policy_elem                 xt_policy_elem
-#define ipt_policy_info                 xt_policy_info
-#endif /* _IPT_POLICY_H */
diff --git a/include/linux/netfilter_ipv4/ipt_recent.h b/include/linux/netfilter_ipv4/ipt_recent.h
deleted file mode 100644
index d636cca133c2..000000000000
--- a/include/linux/netfilter_ipv4/ipt_recent.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _IPT_RECENT_H
-#define _IPT_RECENT_H
-#include <linux/netfilter/xt_recent.h>
-#define ipt_recent_info xt_recent_mtinfo
-enum {
-        IPT_RECENT_CHECK    = XT_RECENT_CHECK,
-        IPT_RECENT_SET      = XT_RECENT_SET,
-        IPT_RECENT_UPDATE   = XT_RECENT_UPDATE,
-        IPT_RECENT_REMOVE   = XT_RECENT_REMOVE,
-        IPT_RECENT_TTL      = XT_RECENT_TTL,
-        IPT_RECENT_SOURCE   = XT_RECENT_SOURCE,
-        IPT_RECENT_DEST     = XT_RECENT_DEST,
-        IPT_RECENT_NAME_LEN = XT_RECENT_NAME_LEN,
-};
-#endif /*_IPT_RECENT_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_sctp.h b/include/linux/netfilter_ipv4/ipt_sctp.h
deleted file mode 100644
index 80b3dbacd193..000000000000
--- a/include/linux/netfilter_ipv4/ipt_sctp.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef _IPT_SCTP_H_
-#define _IPT_SCTP_H_
-#define IPT_SCTP_SRC_PORTS              0x01
-#define IPT_SCTP_DEST_PORTS             0x02
-#define IPT_SCTP_CHUNK_TYPES            0x04
-#define IPT_SCTP_VALID_FLAGS            0x07
-struct ipt_sctp_flag_info {
-        u_int8_t chunktype;
-        u_int8_t flag;
-        u_int8_t flag_mask;
-};
-#define IPT_NUM_SCTP_FLAGS      4
-struct ipt_sctp_info {
-        u_int16_t dpts[2];  /* Min, Max */
-        u_int16_t spts[2];  /* Min, Max */
-        u_int32_t chunkmap[256 / sizeof (u_int32_t)];  /* Bit mask of chunks to be matched according to RFC 2960 */
-#define SCTP_CHUNK_MATCH_ANY   0x01  /* Match if any of the chunk types are present */
-#define SCTP_CHUNK_MATCH_ALL   0x02  /* Match if all of the chunk types are present */
-#define SCTP_CHUNK_MATCH_ONLY  0x04  /* Match if these are the only chunk types present */
-        u_int32_t chunk_match_type;
-        struct ipt_sctp_flag_info flag_info[IPT_NUM_SCTP_FLAGS];
-        int flag_count;
-        u_int32_t flags;
-        u_int32_t invflags;
-};
-#define bytes(type) (sizeof(type) * 8)
-#define SCTP_CHUNKMAP_SET(chunkmap, type)               \
-        do {                                            \
-                chunkmap[type / bytes(u_int32_t)] |=    \
-                        1 << (type % bytes(u_int32_t)); \
-        } while (0)
-#define SCTP_CHUNKMAP_CLEAR(chunkmap, type)                     \
-        do {                                                    \
-                chunkmap[type / bytes(u_int32_t)] &=            \
-                        ~(1 << (type % bytes(u_int32_t)));      \
-        } while (0)
-#define SCTP_CHUNKMAP_IS_SET(chunkmap, type)                    \
-({                                                              \
-        (chunkmap[type / bytes (u_int32_t)] &                   \
-                (1 << (type % bytes (u_int32_t)))) ? 1: 0;      \
-})
-#define SCTP_CHUNKMAP_RESET(chunkmap)                           \
-        do {                                                    \
-                int i;                                          \
-                for (i = 0; i < ARRAY_SIZE(chunkmap); i++)      \
-                        chunkmap[i] = 0;                        \
-        } while (0)
-#define SCTP_CHUNKMAP_SET_ALL(chunkmap)                         \
-        do {                                                    \
-                int i;                                          \
-                for (i = 0; i < ARRAY_SIZE(chunkmap); i++)      \
-                        chunkmap[i] = ~0;                       \
-        } while (0)
-#define SCTP_CHUNKMAP_COPY(destmap, srcmap)                     \
-        do {                                                    \
-                int i;                                          \
-                for (i = 0; i < ARRAY_SIZE(chunkmap); i++)      \
-                        destmap[i] = srcmap[i];                 \
-        } while (0)
-#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap)                \
-({                                                      \
-        int i;                                          \
-        int flag = 1;                                   \
-        for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {    \
-                if (chunkmap[i]) {                      \
-                        flag = 0;                       \
-                        break;                          \
-                }                                       \
-        }                                               \
-        flag;                                           \
-})
-#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap)              \
-({                                                      \
-        int i;                                          \
-        int flag = 1;                                   \
-        for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {    \
-                if (chunkmap[i] != ~0) {                \
-                        flag = 0;                       \
-                                break;                  \
-                }                                       \
-        }                                               \
-        flag;                                           \
-})
-#endif /* _IPT_SCTP_H_ */
diff --git a/include/linux/netfilter_ipv4/ipt_state.h b/include/linux/netfilter_ipv4/ipt_state.h
deleted file mode 100644
index a44a99cc28cc..000000000000
--- a/include/linux/netfilter_ipv4/ipt_state.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _IPT_STATE_H
-#define _IPT_STATE_H
-/* Backwards compatibility for old userspace */
-#include <linux/netfilter/xt_state.h>
-#define IPT_STATE_BIT           XT_STATE_BIT
-#define IPT_STATE_INVALID       XT_STATE_INVALID
-#define IPT_STATE_UNTRACKED     XT_STATE_UNTRACKED
-#define ipt_state_info          xt_state_info
-#endif /*_IPT_STATE_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_string.h b/include/linux/netfilter_ipv4/ipt_string.h
deleted file mode 100644
index c26de3059903..000000000000
--- a/include/linux/netfilter_ipv4/ipt_string.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _IPT_STRING_H
-#define _IPT_STRING_H
-#include <linux/netfilter/xt_string.h>
-#define IPT_STRING_MAX_PATTERN_SIZE XT_STRING_MAX_PATTERN_SIZE
-#define IPT_STRING_MAX_ALGO_NAME_SIZE XT_STRING_MAX_ALGO_NAME_SIZE
-#define ipt_string_info xt_string_info
-#endif /*_IPT_STRING_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_tcpmss.h b/include/linux/netfilter_ipv4/ipt_tcpmss.h
deleted file mode 100644
index 18bbc8e8e009..000000000000
--- a/include/linux/netfilter_ipv4/ipt_tcpmss.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _IPT_TCPMSS_MATCH_H
-#define _IPT_TCPMSS_MATCH_H
-#include <linux/netfilter/xt_tcpmss.h>
-#define ipt_tcpmss_match_info xt_tcpmss_match_info
-#endif /*_IPT_TCPMSS_MATCH_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_tos.h b/include/linux/netfilter_ipv4/ipt_tos.h
deleted file mode 100644
index a21f5df23c50..000000000000
--- a/include/linux/netfilter_ipv4/ipt_tos.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _IPT_TOS_H
-#define _IPT_TOS_H
-struct ipt_tos_info {
-    u_int8_t tos;
-    u_int8_t invert;
-};
-#ifndef IPTOS_NORMALSVC
-#define IPTOS_NORMALSVC 0
-#endif
-#endif /*_IPT_TOS_H*/
diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
index aca4bd1f6d7c..e864eaee9e5e 100644
--- a/include/linux/netfilter_ipv6/Kbuild
+++ b/include/linux/netfilter_ipv6/Kbuild
@@ -1,22 +1,12 @@
 header-y += ip6t_HL.h
 header-y += ip6t_LOG.h
-header-y += ip6t_MARK.h
 header-y += ip6t_REJECT.h
 header-y += ip6t_ah.h
-header-y += ip6t_esp.h
 header-y += ip6t_frag.h
-header-y += ip6t_hl.h
 header-y += ip6t_ipv6header.h
-header-y += ip6t_length.h
+header-y += ip6t_hl.h
-header-y += ip6t_limit.h
-header-y += ip6t_mac.h
-header-y += ip6t_mark.h
 header-y += ip6t_mh.h
-header-y += ip6t_multiport.h
 header-y += ip6t_opts.h
-header-y += ip6t_owner.h
-header-y += ip6t_physdev.h
-header-y += ip6t_policy.h
 header-y += ip6t_rt.h
 unifdef-y += ip6_tables.h
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index 1089e33cf633..a64e1451ac38 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -306,7 +306,7 @@ ip6t_get_target(struct ip6t_entry *e)
 extern void ip6t_init(void) __init;
 extern struct xt_table *ip6t_register_table(struct net *net,
-                                            struct xt_table *table,
+                                            const struct xt_table *table,
                                            const struct ip6t_replace *repl);
 extern void ip6t_unregister_table(struct xt_table *table);
 extern unsigned int ip6t_do_table(struct sk_buff *skb,
diff --git a/include/linux/netfilter_ipv6/ip6t_MARK.h b/include/linux/netfilter_ipv6/ip6t_MARK.h
deleted file mode 100644
index 7cf629a8ab92..000000000000
--- a/include/linux/netfilter_ipv6/ip6t_MARK.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _IP6T_MARK_H_target
-#define _IP6T_MARK_H_target
-/* Backwards compatibility for old userspace */
-#include <linux/netfilter/xt_MARK.h>
-#define ip6t_mark_target_info xt_mark_target_info
-#endif /*_IP6T_MARK_H_target*/
diff --git a/include/linux/netfilter_ipv6/ip6t_esp.h b/include/linux/netfilter_ipv6/ip6t_esp.h
deleted file mode 100644
index f62eaf53c16c..000000000000
--- a/include/linux/netfilter_ipv6/ip6t_esp.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _IP6T_ESP_H
-#define _IP6T_ESP_H
-#include <linux/netfilter/xt_esp.h>
-#define ip6t_esp xt_esp
-#define IP6T_ESP_INV_SPI        XT_ESP_INV_SPI
-#define IP6T_ESP_INV_MASK       XT_ESP_INV_MASK
-#endif /*_IP6T_ESP_H*/
diff --git a/include/linux/netfilter_ipv6/ip6t_length.h b/include/linux/netfilter_ipv6/ip6t_length.h
deleted file mode 100644
index 9e9689d03ed7..000000000000
--- a/include/linux/netfilter_ipv6/ip6t_length.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _IP6T_LENGTH_H
-#define _IP6T_LENGTH_H
-#include <linux/netfilter/xt_length.h>
-#define ip6t_length_info xt_length_info
-#endif /*_IP6T_LENGTH_H*/
-        
diff --git a/include/linux/netfilter_ipv6/ip6t_limit.h b/include/linux/netfilter_ipv6/ip6t_limit.h
deleted file mode 100644
index 487e5ea342c6..000000000000
--- a/include/linux/netfilter_ipv6/ip6t_limit.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _IP6T_RATE_H
-#define _IP6T_RATE_H
-#include <linux/netfilter/xt_limit.h>
-#define IP6T_LIMIT_SCALE XT_LIMIT_SCALE
-#define ip6t_rateinfo xt_rateinfo
-#endif /*_IP6T_RATE_H*/
diff --git a/include/linux/netfilter_ipv6/ip6t_mac.h b/include/linux/netfilter_ipv6/ip6t_mac.h
deleted file mode 100644
index ac58e83e9423..000000000000
--- a/include/linux/netfilter_ipv6/ip6t_mac.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _IP6T_MAC_H
-#define _IP6T_MAC_H
-#include <linux/netfilter/xt_mac.h>
-#define ip6t_mac_info xt_mac_info
-#endif /*_IP6T_MAC_H*/
diff --git a/include/linux/netfilter_ipv6/ip6t_mark.h b/include/linux/netfilter_ipv6/ip6t_mark.h
deleted file mode 100644
index ff204951ddc3..000000000000
--- a/include/linux/netfilter_ipv6/ip6t_mark.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _IP6T_MARK_H
-#define _IP6T_MARK_H
-/* Backwards compatibility for old userspace */
-#include <linux/netfilter/xt_mark.h>
-#define ip6t_mark_info xt_mark_info
-#endif /*_IPT_MARK_H*/
diff --git a/include/linux/netfilter_ipv6/ip6t_multiport.h b/include/linux/netfilter_ipv6/ip6t_multiport.h
deleted file mode 100644
index 042c92661cee..000000000000
--- a/include/linux/netfilter_ipv6/ip6t_multiport.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _IP6T_MULTIPORT_H
-#define _IP6T_MULTIPORT_H
-#include <linux/netfilter/xt_multiport.h>
-#define IP6T_MULTIPORT_SOURCE           XT_MULTIPORT_SOURCE
-#define IP6T_MULTIPORT_DESTINATION      XT_MULTIPORT_DESTINATION
-#define IP6T_MULTIPORT_EITHER           XT_MULTIPORT_EITHER
-#define IP6T_MULTI_PORTS                XT_MULTI_PORTS
-#define ip6t_multiport                  xt_multiport
-#endif /*_IP6T_MULTIPORT_H*/
diff --git a/include/linux/netfilter_ipv6/ip6t_owner.h b/include/linux/netfilter_ipv6/ip6t_owner.h
deleted file mode 100644
index ec5cc7a38c42..000000000000
--- a/include/linux/netfilter_ipv6/ip6t_owner.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _IP6T_OWNER_H
-#define _IP6T_OWNER_H
-/* match and invert flags */
-#define IP6T_OWNER_UID  0x01
-#define IP6T_OWNER_GID  0x02
-#define IP6T_OWNER_PID  0x04
-#define IP6T_OWNER_SID  0x08
-struct ip6t_owner_info {
-    __kernel_uid32_t uid;
-    __kernel_gid32_t gid;
-    __kernel_pid_t pid;
-    __kernel_pid_t sid;
-    u_int8_t match, invert;     /* flags */
-};
-#endif /*_IPT_OWNER_H*/
diff --git a/include/linux/netfilter_ipv6/ip6t_physdev.h b/include/linux/netfilter_ipv6/ip6t_physdev.h
deleted file mode 100644
index c161c0a81b55..000000000000
--- a/include/linux/netfilter_ipv6/ip6t_physdev.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _IP6T_PHYSDEV_H
-#define _IP6T_PHYSDEV_H
-/* Backwards compatibility for old userspace */
-#include <linux/netfilter/xt_physdev.h>
-#define IP6T_PHYSDEV_OP_IN              XT_PHYSDEV_OP_IN
-#define IP6T_PHYSDEV_OP_OUT             XT_PHYSDEV_OP_OUT
-#define IP6T_PHYSDEV_OP_BRIDGED         XT_PHYSDEV_OP_BRIDGED
-#define IP6T_PHYSDEV_OP_ISIN            XT_PHYSDEV_OP_ISIN
-#define IP6T_PHYSDEV_OP_ISOUT           XT_PHYSDEV_OP_ISOUT
-#define IP6T_PHYSDEV_OP_MASK            XT_PHYSDEV_OP_MASK
-#define ip6t_physdev_info xt_physdev_info
-#endif /*_IP6T_PHYSDEV_H*/
diff --git a/include/linux/netfilter_ipv6/ip6t_policy.h b/include/linux/netfilter_ipv6/ip6t_policy.h
deleted file mode 100644
index b1c449d7ec89..000000000000
--- a/include/linux/netfilter_ipv6/ip6t_policy.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _IP6T_POLICY_H
-#define _IP6T_POLICY_H
-#include <linux/netfilter/xt_policy.h>
-#define IP6T_POLICY_MAX_ELEM            XT_POLICY_MAX_ELEM
-/* ip6t_policy_flags */
-#define IP6T_POLICY_MATCH_IN            XT_POLICY_MATCH_IN
-#define IP6T_POLICY_MATCH_OUT           XT_POLICY_MATCH_OUT
-#define IP6T_POLICY_MATCH_NONE          XT_POLICY_MATCH_NONE
-#define IP6T_POLICY_MATCH_STRICT        XT_POLICY_MATCH_STRICT
-/* ip6t_policy_modes */
-#define IP6T_POLICY_MODE_TRANSPORT      XT_POLICY_MODE_TRANSPORT
-#define IP6T_POLICY_MODE_TUNNEL         XT_POLICY_MODE_TUNNEL
-#define ip6t_policy_spec                xt_policy_spec
-#define ip6t_policy_addr                xt_policy_addr
-#define ip6t_policy_elem                xt_policy_elem
-#define ip6t_policy_info                xt_policy_info
-#endif /* _IP6T_POLICY_H */
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 5ba398e90304..0fbecbbe8e9e 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -217,12 +217,13 @@ int netlink_sendskb(struct sock *sk, struct sk_buff *skb);
 struct netlink_callback
 {
-        struct sk_buff  *skb;
+        struct sk_buff          *skb;
-        struct nlmsghdr *nlh;
+        const struct nlmsghdr   *nlh;
-        int             (*dump)(struct sk_buff * skb, struct netlink_callback *cb);
+        int                     (*dump)(struct sk_buff * skb,
-        int             (*done)(struct netlink_callback *cb);
+                                        struct netlink_callback *cb);
-        int             family;
+        int                     (*done)(struct netlink_callback *cb);
-        long            args[6];
+        int                     family;
+        long                    args[6];
 };
 struct netlink_notify
@@ -258,7 +259,7 @@ __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags)
        NLMSG_NEW(skb, pid, seq, type, len, 0)
 extern int netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
-                              struct nlmsghdr *nlh,
+                              const struct nlmsghdr *nlh,
                              int (*dump)(struct sk_buff *skb, struct netlink_callback*),
                              int (*done)(struct netlink_callback*));
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index dbea93b694e5..a8d71ed43a0e 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -242,6 +242,29 @@
 * @NL80211_CMD_LEAVE_IBSS: Leave the IBSS -- no special arguments, the IBSS is
 *      determined by the network interface.
 *
+ * @NL80211_CMD_TESTMODE: testmode command, takes a wiphy (or ifindex) attribute
+ *      to identify the device, and the TESTDATA blob attribute to pass through
+ *      to the driver.
+ *
+ * @NL80211_CMD_CONNECT: connection request and notification; this command
+ *      requests to connect to a specified network but without separating
+ *      auth and assoc steps. For this, you need to specify the SSID in a
+ *      %NL80211_ATTR_SSID attribute, and can optionally specify the association
+ *      IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_MAC,
+ *      %NL80211_ATTR_WIPHY_FREQ and %NL80211_ATTR_CONTROL_PORT.
+ *      It is also sent as an event, with the BSSID and response IEs when the
+ *      connection is established or failed to be established. This can be
+ *      determined by the STATUS_CODE attribute.
+ * @NL80211_CMD_ROAM: request that the card roam (currently not implemented),
+ *      sent as an event when the card/driver roamed by itself.
+ * @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify
+ *      userspace that a connection was dropped by the AP or due to other
+ *      reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and
+ *      %NL80211_ATTR_REASON_CODE attributes are used.
+ *
+ * @NL80211_CMD_SET_WIPHY_NETNS: Set a wiphy's netns. Note that all devices
+ *      associated with this wiphy must be down and will follow.
+ *
 * @NL80211_CMD_MAX: highest used command number
 * @__NL80211_CMD_AFTER_LAST: internal use
 */
@@ -310,6 +333,14 @@ enum nl80211_commands {
        NL80211_CMD_JOIN_IBSS,
        NL80211_CMD_LEAVE_IBSS,
+        NL80211_CMD_TESTMODE,
+        NL80211_CMD_CONNECT,
+        NL80211_CMD_ROAM,
+        NL80211_CMD_DISCONNECT,
+        NL80211_CMD_SET_WIPHY_NETNS,
        /* add new commands above here */
        /* used to define NL80211_CMD_MAX below */
@@ -449,10 +480,6 @@ enum nl80211_commands {
 * @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz)
 * @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive
 *      scanning and include a zero-length SSID (wildcard) for wildcard scan
- * @NL80211_ATTR_SCAN_GENERATION: the scan generation increases whenever the
- *      scan result list changes (BSS expired or added) so that applications
- *      can verify that they got a single, consistent snapshot (when all dump
- *      messages carried the same generation number)
 * @NL80211_ATTR_BSS: scan result BSS
 *
 * @NL80211_ATTR_REG_INITIATOR: indicates who requested the regulatory domain
@@ -511,6 +538,52 @@ enum nl80211_commands {
 *      authorized by user space. Otherwise, port is marked authorized by
 *      default in station mode.
 *
+ * @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
+ *      We recommend using nested, driver-specific attributes within this.
+ *
+ * @NL80211_ATTR_DISCONNECTED_BY_AP: A flag indicating that the DISCONNECT
+ *      event was due to the AP disconnecting the station, and not due to
+ *      a local disconnect request.
+ * @NL80211_ATTR_STATUS_CODE: StatusCode for the %NL80211_CMD_CONNECT
+ *      event (u16)
+ * @NL80211_ATTR_PRIVACY: Flag attribute, used with connect(), indicating
+ *      that protected APs should be used.
+ *
+ * @NL80211_ATTR_CIPHERS_PAIRWISE: Used with CONNECT and ASSOCIATE to
+ *      indicate which unicast key ciphers will be used with the connection
+ *      (an array of u32).
+ * @NL80211_ATTR_CIPHER_GROUP: Used with CONNECT and ASSOCIATE to indicate
+ *      which group key cipher will be used with the connection (a u32).
+ * @NL80211_ATTR_WPA_VERSIONS: Used with CONNECT and ASSOCIATE to indicate
+ *      which WPA version(s) the AP we want to associate with is using
+ *      (a u32 with flags from &enum nl80211_wpa_versions).
+ * @NL80211_ATTR_AKM_SUITES: Used with CONNECT and ASSOCIATE to indicate
+ *      which key management algorithm(s) to use (an array of u32).
+ *
+ * @NL80211_ATTR_REQ_IE: (Re)association request information elements as
+ *      sent out by the card, for ROAM and successful CONNECT events.
+ * @NL80211_ATTR_RESP_IE: (Re)association response information elements as
+ *      sent by peer, for ROAM and successful CONNECT events.
+ *
+ * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE
+ *      commands to specify using a reassociate frame
+ *
+ * @NL80211_ATTR_KEY: key information in a nested attribute with
+ *      %NL80211_KEY_* sub-attributes
+ * @NL80211_ATTR_KEYS: array of keys for static WEP keys for connect()
+ *      and join_ibss(), key information is in a nested attribute each
+ *      with %NL80211_KEY_* sub-attributes
+ *
+ * @NL80211_ATTR_PID: Process ID of a network namespace.
+ *
+ * @NL80211_ATTR_GENERATION: Used to indicate consistent snapshots for
+ *      dumps. This number increases whenever the object list being
+ *      dumped changes, and as such userspace can verify that it has
+ *      obtained a complete and consistent snapshot by verifying that
+ *      all dump messages contain the same generation number. If it
+ *      changed then the list changed and the dump should be repeated
+ *      completely from scratch.
+ *
 * @NL80211_ATTR_MAX: highest attribute number currently defined
 * @__NL80211_ATTR_AFTER_LAST: internal use
 */
@@ -582,7 +655,7 @@ enum nl80211_attrs {
        NL80211_ATTR_SCAN_FREQUENCIES,
        NL80211_ATTR_SCAN_SSIDS,
-        NL80211_ATTR_SCAN_GENERATION,
+        NL80211_ATTR_GENERATION, /* replaces old SCAN_GENERATION */
        NL80211_ATTR_BSS,
        NL80211_ATTR_REG_INITIATOR,
@@ -619,16 +692,42 @@ enum nl80211_attrs {
        NL80211_ATTR_CONTROL_PORT,
+        NL80211_ATTR_TESTDATA,
+        NL80211_ATTR_PRIVACY,
+        NL80211_ATTR_DISCONNECTED_BY_AP,
+        NL80211_ATTR_STATUS_CODE,
+        NL80211_ATTR_CIPHER_SUITES_PAIRWISE,
+        NL80211_ATTR_CIPHER_SUITE_GROUP,
+        NL80211_ATTR_WPA_VERSIONS,
+        NL80211_ATTR_AKM_SUITES,
+        NL80211_ATTR_REQ_IE,
+        NL80211_ATTR_RESP_IE,
+        NL80211_ATTR_PREV_BSSID,
+        NL80211_ATTR_KEY,
+        NL80211_ATTR_KEYS,
+        NL80211_ATTR_PID,
        /* add attributes here, update the policy in nl80211.c */
        __NL80211_ATTR_AFTER_LAST,
        NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
 };
+/* source-level API compatibility */
+#define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION
 /*
 * Allow user space programs to use #ifdef on new attributes by defining them
 * here
 */
+#define NL80211_CMD_CONNECT NL80211_CMD_CONNECT
 #define NL80211_ATTR_HT_CAPABILITY NL80211_ATTR_HT_CAPABILITY
 #define NL80211_ATTR_BSS_BASIC_RATES NL80211_ATTR_BSS_BASIC_RATES
 #define NL80211_ATTR_WIPHY_TXQ_PARAMS NL80211_ATTR_WIPHY_TXQ_PARAMS
@@ -642,6 +741,12 @@ enum nl80211_attrs {
 #define NL80211_ATTR_SSID NL80211_ATTR_SSID
 #define NL80211_ATTR_AUTH_TYPE NL80211_ATTR_AUTH_TYPE
 #define NL80211_ATTR_REASON_CODE NL80211_ATTR_REASON_CODE
+#define NL80211_ATTR_CIPHER_SUITES_PAIRWISE NL80211_ATTR_CIPHER_SUITES_PAIRWISE
+#define NL80211_ATTR_CIPHER_SUITE_GROUP NL80211_ATTR_CIPHER_SUITE_GROUP
+#define NL80211_ATTR_WPA_VERSIONS NL80211_ATTR_WPA_VERSIONS
+#define NL80211_ATTR_AKM_SUITES NL80211_ATTR_AKM_SUITES
+#define NL80211_ATTR_KEY NL80211_ATTR_KEY
+#define NL80211_ATTR_KEYS NL80211_ATTR_KEYS
 #define NL80211_MAX_SUPP_RATES                  32
 #define NL80211_MAX_SUPP_REG_RULES              32
@@ -650,6 +755,9 @@ enum nl80211_attrs {
 #define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY     24
 #define NL80211_HT_CAPABILITY_LEN               26
+#define NL80211_MAX_NR_CIPHER_SUITES            5
+#define NL80211_MAX_NR_AKM_SUITES               2
 /**
 * enum nl80211_iftype - (virtual) interface types
 *
@@ -1168,6 +1276,7 @@ enum nl80211_channel_type {
 *      in mBm (100 * dBm) (s32)
 * @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon
 *      in unspecified units, scaled to 0..100 (u8)
+ * @NL80211_BSS_STATUS: status, if this BSS is "used"
 * @__NL80211_BSS_AFTER_LAST: internal
 * @NL80211_BSS_MAX: highest BSS attribute
 */
@@ -1181,6 +1290,7 @@ enum nl80211_bss {
        NL80211_BSS_INFORMATION_ELEMENTS,
        NL80211_BSS_SIGNAL_MBM,
        NL80211_BSS_SIGNAL_UNSPEC,
+        NL80211_BSS_STATUS,
        /* keep last */
        __NL80211_BSS_AFTER_LAST,
@@ -1188,18 +1298,37 @@ enum nl80211_bss {
 };
 /**
+ * enum nl80211_bss_status - BSS "status"
+ */
+enum nl80211_bss_status {
+        NL80211_BSS_STATUS_AUTHENTICATED,
+        NL80211_BSS_STATUS_ASSOCIATED,
+        NL80211_BSS_STATUS_IBSS_JOINED,
+};
+/**
 * enum nl80211_auth_type - AuthenticationType
 *
 * @NL80211_AUTHTYPE_OPEN_SYSTEM: Open System authentication
 * @NL80211_AUTHTYPE_SHARED_KEY: Shared Key authentication (WEP only)
 * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r)
 * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP)
+ * @__NL80211_AUTHTYPE_NUM: internal
+ * @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm
+ * @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by
+ *      trying multiple times); this is invalid in netlink -- leave out
+ *      the attribute for this on CONNECT commands.
 */
 enum nl80211_auth_type {
        NL80211_AUTHTYPE_OPEN_SYSTEM,
        NL80211_AUTHTYPE_SHARED_KEY,
        NL80211_AUTHTYPE_FT,
        NL80211_AUTHTYPE_NETWORK_EAP,
+        /* keep last */
+        __NL80211_AUTHTYPE_NUM,
+        NL80211_AUTHTYPE_MAX = __NL80211_AUTHTYPE_NUM - 1,
+        NL80211_AUTHTYPE_AUTOMATIC
 };
 /**
@@ -1224,4 +1353,39 @@ enum nl80211_mfp {
        NL80211_MFP_REQUIRED,
 };
+enum nl80211_wpa_versions {
+        NL80211_WPA_VERSION_1 = 1 << 0,
+        NL80211_WPA_VERSION_2 = 1 << 1,
+};
+/**
+ * enum nl80211_key_attributes - key attributes
+ * @__NL80211_KEY_INVALID: invalid
+ * @NL80211_KEY_DATA: (temporal) key data; for TKIP this consists of
+ *      16 bytes encryption key followed by 8 bytes each for TX and RX MIC
+ *      keys
+ * @NL80211_KEY_IDX: key ID (u8, 0-3)
+ * @NL80211_KEY_CIPHER: key cipher suite (u32, as defined by IEEE 802.11
+ *      section 7.3.2.25.1, e.g. 0x000FAC04)
+ * @NL80211_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
+ *      CCMP keys, each six bytes in little endian
+ * @NL80211_KEY_DEFAULT: flag indicating default key
+ * @NL80211_KEY_DEFAULT_MGMT: flag indicating default management key
+ * @__NL80211_KEY_AFTER_LAST: internal
+ * @NL80211_KEY_MAX: highest key attribute
+ */
+enum nl80211_key_attributes {
+        __NL80211_KEY_INVALID,
+        NL80211_KEY_DATA,
+        NL80211_KEY_IDX,
+        NL80211_KEY_CIPHER,
+        NL80211_KEY_SEQ,
+        NL80211_KEY_DEFAULT,
+        NL80211_KEY_DEFAULT_MGMT,
+        /* keep last */
+        __NL80211_KEY_AFTER_LAST,
+        NL80211_KEY_MAX = __NL80211_KEY_AFTER_LAST - 1
+};
 #endif /* __LINUX_NL80211_H */
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h
index 2cda00ccfcca..b7d9435d5a9f 100644
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
@@ -64,12 +64,14 @@ enum {
        IEEE802154_ATTR_COORD_REALIGN,
        IEEE802154_ATTR_SEC,
+        IEEE802154_ATTR_PAGE,
        __IEEE802154_ATTR_MAX,
 };
 #define IEEE802154_ATTR_MAX (__IEEE802154_ATTR_MAX - 1)
-extern struct nla_policy ieee802154_policy[];
+extern const struct nla_policy ieee802154_policy[];
 /* commands */
 /* REQ should be responded with CONF
@@ -111,6 +113,8 @@ enum {
        IEEE802154_RX_ENABLE_REQ, /* Not supported yet */
        IEEE802154_RX_ENABLE_CONF, /* Not supported yet */
+        IEEE802154_LIST_IFACE,
        __IEEE802154_CMD_MAX,
 };
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c8fdcadce437..555a8262fbc2 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1988,6 +1988,8 @@
 #define PCI_VENDOR_ID_SAMSUNG           0x144d
+#define PCI_VENDOR_ID_GIGABYTE          0x1458
 #define PCI_VENDOR_ID_AMBIT             0x1468
 #define PCI_VENDOR_ID_MYRICOM           0x14c1
@@ -2066,7 +2068,6 @@
 #define PCI_DEVICE_ID_TIGON3_5787M      0x1693
 #define PCI_DEVICE_ID_TIGON3_5782       0x1696
 #define PCI_DEVICE_ID_TIGON3_5784       0x1698
-#define PCI_DEVICE_ID_TIGON3_5785       0x1699
 #define PCI_DEVICE_ID_TIGON3_5786       0x169a
 #define PCI_DEVICE_ID_TIGON3_5787       0x169b
 #define PCI_DEVICE_ID_TIGON3_5788       0x169c
diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h
index 68438e18fff4..0761491b3eec 100644
--- a/include/linux/percpu-defs.h
+++ b/include/linux/percpu-defs.h
@@ -66,14 +66,24 @@
        DEFINE_PER_CPU_SECTION(type, name, PER_CPU_SHARED_ALIGNED_SECTION) \
        ____cacheline_aligned_in_smp
+#define DECLARE_PER_CPU_ALIGNED(type, name)                             \
+        DECLARE_PER_CPU_SECTION(type, name, PER_CPU_ALIGNED_SECTION)    \
+        ____cacheline_aligned
+#define DEFINE_PER_CPU_ALIGNED(type, name)                              \
+        DEFINE_PER_CPU_SECTION(type, name, PER_CPU_ALIGNED_SECTION)     \
+        ____cacheline_aligned
 /*
 * Declaration/definition used for per-CPU variables that must be page aligned.
 */
-#define DECLARE_PER_CPU_PAGE_ALIGNED(type, name)                                \
+#define DECLARE_PER_CPU_PAGE_ALIGNED(type, name)                        \
-        DECLARE_PER_CPU_SECTION(type, name, ".page_aligned")
+        DECLARE_PER_CPU_SECTION(type, name, ".page_aligned")            \
+        __aligned(PAGE_SIZE)
 #define DEFINE_PER_CPU_PAGE_ALIGNED(type, name)                         \
-        DEFINE_PER_CPU_SECTION(type, name, ".page_aligned")
+        DEFINE_PER_CPU_SECTION(type, name, ".page_aligned")             \
+        __aligned(PAGE_SIZE)
 /*
 * Intermodule exports for per-CPU variables.
diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index ee5e3c9e2bca..1ef5a0781831 100644
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -99,6 +99,9 @@ struct sockaddr_pn {
        __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3];
 } __attribute__ ((packed));
+/* Well known address */
+#define PN_DEV_PC       0x10
 static inline __u16 pn_object(__u8 addr, __u16 port)
 {
        return (addr << 8) | (port & 0x3ff);
@@ -170,4 +173,21 @@ static inline __u8 pn_sockaddr_get_resource(const struct sockaddr_pn *spn)
        return spn->spn_resource;
 }
+/* Phonet device ioctl requests */
+#ifdef __KERNEL__
+#define SIOCPNGAUTOCONF         (SIOCDEVPRIVATE + 0)
+struct if_phonet_autoconf {
+        uint8_t device;
+};
+struct if_phonet_req {
+        char ifr_phonet_name[16];
+        union {
+                struct if_phonet_autoconf ifru_phonet_autoconf;
+        } ifr_ifru;
+};
+#define ifr_phonet_autoconf ifr_ifru.ifru_phonet_autoconf
+#endif /* __KERNEL__ */
 #endif
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 8dc5123b6305..3c6675c2444b 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -22,6 +22,9 @@ struct platform_device {
        struct resource * resource;
        struct platform_device_id       *id_entry;
+        /* arch specific additions */
+        struct pdev_archdata    archdata;
 };
 #define platform_get_device_id(pdev)    ((pdev)->id_entry)
@@ -57,8 +60,6 @@ struct platform_driver {
        int (*remove)(struct platform_device *);
        void (*shutdown)(struct platform_device *);
        int (*suspend)(struct platform_device *, pm_message_t state);
-        int (*suspend_late)(struct platform_device *, pm_message_t state);
-        int (*resume_early)(struct platform_device *);
        int (*resume)(struct platform_device *);
        struct device_driver driver;
        struct platform_device_id *id_table;
diff --git a/include/linux/pm.h b/include/linux/pm.h
index b3f74764a586..3b7e04b95bd2 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -22,6 +22,10 @@
 #define _LINUX_PM_H
 #include <linux/list.h>
+#include <linux/workqueue.h>
+#include <linux/spinlock.h>
+#include <linux/wait.h>
+#include <linux/timer.h>
 /*
 * Callbacks for platform drivers to implement.
@@ -165,6 +169,28 @@ typedef struct pm_message {
 * It is allowed to unregister devices while the above callbacks are being
 * executed.  However, it is not allowed to unregister a device from within any
 * of its own callbacks.
+ *
+ * There also are the following callbacks related to run-time power management
+ * of devices:
+ *
+ * @runtime_suspend: Prepare the device for a condition in which it won't be
+ *      able to communicate with the CPU(s) and RAM due to power management.
+ *      This need not mean that the device should be put into a low power state.
+ *      For example, if the device is behind a link which is about to be turned
+ *      off, the device may remain at full power.  If the device does go to low
+ *      power and if device_may_wakeup(dev) is true, remote wake-up (i.e., a
+ *      hardware mechanism allowing the device to request a change of its power
+ *      state, such as PCI PME) should be enabled for it.
+ *
+ * @runtime_resume: Put the device into the fully active state in response to a
+ *      wake-up event generated by hardware or at the request of software.  If
+ *      necessary, put the device into the full power state and restore its
+ *      registers, so that it is fully operational.
+ *
+ * @runtime_idle: Device appears to be inactive and it might be put into a low
+ *      power state if all of the necessary conditions are satisfied.  Check
+ *      these conditions and handle the device as appropriate, possibly queueing
+ *      a suspend request for it.  The return value is ignored by the PM core.
 */
 struct dev_pm_ops {
@@ -182,8 +208,25 @@ struct dev_pm_ops {
        int (*thaw_noirq)(struct device *dev);
        int (*poweroff_noirq)(struct device *dev);
        int (*restore_noirq)(struct device *dev);
+        int (*runtime_suspend)(struct device *dev);
+        int (*runtime_resume)(struct device *dev);
+        int (*runtime_idle)(struct device *dev);
 };
+/*
+ * Use this if you want to use the same suspend and resume callbacks for suspend
+ * to RAM and hibernation.
+ */
+#define SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \
+struct dev_pm_ops name = { \
+        .suspend = suspend_fn, \
+        .resume = resume_fn, \
+        .freeze = suspend_fn, \
+        .thaw = resume_fn, \
+        .poweroff = suspend_fn, \
+        .restore = resume_fn, \
+}
 /**
 * PM_EVENT_ messages
 *
@@ -315,14 +358,80 @@ enum dpm_state {
        DPM_OFF_IRQ,
 };
+/**
+ * Device run-time power management status.
+ *
+ * These status labels are used internally by the PM core to indicate the
+ * current status of a device with respect to the PM core operations.  They do
+ * not reflect the actual power state of the device or its status as seen by the
+ * driver.
+ *
+ * RPM_ACTIVE           Device is fully operational.  Indicates that the device
+ *                      bus type's ->runtime_resume() callback has completed
+ *                      successfully.
+ *
+ * RPM_SUSPENDED        Device bus type's ->runtime_suspend() callback has
+ *                      completed successfully.  The device is regarded as
+ *                      suspended.
+ *
+ * RPM_RESUMING         Device bus type's ->runtime_resume() callback is being
+ *                      executed.
+ *
+ * RPM_SUSPENDING       Device bus type's ->runtime_suspend() callback is being
+ *                      executed.
+ */
+enum rpm_status {
+        RPM_ACTIVE = 0,
+        RPM_RESUMING,
+        RPM_SUSPENDED,
+        RPM_SUSPENDING,
+};
+/**
+ * Device run-time power management request types.
+ *
+ * RPM_REQ_NONE         Do nothing.
+ *
+ * RPM_REQ_IDLE         Run the device bus type's ->runtime_idle() callback
+ *
+ * RPM_REQ_SUSPEND      Run the device bus type's ->runtime_suspend() callback
+ *
+ * RPM_REQ_RESUME       Run the device bus type's ->runtime_resume() callback
+ */
+enum rpm_request {
+        RPM_REQ_NONE = 0,
+        RPM_REQ_IDLE,
+        RPM_REQ_SUSPEND,
+        RPM_REQ_RESUME,
+};
 struct dev_pm_info {
        pm_message_t            power_state;
-        unsigned                can_wakeup:1;
+        unsigned int            can_wakeup:1;
-        unsigned                should_wakeup:1;
+        unsigned int            should_wakeup:1;
        enum dpm_state          status;         /* Owned by the PM core */
-#ifdef  CONFIG_PM_SLEEP
+#ifdef CONFIG_PM_SLEEP
        struct list_head        entry;
 #endif
+#ifdef CONFIG_PM_RUNTIME
+        struct timer_list       suspend_timer;
+        unsigned long           timer_expires;
+        struct work_struct      work;
+        wait_queue_head_t       wait_queue;
+        spinlock_t              lock;
+        atomic_t                usage_count;
+        atomic_t                child_count;
+        unsigned int            disable_depth:3;
+        unsigned int            ignore_children:1;
+        unsigned int            idle_notification:1;
+        unsigned int            request_pending:1;
+        unsigned int            deferred_resume:1;
+        enum rpm_request        request;
+        enum rpm_status         runtime_status;
+        int                     runtime_error;
+#endif
 };
 /*
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
new file mode 100644
index 000000000000..44087044910f
--- /dev/null
+++ b/include/linux/pm_runtime.h
@@ -0,0 +1,114 @@
+/*
+ * pm_runtime.h - Device run-time power management helper functions.
+ *
+ * Copyright (C) 2009 Rafael J. Wysocki <rjw@sisk.pl>
+ *
+ * This file is released under the GPLv2.
+ */
+#ifndef _LINUX_PM_RUNTIME_H
+#define _LINUX_PM_RUNTIME_H
+#include <linux/device.h>
+#include <linux/pm.h>
+#ifdef CONFIG_PM_RUNTIME
+extern struct workqueue_struct *pm_wq;
+extern int pm_runtime_idle(struct device *dev);
+extern int pm_runtime_suspend(struct device *dev);
+extern int pm_runtime_resume(struct device *dev);
+extern int pm_request_idle(struct device *dev);
+extern int pm_schedule_suspend(struct device *dev, unsigned int delay);
+extern int pm_request_resume(struct device *dev);
+extern int __pm_runtime_get(struct device *dev, bool sync);
+extern int __pm_runtime_put(struct device *dev, bool sync);
+extern int __pm_runtime_set_status(struct device *dev, unsigned int status);
+extern int pm_runtime_barrier(struct device *dev);
+extern void pm_runtime_enable(struct device *dev);
+extern void __pm_runtime_disable(struct device *dev, bool check_resume);
+static inline bool pm_children_suspended(struct device *dev)
+{
+        return dev->power.ignore_children
+                || !atomic_read(&dev->power.child_count);
+}
+static inline void pm_suspend_ignore_children(struct device *dev, bool enable)
+{
+        dev->power.ignore_children = enable;
+}
+static inline void pm_runtime_get_noresume(struct device *dev)
+{
+        atomic_inc(&dev->power.usage_count);
+}
+static inline void pm_runtime_put_noidle(struct device *dev)
+{
+        atomic_add_unless(&dev->power.usage_count, -1, 0);
+}
+#else /* !CONFIG_PM_RUNTIME */
+static inline int pm_runtime_idle(struct device *dev) { return -ENOSYS; }
+static inline int pm_runtime_suspend(struct device *dev) { return -ENOSYS; }
+static inline int pm_runtime_resume(struct device *dev) { return 0; }
+static inline int pm_request_idle(struct device *dev) { return -ENOSYS; }
+static inline int pm_schedule_suspend(struct device *dev, unsigned int delay)
+{
+        return -ENOSYS;
+}
+static inline int pm_request_resume(struct device *dev) { return 0; }
+static inline int __pm_runtime_get(struct device *dev, bool sync) { return 1; }
+static inline int __pm_runtime_put(struct device *dev, bool sync) { return 0; }
+static inline int __pm_runtime_set_status(struct device *dev,
+                                            unsigned int status) { return 0; }
+static inline int pm_runtime_barrier(struct device *dev) { return 0; }
+static inline void pm_runtime_enable(struct device *dev) {}
+static inline void __pm_runtime_disable(struct device *dev, bool c) {}
+static inline bool pm_children_suspended(struct device *dev) { return false; }
+static inline void pm_suspend_ignore_children(struct device *dev, bool en) {}
+static inline void pm_runtime_get_noresume(struct device *dev) {}
+static inline void pm_runtime_put_noidle(struct device *dev) {}
+#endif /* !CONFIG_PM_RUNTIME */
+static inline int pm_runtime_get(struct device *dev)
+{
+        return __pm_runtime_get(dev, false);
+}
+static inline int pm_runtime_get_sync(struct device *dev)
+{
+        return __pm_runtime_get(dev, true);
+}
+static inline int pm_runtime_put(struct device *dev)
+{
+        return __pm_runtime_put(dev, false);
+}
+static inline int pm_runtime_put_sync(struct device *dev)
+{
+        return __pm_runtime_put(dev, true);
+}
+static inline int pm_runtime_set_active(struct device *dev)
+{
+        return __pm_runtime_set_status(dev, RPM_ACTIVE);
+}
+static inline void pm_runtime_set_suspended(struct device *dev)
+{
+        __pm_runtime_set_status(dev, RPM_SUSPENDED);
+}
+static inline void pm_runtime_disable(struct device *dev)
+{
+        __pm_runtime_disable(dev, true);
+}
+#endif
diff --git a/include/linux/rds.h b/include/linux/rds.h
index d91dc91f5443..89d46e1afbb1 100644
--- a/include/linux/rds.h
+++ b/include/linux/rds.h
@@ -147,6 +147,18 @@ struct rds_info_socket {
        u_int64_t       inum;
 } __attribute__((packed));
+struct rds_info_tcp_socket {
+        __be32          local_addr;
+        __be16          local_port;
+        __be32          peer_addr;
+        __be16          peer_port;
+        u_int64_t       hdr_rem;
+        u_int64_t       data_rem;
+        u_int32_t       last_sent_nxt;
+        u_int32_t       last_expected_una;
+        u_int32_t       last_seen_una;
+} __attribute__((packed));
 #define RDS_IB_GID_LEN  16
 struct rds_info_rdma_connection {
        __be32          src_addr;
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 278777fa8a3a..3392c59d2706 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -6,20 +6,17 @@
 * Copyright (C) 2007 Dmitry Torokhov
 * Copyright 2009 Johannes Berg <johannes@sipsolutions.net>
 *
- * This program is free software; you can redistribute it and/or modify
+ * Permission to use, copy, modify, and/or distribute this software for any
- * it under the terms of the GNU General Public License as published by
+ * purpose with or without fee is hereby granted, provided that the above
- * the Free Software Foundation; either version 2 of the License, or
+ * copyright notice and this permission notice appear in all copies.
- * (at your option) any later version.
 *
- * This program is distributed in the hope that it will be useful,
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * GNU General Public License for more details.
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * You should have received a copy of the GNU General Public License
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * along with this program; if not, write to the
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- * Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 #include <linux/types.h>
@@ -47,6 +44,7 @@ enum rfkill_type {
        RFKILL_TYPE_UWB,
        RFKILL_TYPE_WIMAX,
        RFKILL_TYPE_WWAN,
+        RFKILL_TYPE_GPS,
        NUM_RFKILL_TYPES,
 };
@@ -82,6 +80,20 @@ struct rfkill_event {
        __u8  soft, hard;
 } __packed;
+/*
+ * We are planning to be backward and forward compatible with changes
+ * to the event struct, by adding new, optional, members at the end.
+ * When reading an event (whether the kernel from userspace or vice
+ * versa) we need to accept anything that's at least as large as the
+ * version 1 event size, but might be able to accept other sizes in
+ * the future.
+ *
+ * One exception is the kernel -- we already have two event sizes in
+ * that we've made the 'hard' member optional since our only option
+ * is to ignore it anyway.
+ */
+#define RFKILL_EVENT_SIZE_V1    8
 /* ioctl for turning off rfkill-input (if present) */
 #define RFKILL_IOC_MAGIC        'R'
 #define RFKILL_IOC_NOINPUT      1
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index ba3254ecf7fb..adf2068d12b5 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -104,7 +104,7 @@ enum {
        RTM_NEWADDRLABEL = 72,
 #define RTM_NEWADDRLABEL RTM_NEWADDRLABEL
        RTM_DELADDRLABEL,
-#define RTM_NEWADDRLABEL RTM_NEWADDRLABEL
+#define RTM_DELADDRLABEL RTM_DELADDRLABEL
        RTM_GETADDRLABEL,
 #define RTM_GETADDRLABEL RTM_GETADDRLABEL
diff --git a/include/linux/serio.h b/include/linux/serio.h
index 126d24c9eaa8..a640bc2afe76 100644
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
@@ -31,8 +31,6 @@ struct serio {
        bool manual_bind;
        bool registered;        /* port has been fully registered with driver core */
-        bool suspended;         /* port is suspended */
        struct serio_device_id id;
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index f2c69a2cca17..df7b23ac66e6 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -304,7 +304,6 @@ typedef unsigned char *sk_buff_data_t;
 *      @tc_index: Traffic control index
 *      @tc_verd: traffic control verdict
 *      @ndisc_nodetype: router type (from link layer)
- *      @do_not_encrypt: set to prevent encryption of this frame
 *      @dma_cookie: a cookie to one of several possible DMA operations
 *              done by skb DMA functions
 *      @secmark: security marking
@@ -380,12 +379,9 @@ struct sk_buff {
 #ifdef CONFIG_IPV6_NDISC_NODETYPE
        __u8                    ndisc_nodetype:2;
 #endif
-#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
-        __u8                    do_not_encrypt:1;
-#endif
        kmemcheck_bitfield_end(flags2);
-        /* 0/13/14 bit hole */
+        /* 0/14 bit hole */
 #ifdef CONFIG_NET_DMA
        dma_cookie_t            dma_cookie;
diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
index bb5368df4be8..0ec00b39d006 100644
--- a/include/linux/slob_def.h
+++ b/include/linux/slob_def.h
@@ -34,9 +34,4 @@ static __always_inline void *__kmalloc(size_t size, gfp_t flags)
        return kmalloc(size, flags);
 }
-static inline void kmem_cache_init_late(void)
-{
-        /* Nothing to do */
-}
 #endif /* __LINUX_SLOB_DEF_H */
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index c1c862b1d01a..5ad70a60fd74 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -153,12 +153,10 @@ static __always_inline int kmalloc_index(size_t size)
        if (size <= KMALLOC_MIN_SIZE)
                return KMALLOC_SHIFT_LOW;
-#if KMALLOC_MIN_SIZE <= 64
+        if (KMALLOC_MIN_SIZE <= 32 && size > 64 && size <= 96)
-        if (size > 64 && size <= 96)
                return 1;
-        if (size > 128 && size <= 192)
+        if (KMALLOC_MIN_SIZE <= 64 && size > 128 && size <= 192)
                return 2;
-#endif
        if (size <=          8) return 3;
        if (size <=         16) return 4;
        if (size <=         32) return 5;
@@ -304,6 +302,4 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 }
 #endif
-void __init kmem_cache_init_late(void);
 #endif /* _LINUX_SLUB_DEF_H */
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 5ae8fa22d331..3d0a9ff24f01 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -27,24 +27,54 @@ struct ssb_sprom {
        u8 et1mdcport;          /* MDIO for enet1 */
        u8 board_rev;           /* Board revision number from SPROM. */
        u8 country_code;        /* Country Code */
-        u8 ant_available_a;     /* A-PHY antenna available bits (up to 4) */
+        u8 ant_available_a;     /* 2GHz antenna available bits (up to 4) */
-        u8 ant_available_bg;    /* B/G-PHY antenna available bits (up to 4) */
+        u8 ant_available_bg;    /* 5GHz antenna available bits (up to 4) */
        u16 pa0b0;
        u16 pa0b1;
        u16 pa0b2;
        u16 pa1b0;
        u16 pa1b1;
        u16 pa1b2;
+        u16 pa1lob0;
+        u16 pa1lob1;
+        u16 pa1lob2;
+        u16 pa1hib0;
+        u16 pa1hib1;
+        u16 pa1hib2;
        u8 gpio0;               /* GPIO pin 0 */
        u8 gpio1;               /* GPIO pin 1 */
        u8 gpio2;               /* GPIO pin 2 */
        u8 gpio3;               /* GPIO pin 3 */
-        u16 maxpwr_a;           /* A-PHY Amplifier Max Power (in dBm Q5.2) */
+        u16 maxpwr_bg;          /* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
-        u16 maxpwr_bg;          /* B/G-PHY Amplifier Max Power (in dBm Q5.2) */
+        u16 maxpwr_al;          /* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
+        u16 maxpwr_a;           /* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
+        u16 maxpwr_ah;          /* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
        u8 itssi_a;             /* Idle TSSI Target for A-PHY */
        u8 itssi_bg;            /* Idle TSSI Target for B/G-PHY */
-        u16 boardflags_lo;      /* Boardflags (low 16 bits) */
+        u8 tri2g;               /* 2.4GHz TX isolation */
-        u16 boardflags_hi;      /* Boardflags (high 16 bits) */
+        u8 tri5gl;              /* 5.2GHz TX isolation */
+        u8 tri5g;               /* 5.3GHz TX isolation */
+        u8 tri5gh;              /* 5.8GHz TX isolation */
+        u8 rxpo2g;              /* 2GHz RX power offset */
+        u8 rxpo5g;              /* 5GHz RX power offset */
+        u8 rssisav2g;           /* 2GHz RSSI params */
+        u8 rssismc2g;
+        u8 rssismf2g;
+        u8 bxa2g;               /* 2GHz BX arch */
+        u8 rssisav5g;           /* 5GHz RSSI params */
+        u8 rssismc5g;
+        u8 rssismf5g;
+        u8 bxa5g;               /* 5GHz BX arch */
+        u16 cck2gpo;            /* CCK power offset */
+        u32 ofdm2gpo;           /* 2.4GHz OFDM power offset */
+        u32 ofdm5glpo;          /* 5.2GHz OFDM power offset */
+        u32 ofdm5gpo;           /* 5.3GHz OFDM power offset */
+        u32 ofdm5ghpo;          /* 5.8GHz OFDM power offset */
+        u16 boardflags_lo;      /* Board flags (bits 0-15) */
+        u16 boardflags_hi;      /* Board flags (bits 16-31) */
+        u16 boardflags2_lo;     /* Board flags (bits 32-47) */
+        u16 boardflags2_hi;     /* Board flags (bits 48-63) */
+        /* TODO store board flags in a single u64 */
        /* Antenna gain values for up to 4 antennas
         * on each band. Values in dBm/4 (Q5.2). Negative gain means the
@@ -58,7 +88,7 @@ struct ssb_sprom {
                } ghz5;         /* 5GHz band */
        } antenna_gain;
-        /* TODO - add any parameters needed from rev 2, 3, or 4 SPROMs */
+        /* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
 };
 /* Information about the PCB the circuitry is soldered on. */
@@ -208,6 +238,7 @@ enum ssb_bustype {
        SSB_BUSTYPE_SSB,        /* This SSB bus is the system bus */
        SSB_BUSTYPE_PCI,        /* SSB is connected to PCI bus */
        SSB_BUSTYPE_PCMCIA,     /* SSB is connected to PCMCIA bus */
+        SSB_BUSTYPE_SDIO,       /* SSB is connected to SDIO bus */
 };
 /* board_vendor */
@@ -240,8 +271,12 @@ struct ssb_bus {
        /* The core in the basic address register window. (PCI bus only) */
        struct ssb_device *mapped_device;
-        /* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
+        union {
-        u8 mapped_pcmcia_seg;
+                /* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
+                u8 mapped_pcmcia_seg;
+                /* Current SSB base address window for SDIO. */
+                u32 sdio_sbaddr;
+        };
        /* Lock for core and segment switching.
         * On PCMCIA-host busses this is used to protect the whole MMIO access. */
        spinlock_t bar_lock;
@@ -252,6 +287,11 @@ struct ssb_bus {
        struct pci_dev *host_pci;
        /* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
        struct pcmcia_device *host_pcmcia;
+        /* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
+        struct sdio_func *host_sdio;
+        /* See enum ssb_quirks */
+        unsigned int quirks;
 #ifdef CONFIG_SSB_SPROM
        /* Mutex to protect the SPROM writing. */
@@ -306,6 +346,11 @@ struct ssb_bus {
 #endif /* DEBUG */
 };
+enum ssb_quirks {
+        /* SDIO connected card requires performing a read after writing a 32-bit value */
+        SSB_QUIRK_SDIO_READ_AFTER_WRITE32       = (1 << 0),
+};
 /* The initialization-invariants. */
 struct ssb_init_invariants {
        /* Versioning information about the PCB. */
@@ -336,6 +381,12 @@ extern int ssb_bus_pcmciabus_register(struct ssb_bus *bus,
                                      struct pcmcia_device *pcmcia_dev,
                                      unsigned long baseaddr);
 #endif /* CONFIG_SSB_PCMCIAHOST */
+#ifdef CONFIG_SSB_SDIOHOST
+extern int ssb_bus_sdiobus_register(struct ssb_bus *bus,
+                                    struct sdio_func *sdio_func,
+                                    unsigned int quirks);
+#endif /* CONFIG_SSB_SDIOHOST */
 extern void ssb_bus_unregister(struct ssb_bus *bus);
diff --git a/include/linux/ssb/ssb_driver_chipcommon.h b/include/linux/ssb/ssb_driver_chipcommon.h
index d3b1d18922f2..4e27acf0a92f 100644
--- a/include/linux/ssb/ssb_driver_chipcommon.h
+++ b/include/linux/ssb/ssb_driver_chipcommon.h
@@ -629,5 +629,15 @@ extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
 /* PMU support */
 extern void ssb_pmu_init(struct ssb_chipcommon *cc);
+enum ssb_pmu_ldo_volt_id {
+        LDO_PAREF = 0,
+        LDO_VOLT1,
+        LDO_VOLT2,
+        LDO_VOLT3,
+};
+void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
+                             enum ssb_pmu_ldo_volt_id id, u32 voltage);
+void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on);
 #endif /* LINUX_SSB_CHIPCO_H_ */
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index a01b982b5783..9ae9082eaeb4 100644
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -162,7 +162,7 @@
 /* SPROM shadow area. If not otherwise noted, fields are
 * two bytes wide. Note that the SPROM can _only_ be read
- * in two-byte quantinies.
+ * in two-byte quantities.
 */
 #define SSB_SPROMSIZE_WORDS             64
 #define SSB_SPROMSIZE_BYTES             (SSB_SPROMSIZE_WORDS * sizeof(u16))
@@ -327,8 +327,11 @@
 #define  SSB_SPROM5_GPIOB_P3_SHIFT      8
 /* SPROM Revision 8 */
-#define SSB_SPROM8_BFLLO                0x1084  /* Boardflags (low 16 bits) */
+#define SSB_SPROM8_BOARDREV             0x1082  /* Board revision */
-#define SSB_SPROM8_BFLHI                0x1086  /* Boardflags Hi */
+#define SSB_SPROM8_BFLLO                0x1084  /* Board flags (bits 0-15) */
+#define SSB_SPROM8_BFLHI                0x1086  /* Board flags (bits 16-31) */
+#define SSB_SPROM8_BFL2LO               0x1088  /* Board flags (bits 32-47) */
+#define SSB_SPROM8_BFL2HI               0x108A  /* Board flags (bits 48-63) */
 #define SSB_SPROM8_IL0MAC               0x108C  /* 6 byte MAC address */
 #define SSB_SPROM8_CCODE                0x1092  /* 2 byte country code */
 #define SSB_SPROM8_ANTAVAIL             0x109C  /* Antenna available bitfields*/
@@ -354,14 +357,63 @@
 #define  SSB_SPROM8_GPIOB_P2            0x00FF  /* Pin 2 */
 #define  SSB_SPROM8_GPIOB_P3            0xFF00  /* Pin 3 */
 #define  SSB_SPROM8_GPIOB_P3_SHIFT      8
-#define SSB_SPROM8_MAXP_BG              0x10C0  /* Max Power BG in path 1 */
+#define SSB_SPROM8_RSSIPARM2G           0x10A4  /* RSSI params for 2GHz */
-#define  SSB_SPROM8_MAXP_BG_MASK        0x00FF  /* Mask for Max Power BG */
+#define  SSB_SPROM8_RSSISMF2G           0x000F
+#define  SSB_SPROM8_RSSISMC2G           0x00F0
+#define  SSB_SPROM8_RSSISMC2G_SHIFT     4
+#define  SSB_SPROM8_RSSISAV2G           0x0700
+#define  SSB_SPROM8_RSSISAV2G_SHIFT     8
+#define  SSB_SPROM8_BXA2G               0x1800
+#define  SSB_SPROM8_BXA2G_SHIFT         11
+#define SSB_SPROM8_RSSIPARM5G           0x10A6  /* RSSI params for 5GHz */
+#define  SSB_SPROM8_RSSISMF5G           0x000F
+#define  SSB_SPROM8_RSSISMC5G           0x00F0
+#define  SSB_SPROM8_RSSISMC5G_SHIFT     4
+#define  SSB_SPROM8_RSSISAV5G           0x0700
+#define  SSB_SPROM8_RSSISAV5G_SHIFT     8
+#define  SSB_SPROM8_BXA5G               0x1800
+#define  SSB_SPROM8_BXA5G_SHIFT         11
+#define SSB_SPROM8_TRI25G               0x10A8  /* TX isolation 2.4&5.3GHz */
+#define  SSB_SPROM8_TRI2G               0x00FF  /* TX isolation 2.4GHz */
+#define  SSB_SPROM8_TRI5G               0xFF00  /* TX isolation 5.3GHz */
+#define  SSB_SPROM8_TRI5G_SHIFT         8
+#define SSB_SPROM8_TRI5GHL              0x10AA  /* TX isolation 5.2/5.8GHz */
+#define  SSB_SPROM8_TRI5GL              0x00FF  /* TX isolation 5.2GHz */
+#define  SSB_SPROM8_TRI5GH              0xFF00  /* TX isolation 5.8GHz */
+#define  SSB_SPROM8_TRI5GH_SHIFT        8
+#define SSB_SPROM8_RXPO                 0x10AC  /* RX power offsets */
+#define  SSB_SPROM8_RXPO2G              0x00FF  /* 2GHz RX power offset */
+#define  SSB_SPROM8_RXPO5G              0xFF00  /* 5GHz RX power offset */
+#define  SSB_SPROM8_RXPO5G_SHIFT        8
+#define SSB_SPROM8_MAXP_BG              0x10C0  /* Max Power 2GHz in path 1 */
+#define  SSB_SPROM8_MAXP_BG_MASK        0x00FF  /* Mask for Max Power 2GHz */
 #define  SSB_SPROM8_ITSSI_BG            0xFF00  /* Mask for path 1 itssi_bg */
 #define  SSB_SPROM8_ITSSI_BG_SHIFT      8
-#define SSB_SPROM8_MAXP_A               0x10C8  /* Max Power A in path 1 */
+#define SSB_SPROM8_PA0B0                0x10C2  /* 2GHz power amp settings */
-#define  SSB_SPROM8_MAXP_A_MASK         0x00FF  /* Mask for Max Power A */
+#define SSB_SPROM8_PA0B1                0x10C4
+#define SSB_SPROM8_PA0B2                0x10C6
+#define SSB_SPROM8_MAXP_A               0x10C8  /* Max Power 5.3GHz */
+#define  SSB_SPROM8_MAXP_A_MASK         0x00FF  /* Mask for Max Power 5.3GHz */
 #define  SSB_SPROM8_ITSSI_A             0xFF00  /* Mask for path 1 itssi_a */
 #define  SSB_SPROM8_ITSSI_A_SHIFT       8
+#define SSB_SPROM8_MAXP_AHL             0x10CA  /* Max Power 5.2/5.8GHz */
+#define  SSB_SPROM8_MAXP_AH_MASK        0x00FF  /* Mask for Max Power 5.8GHz */
+#define  SSB_SPROM8_MAXP_AL_MASK        0xFF00  /* Mask for Max Power 5.2GHz */
+#define  SSB_SPROM8_MAXP_AL_SHIFT       8
+#define SSB_SPROM8_PA1B0                0x10CC  /* 5.3GHz power amp settings */
+#define SSB_SPROM8_PA1B1                0x10CE
+#define SSB_SPROM8_PA1B2                0x10D0
+#define SSB_SPROM8_PA1LOB0              0x10D2  /* 5.2GHz power amp settings */
+#define SSB_SPROM8_PA1LOB1              0x10D4
+#define SSB_SPROM8_PA1LOB2              0x10D6
+#define SSB_SPROM8_PA1HIB0              0x10D8  /* 5.8GHz power amp settings */
+#define SSB_SPROM8_PA1HIB1              0x10DA
+#define SSB_SPROM8_PA1HIB2              0x10DC
+#define SSB_SPROM8_CCK2GPO              0x1140  /* CCK power offset */
+#define SSB_SPROM8_OFDM2GPO             0x1142  /* 2.4GHz OFDM power offset */
+#define SSB_SPROM8_OFDM5GPO             0x1146  /* 5.3GHz OFDM power offset */
+#define SSB_SPROM8_OFDM5GLPO            0x114A  /* 5.2GHz OFDM power offset */
+#define SSB_SPROM8_OFDM5GHPO            0x114E  /* 5.8GHz OFDM power offset */
 /* Values for SSB_SPROM1_BINF_CCODE */
 enum {
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 8afac76cd748..61723a7c21fe 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -233,7 +233,7 @@ struct tcp_request_sock {
        struct inet_request_sock        req;
 #ifdef CONFIG_TCP_MD5SIG
        /* Only used by TCP MD5 Signature so far. */
-        struct tcp_request_sock_ops     *af_specific;
+        const struct tcp_request_sock_ops *af_specific;
 #endif
        u32                             rcv_isn;
        u32                             snt_isn;
@@ -401,9 +401,9 @@ struct tcp_sock {
 #ifdef CONFIG_TCP_MD5SIG
 /* TCP AF-Specific parts; only used by MD5 Signature support so far */
-        struct tcp_sock_af_ops  *af_specific;
+        const struct tcp_sock_af_ops    *af_specific;
-/* TCP MD5 Signagure Option information */
+/* TCP MD5 Signature Option information */
        struct tcp_md5sig_info  *md5sig_info;
 #endif
 };
diff --git a/include/linux/tipc.h b/include/linux/tipc.h
index bea469455a0c..3d92396639de 100644
--- a/include/linux/tipc.h
+++ b/include/linux/tipc.h
@@ -209,5 +209,7 @@ struct sockaddr_tipc {
 #define TIPC_SRC_DROPPABLE      128     /* Default: 0 (resend congested msg) */
 #define TIPC_DEST_DROPPABLE     129     /* Default: based on socket type */
 #define TIPC_CONN_TIMEOUT       130     /* Default: 8000 (ms)  */
+#define TIPC_NODE_RECVQ_DEPTH   131     /* Default: none (read only) */
+#define TIPC_SOCK_RECVQ_DEPTH   132     /* Default: none (read only) */
 #endif
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 0d3974f59c53..a916a318004e 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -519,10 +519,6 @@ extern void serial_console_init(void);
 extern int pcxe_open(struct tty_struct *tty, struct file *filp);
-/* printk.c */
-extern void console_print(const char *);
 /* vt.c */
 extern int vt_ioctl(struct tty_struct *tty, struct file *file,
diff --git a/include/linux/usb/rndis_host.h b/include/linux/usb/rndis_host.h
index 37836b937d97..1ef1ebc2b04f 100644
--- a/include/linux/usb/rndis_host.h
+++ b/include/linux/usb/rndis_host.h
@@ -70,12 +70,13 @@ struct rndis_msg_hdr {
 #define RNDIS_MSG_KEEPALIVE_C   (RNDIS_MSG_KEEPALIVE|RNDIS_MSG_COMPLETION)
 /* codes for "status" field of completion messages */
-#define RNDIS_STATUS_SUCCESS            cpu_to_le32(0x00000000)
+#define RNDIS_STATUS_SUCCESS                    cpu_to_le32(0x00000000)
-#define RNDIS_STATUS_FAILURE            cpu_to_le32(0xc0000001)
+#define RNDIS_STATUS_FAILURE                    cpu_to_le32(0xc0000001)
-#define RNDIS_STATUS_INVALID_DATA       cpu_to_le32(0xc0010015)
+#define RNDIS_STATUS_INVALID_DATA               cpu_to_le32(0xc0010015)
-#define RNDIS_STATUS_NOT_SUPPORTED      cpu_to_le32(0xc00000bb)
+#define RNDIS_STATUS_NOT_SUPPORTED              cpu_to_le32(0xc00000bb)
-#define RNDIS_STATUS_MEDIA_CONNECT      cpu_to_le32(0x4001000b)
+#define RNDIS_STATUS_MEDIA_CONNECT              cpu_to_le32(0x4001000b)
-#define RNDIS_STATUS_MEDIA_DISCONNECT   cpu_to_le32(0x4001000c)
+#define RNDIS_STATUS_MEDIA_DISCONNECT           cpu_to_le32(0x4001000c)
+#define RNDIS_STATUS_MEDIA_SPECIFIC_INDICATION  cpu_to_le32(0x40010012)
 /* codes for OID_GEN_PHYSICAL_MEDIUM */
 #define RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED       cpu_to_le32(0x00000000)
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 310e18a880ff..bb69e256cd16 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -53,6 +53,7 @@ struct usbnet {
        struct sk_buff_head     rxq;
        struct sk_buff_head     txq;
        struct sk_buff_head     done;
+        struct sk_buff_head     rxq_pause;
        struct urb              *interrupt;
        struct tasklet_struct   bh;
@@ -63,6 +64,7 @@ struct usbnet {
 #               define EVENT_RX_MEMORY  2
 #               define EVENT_STS_SPLIT  3
 #               define EVENT_LINK_RESET 4
+#               define EVENT_RX_PAUSED  5
 };
 static inline struct usb_driver *driver_of(struct usb_interface *intf)
@@ -86,6 +88,7 @@ struct driver_info {
 #define FLAG_FRAMING_AX 0x0040          /* AX88772/178 packets */
 #define FLAG_WLAN       0x0080          /* use "wlan%d" names */
+#define FLAG_AVOID_UNLINK_URBS 0x0100   /* don't unlink urbs at usbnet_stop() */
        /* init device ... can sleep, or cause probe() failure */
@@ -97,6 +100,9 @@ struct driver_info {
        /* reset device ... can sleep */
        int     (*reset)(struct usbnet *);
+        /* stop device ... can sleep */
+        int     (*stop)(struct usbnet *);
        /* see if peer is connected ... can sleep */
        int     (*check_connect)(struct usbnet *);
@@ -118,9 +124,8 @@ struct driver_info {
         * right after minidriver have initialized hardware. */
        int     (*early_init)(struct usbnet *dev);
-        /* called by minidriver when link state changes, state: 0=disconnect,
+        /* called by minidriver when receiving indication */
-         * 1=connect */
+        void    (*indication)(struct usbnet *dev, void *ind, int indlen);
-        void    (*link_change)(struct usbnet *dev, int state);
        /* for new devices, use the descriptor-reading code instead */
        int             in;             /* rx endpoint */
@@ -177,7 +182,8 @@ struct skb_data {	/* skb->cb is one of these */
 extern int usbnet_open (struct net_device *net);
 extern int usbnet_stop (struct net_device *net);
-extern int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net);
+extern netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
+                                      struct net_device *net);
 extern void usbnet_tx_timeout (struct net_device *net);
 extern int usbnet_change_mtu (struct net_device *net, int new_mtu);
@@ -187,6 +193,10 @@ extern void usbnet_defer_kevent (struct usbnet *, int);
 extern void usbnet_skb_return (struct usbnet *, struct sk_buff *);
 extern void usbnet_unlink_rx_urbs(struct usbnet *);
+extern void usbnet_pause_rx(struct usbnet *);
+extern void usbnet_resume_rx(struct usbnet *);
+extern void usbnet_purge_paused_rxq(struct usbnet *);
 extern int usbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd);
 extern int usbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd);
 extern u32 usbnet_get_link (struct net_device *net);
diff --git a/include/linux/wireless.h b/include/linux/wireless.h
index cb24204851f7..5b4c6c772a9b 100644
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
@@ -1132,6 +1132,14 @@ struct __compat_iw_event {
 };
 #define IW_EV_COMPAT_LCP_LEN offsetof(struct __compat_iw_event, pointer)
 #define IW_EV_COMPAT_POINT_OFF offsetof(struct compat_iw_point, length)
+/* Size of the various events for compat */
+#define IW_EV_COMPAT_CHAR_LEN   (IW_EV_COMPAT_LCP_LEN + IFNAMSIZ)
+#define IW_EV_COMPAT_UINT_LEN   (IW_EV_COMPAT_LCP_LEN + sizeof(__u32))
+#define IW_EV_COMPAT_FREQ_LEN   (IW_EV_COMPAT_LCP_LEN + sizeof(struct iw_freq))
+#define IW_EV_COMPAT_PARAM_LEN  (IW_EV_COMPAT_LCP_LEN + sizeof(struct iw_param))
+#define IW_EV_COMPAT_ADDR_LEN   (IW_EV_COMPAT_LCP_LEN + sizeof(struct sockaddr))
+#define IW_EV_COMPAT_QUAL_LEN   (IW_EV_COMPAT_LCP_LEN + sizeof(struct iw_quality))
 #define IW_EV_COMPAT_POINT_LEN  \
        (IW_EV_COMPAT_LCP_LEN + sizeof(struct compat_iw_point) - \
         IW_EV_COMPAT_POINT_OFF)
diff --git a/include/linux/wm97xx.h b/include/linux/wm97xx.h
index 6f69968eab24..0c9878123d5f 100644
--- a/include/linux/wm97xx.h
+++ b/include/linux/wm97xx.h
@@ -16,6 +16,12 @@
 #include <linux/platform_device.h>
 /*
+ * WM97xx variants
+ */
+#define WM97xx_GENERIC                  0x0000
+#define WM97xx_WM1613                   0x1613
+/*
 * WM97xx AC97 Touchscreen registers
 */
 #define AC97_WM97XX_DIGITISER1          0x76
@@ -283,6 +289,7 @@ struct wm97xx {
        unsigned pen_is_down:1;         /* Pen is down */
        unsigned aux_waiting:1;         /* aux measurement waiting */
        unsigned pen_probably_down:1;   /* used in polling mode */
+        u16 variant;                    /* WM97xx chip variant */
        u16 suspend_mode;               /* PRP in suspend mode */
 };
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 78b1e4684cc9..d347632f1861 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -150,10 +150,6 @@ int write_cache_pages(struct address_space *mapping,
                      struct writeback_control *wbc, writepage_t writepage,
                      void *data);
 int do_writepages(struct address_space *mapping, struct writeback_control *wbc);
-int sync_page_range(struct inode *inode, struct address_space *mapping,
-                        loff_t pos, loff_t count);
-int sync_page_range_nolock(struct inode *inode, struct address_space *mapping,
-                           loff_t pos, loff_t count);
 void set_page_dirty_balance(struct page *page, int page_mkwrite);
 void writeback_set_ratelimit(void);