15 files changed, 109 insertions, 79 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index bd10b2af2223..92d696874965 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1899,6 +1899,12 @@ M:	James.Bottomley@HansenPartnership.com
 L:      linux-scsi@vger.kernel.org
 S:      Maintained
 
+NETEM NETWORK EMULATOR
+P:      Stephen Hemminger
+M:      shemminger@osdl.org
+L:      netem@osdl.org
+S:      Maintained
+
 NETFILTER/IPTABLES/IPCHAINS
 P:      Rusty Russell
 P:      Marc Boucher
diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S
index f48bef15b4f0..af56987f69b0 100644
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
@@ -315,3 +315,4 @@ ENTRY(sys_call_table)
         .long sys_splice
         .long sys_sync_file_range
         .long sys_tee                   /* 315 */
+        .long sys_vmsplice
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 4d15e396655c..b9200fb07815 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -463,11 +463,23 @@ static int pmac_pm_finish(suspend_state_t state)
         return 0;
 }
 
+static int pmac_pm_valid(suspend_state_t state)
+{
+        switch (state) {
+        case PM_SUSPEND_DISK:
+                return 1;
+        /* can't do any other states via generic mechanism yet */
+        default:
+                return 0;
+        }
+}
+
 static struct pm_ops pmac_pm_ops = {
         .pm_disk_mode   = PM_DISK_SHUTDOWN,
         .prepare        = pmac_pm_prepare,
         .enter          = pmac_pm_enter,
         .finish         = pmac_pm_finish,
+        .valid          = pmac_pm_valid,
 };
 
 #endif /* CONFIG_SOFTWARE_SUSPEND */
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index f621168f38ae..8ea70625f7ea 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -457,10 +457,6 @@ static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
         }
 
         vendor = ioread32(chip->vendor.iobase + TPM_DID_VID(0));
-        if ((vendor & 0xFFFF) == 0xFFFF) {
-                rc = -ENODEV;
-                goto out_err;
-        }
 
         /* Default timeouts */
         chip->vendor.timeout_a = msecs_to_jiffies(TIS_SHORT_TIMEOUT);
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index a140e4536a4e..766cc969c4d0 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -491,7 +491,7 @@ static struct pci_device_id divil_pci[] = {
 
 #define MSR_LBAR_SMB            0x5140000B
 
-static int scx200_add_cs553x(void)
+static __init int scx200_add_cs553x(void)
 {
         u32     low, hi;
         u32     smb_base;
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
index 1ea433291fa7..b292fefa3b41 100644
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -490,26 +490,7 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
 
         first_ind = srq->first_free;
 
-        for (nreq = 0; wr; ++nreq, wr = wr->next) {
-                if (unlikely(nreq == MTHCA_TAVOR_MAX_WQES_PER_RECV_DB)) {
-                        nreq = 0;
-
-                        doorbell[0] = cpu_to_be32(first_ind << srq->wqe_shift);
-                        doorbell[1] = cpu_to_be32(srq->srqn << 8);
-
-                        /*
-                         * Make sure that descriptors are written
-                         * before doorbell is rung.
-                         */
-                        wmb();
-
-                        mthca_write64(doorbell,
-                                      dev->kar + MTHCA_RECEIVE_DOORBELL,
-                                      MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
-
-                        first_ind = srq->first_free;
-                }
-
+        for (nreq = 0; wr; wr = wr->next) {
                 ind = srq->first_free;
 
                 if (ind < 0) {
@@ -569,6 +550,26 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr,
 
                 srq->wrid[ind]  = wr->wr_id;
                 srq->first_free = next_ind;
+
+                ++nreq;
+                if (unlikely(nreq == MTHCA_TAVOR_MAX_WQES_PER_RECV_DB)) {
+                        nreq = 0;
+
+                        doorbell[0] = cpu_to_be32(first_ind << srq->wqe_shift);
+                        doorbell[1] = cpu_to_be32(srq->srqn << 8);
+
+                        /*
+                         * Make sure that descriptors are written
+                         * before doorbell is rung.
+                         */
+                        wmb();
+
+                        mthca_write64(doorbell,
+                                      dev->kar + MTHCA_RECEIVE_DOORBELL,
+                                      MTHCA_GET_DOORBELL_LOCK(&dev->doorbell_lock));
+
+                        first_ind = srq->first_free;
+                }
         }
 
         if (likely(nreq)) {
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 1494175ac6fe..161afddd0f44 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -36,13 +36,10 @@
 
 
 /*
- * This code has been tested on an ads7846 / N770 device.
+ * This code has been heavily tested on a Nokia 770, and lightly
+ * tested on other ads7846 devices (OSK/Mistral, Lubbock).
  * Support for ads7843 and ads7845 has only been stubbed in.
  *
- * Not yet done:  How accurate are the temperature and voltage
- * readings? (System-specific calibration should support
- * accuracy of 0.3 degrees C; otherwise it's 2.0 degrees.)
- *
  * IRQ handling needs a workaround because of a shortcoming in handling
  * edge triggered IRQs on some platforms like the OMAP1/2. These
  * platforms don't handle the ARM lazy IRQ disabling properly, thus we
@@ -248,10 +245,13 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
 
         if (req->msg.status)
                 status = req->msg.status;
+
+        /* on-wire is a must-ignore bit, a BE12 value, then padding */
         sample = be16_to_cpu(req->sample);
-        sample = sample >> 4;
-        kfree(req);
+        sample = sample >> 3;
+        sample &= 0x0fff;
 
+        kfree(req);
         return status ? status : sample;
 }
 
@@ -336,13 +336,13 @@ static void ads7846_rx(void *ads)
         u16                     x, y, z1, z2;
         unsigned long           flags;
 
-        /* adjust:  12 bit samples (left aligned), built from
-         * two 8 bit values writen msb-first.
+        /* adjust:  on-wire is a must-ignore bit, a BE12 value, then padding;
+         * built from two 8 bit values written msb-first.
          */
-        x = be16_to_cpu(ts->tc.x) >> 4;
-        y = be16_to_cpu(ts->tc.y) >> 4;
-        z1 = be16_to_cpu(ts->tc.z1) >> 4;
-        z2 = be16_to_cpu(ts->tc.z2) >> 4;
+        x = (be16_to_cpu(ts->tc.x) >> 3) & 0x0fff;
+        y = (be16_to_cpu(ts->tc.y) >> 3) & 0x0fff;
+        z1 = (be16_to_cpu(ts->tc.z1) >> 3) & 0x0fff;
+        z2 = (be16_to_cpu(ts->tc.z2) >> 3) & 0x0fff;
 
         /* range filtering */
         if (x == MAX_12BIT)
@@ -420,7 +420,7 @@ static void ads7846_debounce(void *ads)
 
         m = &ts->msg[ts->msg_idx];
         t = list_entry(m->transfers.prev, struct spi_transfer, transfer_list);
-        val = (*(u16 *)t->rx_buf) >> 3;
+        val = (be16_to_cpu(*(__be16 *)t->rx_buf) >> 3) & 0x0fff;
         if (!ts->read_cnt || (abs(ts->last_read - val) > ts->debounce_tol)) {
                 /* Repeat it, if this was the first read or the read
                  * wasn't consistent enough. */
@@ -469,7 +469,7 @@ static void ads7846_timer(unsigned long handle)
         spin_lock_irq(&ts->lock);
 
         if (unlikely(ts->msg_idx && !ts->pendown)) {
-                /* measurment cycle ended */
+                /* measurement cycle ended */
                 if (!device_suspended(&ts->spi->dev)) {
                         ts->irq_disabled = 0;
                         enable_irq(ts->spi->irq);
@@ -495,11 +495,10 @@ static irqreturn_t ads7846_irq(int irq, void *handle, struct pt_regs *regs)
         spin_lock_irqsave(&ts->lock, flags);
         if (likely(ts->get_pendown_state())) {
                 if (!ts->irq_disabled) {
-                        /* REVISIT irq logic for many ARM chips has cloned a
-                         * bug wherein disabling an irq in its handler won't
-                         * work;(it's disabled lazily, and too late to work.
-                         * until all their irq logic is fixed, we must shadow
-                         * that state here.
+                        /* The ARM do_simple_IRQ() dispatcher doesn't act
+                         * like the other dispatchers:  it will report IRQs
+                         * even after they've been disabled.  We work around
+                         * that here.  (The "generic irq" framework may help...)
                          */
                         ts->irq_disabled = 1;
                         disable_irq(ts->spi->irq);
@@ -609,16 +608,20 @@ static int __devinit ads7846_probe(struct spi_device *spi)
                 return -EINVAL;
         }
 
+        /* REVISIT when the irq can be triggered active-low, or if for some
+         * reason the touchscreen isn't hooked up, we don't need to access
+         * the pendown state.
+         */
         if (pdata->get_pendown_state == NULL) {
                 dev_dbg(&spi->dev, "no get_pendown_state function?\n");
                 return -EINVAL;
         }
 
-        /* We'd set the wordsize to 12 bits ... except that some controllers
-         * will then treat the 8 bit command words as 12 bits (and drop the
-         * four MSBs of the 12 bit result).  Result: inputs must be shifted
-         * to discard the four garbage LSBs.
+        /* We'd set TX wordsize 8 bits and RX wordsize to 13 bits ... except
+         * that even if the hardware can do that, the SPI controller driver
+         * may not.  So we stick to very-portable 8 bit words, both RX and TX.
          */
+        spi->bits_per_word = 8;
 
         ts = kzalloc(sizeof(struct ads7846), GFP_KERNEL);
         input_dev = input_allocate_device();
@@ -772,7 +775,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
         if (request_irq(spi->irq, ads7846_irq,
                         SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING,
-                        spi->dev.bus_id, ts)) {
+                        spi->dev.driver->name, ts)) {
                 dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq);
                 err = -EBUSY;
                 goto err_free_mem;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3ca3cfb03a7e..ec802913f977 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5028,8 +5028,10 @@ static int md_notify_reboot(struct notifier_block *this,
                 printk(KERN_INFO "md: stopping all md devices.\n");
 
                 ITERATE_MDDEV(mddev,tmp)
-                        if (mddev_trylock(mddev))
+                        if (mddev_trylock(mddev)) {
                                 do_md_stop (mddev, 1);
+                                mddev_unlock(mddev);
+                        }
                 /*
                  * certain more exotic SCSI devices are known to be
                  * volatile wrt too early system reboots. While the
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 5e6d00752990..cff8598aa800 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -33,7 +33,7 @@ config DONGLE
 
 config ESI_DONGLE
         tristate "ESI JetEye PC dongle"
-        depends on DONGLE && IRDA
+        depends on IRTTY_SIR && DONGLE && IRDA
         help
           Say Y here if you want to build support for the Extended Systems
           JetEye PC dongle.  To compile it as a module, choose M here. The ESI
@@ -44,7 +44,7 @@ config ESI_DONGLE
 
 config ACTISYS_DONGLE
         tristate "ACTiSYS IR-220L and IR220L+ dongle"
-        depends on DONGLE && IRDA
+        depends on IRTTY_SIR && DONGLE && IRDA
         help
           Say Y here if you want to build support for the ACTiSYS IR-220L and
           IR220L+ dongles.  To compile it as a module, choose M here. The
@@ -55,7 +55,7 @@ config ACTISYS_DONGLE
 
 config TEKRAM_DONGLE
         tristate "Tekram IrMate 210B dongle"
-        depends on DONGLE && IRDA
+        depends on IRTTY_SIR && DONGLE && IRDA
         help
           Say Y here if you want to build support for the Tekram IrMate 210B
           dongle.  To compile it as a module, choose M here. The Tekram dongle
@@ -66,7 +66,7 @@ config TEKRAM_DONGLE
 
 config TOIM3232_DONGLE
         tristate "TOIM3232 IrDa dongle"
-        depends on DONGLE && IRDA
+        depends on IRTTY_SIR && DONGLE && IRDA
         help
           Say Y here if you want to build support for the Vishay/Temic
           TOIM3232 and TOIM4232 based dongles.
@@ -74,7 +74,7 @@ config TOIM3232_DONGLE
 
 config LITELINK_DONGLE
         tristate "Parallax LiteLink dongle"
-        depends on DONGLE && IRDA
+        depends on IRTTY_SIR && DONGLE && IRDA
         help
           Say Y here if you want to build support for the Parallax Litelink
           dongle.  To compile it as a module, choose M here.  The Parallax
@@ -85,7 +85,7 @@ config LITELINK_DONGLE
 
 config MA600_DONGLE
         tristate "Mobile Action MA600 dongle"
-        depends on DONGLE && IRDA && EXPERIMENTAL
+        depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
         help
           Say Y here if you want to build support for the Mobile Action MA600
           dongle.  To compile it as a module, choose M here. The MA600 dongle
@@ -98,7 +98,7 @@ config MA600_DONGLE
 
 config GIRBIL_DONGLE
         tristate "Greenwich GIrBIL dongle"
-        depends on DONGLE && IRDA && EXPERIMENTAL
+        depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
         help
           Say Y here if you want to build support for the Greenwich GIrBIL
           dongle.  If you want to compile it as a module, choose M here.
@@ -109,7 +109,7 @@ config GIRBIL_DONGLE
 
 config MCP2120_DONGLE
         tristate "Microchip MCP2120"
-        depends on DONGLE && IRDA && EXPERIMENTAL
+        depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
         help
           Say Y here if you want to build support for the Microchip MCP2120
           dongle.  If you want to compile it as a module, choose M here.
@@ -123,7 +123,7 @@ config MCP2120_DONGLE
 
 config OLD_BELKIN_DONGLE
         tristate "Old Belkin dongle"
-        depends on DONGLE && IRDA && EXPERIMENTAL
+        depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
         help
           Say Y here if you want to build support for the Adaptec Airport 1000
           and 2000 dongles.  If you want to compile it as a module, choose
@@ -132,7 +132,7 @@ config OLD_BELKIN_DONGLE
 
 config ACT200L_DONGLE
         tristate "ACTiSYS IR-200L dongle"
-        depends on DONGLE && IRDA && EXPERIMENTAL
+        depends on IRTTY_SIR && DONGLE && IRDA && EXPERIMENTAL
         help
           Say Y here if you want to build support for the ACTiSYS IR-200L
           dongle. If you want to compile it as a module, choose M here.
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 9de4b5a04d70..5fc14563ee3a 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -405,7 +405,7 @@ static int s3c24xx_spi_remove(struct platform_device *dev)
 
 static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg)
 {
-        struct s3c24xx_spi *hw = platform_get_drvdata(dev);
+        struct s3c24xx_spi *hw = platform_get_drvdata(pdev);
 
         clk_disable(hw->clk);
         return 0;
@@ -413,7 +413,7 @@ static int s3c24xx_spi_suspend(struct platform_device *pdev, pm_message_t msg)
 
 static int s3c24xx_spi_resume(struct platform_device *pdev)
 {
-        struct s3c24xx_spi *hw = platform_get_drvdata(dev);
+        struct s3c24xx_spi *hw = platform_get_drvdata(pdev);
 
         clk_enable(hw->clk);
         return 0;
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index d4c2d636c479..a42143ca0169 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -416,10 +416,9 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
                         return retval;
         }
 
-        retval = -EIO;
         bh = affs_bread(sb, old_dentry->d_inode->i_ino);
         if (!bh)
-                goto done;
+                return -EIO;
 
         /* Remove header from its parent directory. */
         affs_lock_dir(old_dir);
diff --git a/include/asm-alpha/termbits.h b/include/asm-alpha/termbits.h
index f4837fa29420..5541101b58ae 100644
--- a/include/asm-alpha/termbits.h
+++ b/include/asm-alpha/termbits.h
@@ -148,6 +148,7 @@ struct termios {
 #define HUPCL   00040000
 
 #define CLOCAL  00100000
+#define CMSPAR    010000000000          /* mark or space (stick) parity */
 #define CRTSCTS   020000000000          /* flow control */
 
 /* c_lflag bits */
diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h
index ebf6055481dc..6d533b07aaf5 100644
--- a/include/asm-powerpc/termbits.h
+++ b/include/asm-powerpc/termbits.h
@@ -153,6 +153,7 @@ struct termios {
 #define HUPCL   00040000
 
 #define CLOCAL  00100000
+#define CMSPAR    010000000000          /* mark or space (stick) parity */
 #define CRTSCTS   020000000000          /* flow control */
 
 /* c_lflag bits */
diff --git a/net/core/dev.c b/net/core/dev.c
index 2dce673a039b..4fba549caf29 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -127,7 +127,7 @@
  *             sure which should go first, but I bet it won't make much
  *             difference if we are running VLANs.  The good news is that
  *             this protocol won't be in the list unless compiled in, so
- *             the average user (w/out VLANs) will not be adversly affected.
+ *             the average user (w/out VLANs) will not be adversely affected.
  *             --BLG
  *
  *              0800    IP
@@ -149,7 +149,7 @@ static struct list_head ptype_base[16];	/* 16 way hashed list */
 static struct list_head ptype_all;              /* Taps */
 
 /*
- * The @dev_base list is protected by @dev_base_lock and the rtln
+ * The @dev_base list is protected by @dev_base_lock and the rtnl
  * semaphore.
  *
  * Pure readers hold dev_base_lock for reading.
@@ -641,10 +641,12 @@ int dev_valid_name(const char *name)
  *      @name: name format string
  *
  *      Passed a format string - eg "lt%d" it will try and find a suitable
- *      id. Not efficient for many devices, not called a lot. The caller
- *      must hold the dev_base or rtnl lock while allocating the name and
- *      adding the device in order to avoid duplicates. Returns the number
- *      of the unit assigned or a negative errno code.
+ *      id. It scans list of devices to build up a free map, then chooses
+ *      the first empty slot. The caller must hold the dev_base or rtnl lock
+ *      while allocating the name and adding the device in order to avoid
+ *      duplicates.
+ *      Limited to bits_per_byte * page size devices (ie 32K on most platforms).
+ *      Returns the number of the unit assigned or a negative errno code.
  */
 
 int dev_alloc_name(struct net_device *dev, const char *name)
@@ -744,7 +746,7 @@ int dev_change_name(struct net_device *dev, char *newname)
 }
 
 /**
- *      netdev_features_change - device changes fatures
+ *      netdev_features_change - device changes features
  *      @dev: device to cause notification
  *
  *      Called to indicate a device has changed features.
@@ -2196,7 +2198,7 @@ int netdev_set_master(struct net_device *slave, struct net_device *master)
  *      @dev: device
  *      @inc: modifier
  *
- *      Add or remove promsicuity from a device. While the count in the device
+ *      Add or remove promiscuity from a device. While the count in the device
  *      remains above zero the interface remains promiscuous. Once it hits zero
  *      the device reverts back to normal filtering operation. A negative inc
  *      value is used to drop promiscuity on the device.
@@ -3122,7 +3124,7 @@ EXPORT_SYMBOL(alloc_netdev);
 void free_netdev(struct net_device *dev)
 {
 #ifdef CONFIG_SYSFS
-        /*  Compatiablity with error handling in drivers */
+        /*  Compatibility with error handling in drivers */
         if (dev->reg_state == NETREG_UNINITIALIZED) {
                 kfree((char *)dev - dev->padded);
                 return;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 0190e39096b9..8a777932786d 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -280,10 +280,13 @@ static int inline rt6_check_neigh(struct rt6_info *rt)
 {
         struct neighbour *neigh = rt->rt6i_nexthop;
         int m = 0;
-        if (neigh) {
+        if (rt->rt6i_flags & RTF_NONEXTHOP ||
+            !(rt->rt6i_flags & RTF_GATEWAY))
+                m = 1;
+        else if (neigh) {
                 read_lock_bh(&neigh->lock);
                 if (neigh->nud_state & NUD_VALID)
-                        m = 1;
+                        m = 2;
                 read_unlock_bh(&neigh->lock);
         }
         return m;
@@ -292,15 +295,18 @@ static int inline rt6_check_neigh(struct rt6_info *rt)
 static int rt6_score_route(struct rt6_info *rt, int oif,
                            int strict)
 {
-        int m = rt6_check_dev(rt, oif);
+        int m, n;
+                
+        m = rt6_check_dev(rt, oif);
         if (!m && (strict & RT6_SELECT_F_IFACE))
                 return -1;
 #ifdef CONFIG_IPV6_ROUTER_PREF
         m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(rt->rt6i_flags)) << 2;
 #endif
-        if (rt6_check_neigh(rt))
+        n = rt6_check_neigh(rt);
+        if (n > 1)
                 m |= 16;
-        else if (strict & RT6_SELECT_F_REACHABLE)
+        else if (!n && strict & RT6_SELECT_F_REACHABLE)
                 return -1;
         return m;
 }