Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 1d92e091e22e..c99525512b34 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3452,14 +3452,14 @@ static int cm_establish(struct ib_cm_id *cm_id)
         work->cm_event.event = IB_CM_USER_ESTABLISHED;
 
         /* Check if the device started its remove_one */
-        spin_lock_irq(&cm.lock);
+        spin_lock_irqsave(&cm.lock, flags);
         if (!cm_dev->going_down) {
                 queue_delayed_work(cm.wq, &work->work, 0);
         } else {
                 kfree(work);
                 ret = -ENODEV;
         }
-        spin_unlock_irq(&cm.lock);
+        spin_unlock_irqrestore(&cm.lock, flags);
 
 out:
         return ret;