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/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index a9155077feef..fec75786f75b 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -384,7 +384,7 @@ static void do_of_entry_multi(void *symval, struct module *mod)
         len = sprintf(alias, "of:N%sT%s", (*name)[0] ? *name : "*",
                       (*type)[0] ? *type : "*");
 
-        if (compatible[0])
+        if ((*compatible)[0])
                 sprintf(&alias[len], "%sC%s", (*type)[0] ? "*" : "",
                         *compatible);