Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA: Update workqueue usage
  RDMA/nes: Fix incorrect SFP+ link status detection on driver init
  RDMA/nes: Fix SFP+ link down detection issue with switch port disable
  RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE events
  RDMA/nes: Fix bonding on iw_nes
  IB/srp: Test only once whether iu allocation succeeded
  IB/mlx4: Handle protocol field in multicast table
  RDMA: Use vzalloc() to replace vmalloc()+memset(0)
  mlx4_{core, ib, en}: Fix driver when sizeof (phys_addr_t) > sizeof (long)
  IB/mthca: Fix driver when sizeof (phys_addr_t) > sizeof (long)

diff --combined drivers/infiniband/hw/qib/qib_iba7322.c
index abd409d592ef893b04d75be62c775d338bb9f01e,ea46fbc34b170a9812390f1c8b33b5f5aa0cd0f1..50cceb3ab88547ca8b020eb3a1d80286a08cfe23
--- 1/drivers/infiniband/hw/qib/qib_iba7322.c
--- 2/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@@ -332,7 -332,7 +332,7 @@@ MODULE_PARM_DESC(txselect, 
  #define krp_serdesctrl KREG_IBPORT_IDX(IBSerdesCtrl)
  
  /*
 - * Per-context kernel registers.  Acess only with qib_read_kreg_ctxt()
 + * Per-context kernel registers.  Access only with qib_read_kreg_ctxt()
   * or qib_write_kreg_ctxt()
   */
  #define krc_rcvhdraddr KREG_IDX(RcvHdrAddr0)
@@@ -2406,10 -2406,9 +2406,9 @@@ static void qib_7322_mini_quiet_serdes(
        ppd->lflags &= ~QIBL_IB_AUTONEG_INPROG;
        spin_unlock_irqrestore(&ppd->lflags_lock, flags);
        wake_up(&ppd->cpspec->autoneg_wait);
-       cancel_delayed_work(&ppd->cpspec->autoneg_work);
+       cancel_delayed_work_sync(&ppd->cpspec->autoneg_work);
        if (ppd->dd->cspec->r1)
-               cancel_delayed_work(&ppd->cpspec->ipg_work);
-       flush_scheduled_work();
+               cancel_delayed_work_sync(&ppd->cpspec->ipg_work);
  
        ppd->cpspec->chase_end = 0;
        if (ppd->cpspec->chase_timer.data) /* if initted */
@@@ -2706,7 -2705,7 +2705,7 @@@ static noinline void unknown_7322_gpio_
                        if (!(pins & mask)) {
                                ++handled;
                                qd->t_insert = get_jiffies_64();
-                               schedule_work(&qd->work);
+                               queue_work(ib_wq, &qd->work);
                        }
                }
        }
@@@ -4990,8 -4989,8 +4989,8 @@@ static void try_7322_autoneg(struct qib
        set_7322_ibspeed_fast(ppd, QIB_IB_DDR);
        qib_7322_mini_pcs_reset(ppd);
        /* 2 msec is minimum length of a poll cycle */
-       schedule_delayed_work(&ppd->cpspec->autoneg_work,
-                             msecs_to_jiffies(2));
+       queue_delayed_work(ib_wq, &ppd->cpspec->autoneg_work,
+                          msecs_to_jiffies(2));
  }
  
  /*
@@@ -5121,7 -5120,8 +5120,8 @@@ static void try_7322_ipg(struct qib_ppo
                ib_free_send_mad(send_buf);
  retry:
        delay = 2 << ppd->cpspec->ipg_tries;
-       schedule_delayed_work(&ppd->cpspec->ipg_work, msecs_to_jiffies(delay));
+       queue_delayed_work(ib_wq, &ppd->cpspec->ipg_work,
+                          msecs_to_jiffies(delay));
  }
  
  /*