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, 5 insertions, 3 deletions

diff --git a/drivers/base/module.c b/drivers/base/module.c
index db930d3ee312..2a215780eda2 100644
--- a/drivers/base/module.c
+++ b/drivers/base/module.c
@@ -24,10 +24,12 @@ static char *make_driver_name(struct device_driver *drv)
 
 static void module_create_drivers_dir(struct module_kobject *mk)
 {
-        if (!mk || mk->drivers_dir)
-                return;
+        static DEFINE_MUTEX(drivers_dir_mutex);
 
-        mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
+        mutex_lock(&drivers_dir_mutex);
+        if (mk && !mk->drivers_dir)
+                mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
+        mutex_unlock(&drivers_dir_mutex);
 }
 
 void module_add_driver(struct module *mod, struct device_driver *drv)