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, 6 insertions, 0 deletions

diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 5fa4d4d81ee0..7de5134bec85 100644
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -502,6 +502,12 @@ static void rvt_remove_qp(struct rvt_dev_info *rdi, struct rvt_qp *qp)
  */
 static void rvt_reset_qp(struct rvt_dev_info *rdi, struct rvt_qp *qp,
                   enum ib_qp_type type)
+        __releases(&qp->s_lock)
+        __releases(&qp->s_hlock)
+        __releases(&qp->r_lock)
+        __acquires(&qp->r_lock)
+        __acquires(&qp->s_hlock)
+        __acquires(&qp->s_lock)
 {
         if (qp->state != IB_QPS_RESET) {
                 qp->state = IB_QPS_RESET;