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, 1 insertions, 1 deletions

diff --git a/drivers/infiniband/core/iwpm_msg.c b/drivers/infiniband/core/iwpm_msg.c
index 43e3fa27102b..1c41b95cefec 100644
--- a/drivers/infiniband/core/iwpm_msg.c
+++ b/drivers/infiniband/core/iwpm_msg.c
@@ -506,7 +506,7 @@ int iwpm_add_and_query_mapping_cb(struct sk_buff *skb,
         if (!nlmsg_request) {
                 pr_info("%s: Could not find a matching request (seq = %u)\n",
                                  __func__, msg_seq);
-                        return -EINVAL;
+                return -EINVAL;
         }
         pm_msg = nlmsg_request->req_buffer;
         local_sockaddr = (struct sockaddr_storage *)