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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/accel/st_accel_core.c
Simple merge

diff --cc drivers/iio/common/st_sensors/st_sensors_buffer.c
Simple merge

diff --cc drivers/iio/common/st_sensors/st_sensors_core.c
Simple merge

diff --cc drivers/iio/gyro/st_gyro_core.c
Simple merge

diff --cc drivers/iio/humidity/am2315.c
Simple merge

diff --cc drivers/iio/imu/bmi160/bmi160_core.c
Simple merge

diff --cc drivers/iio/industrialio-trigger.c
index 6729112,0c52dfe..7c15c30
--- 1/drivers/iio/industrialio-trigger.c
--- 2/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@@ -217,15 -220,14 +223,14 @@@ static int iio_trigger_attach_poll_func
        ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
                                   pf->type, pf->name,
                                   pf);
-       if (ret < 0) {
-               module_put(pf->indio_dev->info->driver_module);
-               return ret;
-       }
+       if (ret < 0)
+               goto out_put_irq;
  
 -      if (trig->ops && trig->ops->set_trigger_state && notinuse) {
+       /* Enable trigger in driver */
 +      if (trig->ops->set_trigger_state && notinuse) {
                ret = trig->ops->set_trigger_state(trig, true);
                if (ret < 0)
-                       module_put(pf->indio_dev->info->driver_module);
+                       goto out_free_irq;
        }
  
        return ret;

diff --cc drivers/iio/magnetometer/st_magn_core.c
Simple merge

diff --cc drivers/iio/pressure/bmp280.c
Simple merge

diff --cc drivers/iio/pressure/st_pressure_core.c
Simple merge

diff --cc drivers/iio/proximity/as3935.c
Simple merge

diff --cc drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
Simple merge

diff --cc include/linux/iio/common/st_sensors.h
Simple merge