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:
  MAINTAINERS: Remove Glenn Streiff from NetEffect entry
  mlx4_core: Improve error message when not enough UAR pages are available
  IB/mlx4: Add support for memory management extensions and local DMA L_Key
  IB/mthca: Keep free count for MTT buddy allocator
  mlx4_core: Keep free count for MTT buddy allocator
  mlx4_code: Add missing FW status return code
  IB/mlx4: Rename struct mlx4_lso_seg to mlx4_wqe_lso_seg
  mlx4_core: Add module parameter to enable QoS support
  RDMA/iwcm: Remove IB_ACCESS_LOCAL_WRITE from remote QP attributes
  IPoIB: Include err code in trace message for ib_sa_path_rec_get() failures
  IB/sa_query: Check if sm_ah is NULL in ib_sa_remove_one()
  IB/ehca: Release mutex in error path of alloc_small_queue_page()
  IB/ehca: Use default value for Local CA ACK Delay if FW returns 0
  IB/ehca: Filter PATH_MIG events if QP was never armed
  IB/iser: Add support for RDMA_CM_EVENT_ADDR_CHANGE event
  RDMA/cma: Add RDMA_CM_EVENT_TIMEWAIT_EXIT event
  RDMA/cma: Add RDMA_CM_EVENT_ADDR_CHANGE event

diff --combined MAINTAINERS
index 5ecb97e13e5934c36fb03d5a0cc6b75bd909d7a1,2a73da0cd075b464c26c42a577fbbbe20d8dd224..be05ef9b7b429541fcff3a55f9355160e1e44dcb
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -441,7 -441,10 +441,7 @@@ M:        spyro@f2s.co
  S:    Maintained
  
  ARM PRIMECELL MMCI PL180/1 DRIVER
 -P:    Russell King
 -M:    rmk@arm.linux.org.uk
 -L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 -S:    Maintained
 +S:    Orphan
  
  ARM/ADI ROADRUNNER MACHINE SUPPORT
  P:    Lennert Buytenhek
@@@ -480,28 -483,11 +480,28 @@@ M:      kernel@wantstofly.or
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
 +ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
 +P:    Mike Rapoport
 +M:    mike@compulab.co.il
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +S:    Maintained
 +
  ARM/CORGI MACHINE SUPPORT
  P:    Richard Purdie
  M:    rpurdie@rpsys.net
  S:    Maintained
  
 +ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
 +P:    Daniel Ribeiro
 +M:    drwyrm@gmail.com
 +P:    Stefan Schmidt
 +M:    stefan@openezx.org
 +P:    Harald Welte
 +M:    laforge@openezx.org
 +L:    openezx-devel@lists.openezx.org (subscribers-only)
 +W:    http://www.openezx.org/
 +S:    Maintained
 +
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  P:    Lennert Buytenhek
  M:    kernel@wantstofly.org
@@@ -589,18 -575,10 +589,18 @@@ L:      linux-arm-kernel@lists.arm.linux.org
  S:    Maintained
  
  ARM/TOSA MACHINE SUPPORT
 +P:    Dmitry Baryshkov
 +M:    dbaryshkov@gmail.com
  P:    Dirk Opfer
  M:    dirk@opfer-online.de
  S:    Maintained
  
 +ARM/PALMTX SUPPORT
 +P:    Marek Vasut
 +M:    marek.vasut@gmail.com
 +W:    http://hackndev.com
 +S:    Maintained
 +
  ARM/PLEB SUPPORT
  P:    Peter Chubb
  M:    pleb@gelato.unsw.edu.au
@@@ -1984,7 -1962,7 +1984,7 @@@ P:      Carlos Corbach
  M:    carlos@strangeworlds.co.uk
  S:    Odd Fixes
  
 -HPET: High Precision Event Timers driver (hpet.c)
 +HPET: High Precision Event Timers driver (drivers/char/hpet.c)
  P:    Clemens Ladisch
  M:    clemens@ladisch.de
  S:    Maintained
@@@ -2937,8 -2915,6 +2937,6 @@@ P:      Faisal Lati
  M:    flatif@neteffect.com
  P:    Chien Tung
  M:    ctung@neteffect.com
- P:    Glenn Streiff
- M:    gstreiff@neteffect.com
  L:    general@lists.openfabrics.org
  W:    http://www.neteffect.com
  S:    Supported
@@@ -3555,7 -3531,7 +3553,7 @@@ S:      Supporte
  
  S390 NETWORK DRIVERS
  P:    Ursula Braun
 -M:    ubraun@linux.vnet.ibm.com
 +M:    ursula.braun@de.ibm.com
  P:    Frank Blaschka
  M:    blaschka@linux.vnet.ibm.com
  M:    linux390@de.ibm.com
@@@ -3575,7 -3551,7 +3573,7 @@@ S:      Supporte
  
  S390 IUCV NETWORK LAYER
  P:    Ursula Braun
 -M:    ubraun@linux.vnet.ibm.com
 +M:    ursula.braun@de.ibm.com
  M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -4080,6 -4056,12 +4078,6 @@@ W:     http://www.prosec.rub.de/tpm
  L:    tpmdd-devel@lists.sourceforge.net
  S:    Maintained
  
 -TRIDENT 4DWAVE/SIS 7018 PCI AUDIO CORE
 -P:    Muli Ben-Yehuda
 -M:    mulix@mulix.org
 -L:    linux-kernel@vger.kernel.org
 -S:    Maintained
 -
  TRIVIAL PATCHES
  P:    Jesper Juhl
  M:    trivial@kernel.org
@@@ -4125,6 -4107,9 +4123,6 @@@ W:      http://www.uclinux.org
  L:    uclinux-dev@uclinux.org  (subscribers-only)
  S:    Maintained
  
 -UCLINUX FOR NEC V850
 -P:    Miles Bader
 -
  UCLINUX FOR RENESAS H8/300
  P:    Yoshinori Sato
  M:    ysato@users.sourceforge.jp

diff --combined drivers/infiniband/hw/ehca/ehca_irq.c
index 7a64aa9b51b6e6bf3866ac72fba4899bb9fcd348,99642a6e17c4b1c1236040cbc9725082227b146f..cb55be04442c615796fe67c78a822658c8aa0104
--- 1/drivers/infiniband/hw/ehca/ehca_irq.c
--- 2/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@@ -178,6 -178,10 +178,10 @@@ static void dispatch_qp_event(struct eh
  {
        struct ib_event event;
  
+       /* PATH_MIG without the QP ever having been armed is false alarm */
+       if (event_type == IB_EVENT_PATH_MIG && !qp->mig_armed)
+               return;
+ 
        event.device = &shca->ib_device;
        event.event = event_type;
  
@@@ -646,8 -650,8 +650,8 @@@ static inline int find_next_online_cpu(
                ehca_dmp(&cpu_online_map, sizeof(cpumask_t), "");
  
        spin_lock_irqsave(&pool->last_cpu_lock, flags);
 -      cpu = next_cpu(pool->last_cpu, cpu_online_map);
 -      if (cpu == NR_CPUS)
 +      cpu = next_cpu_nr(pool->last_cpu, cpu_online_map);
 +      if (cpu >= nr_cpu_ids)
                cpu = first_cpu(cpu_online_map);
        pool->last_cpu = cpu;
        spin_unlock_irqrestore(&pool->last_cpu_lock, flags);