Merge 3.12-rc2 into staging-next.

This resolves the merge problem with two iio drivers that Stephen
Rothwell pointed out.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

diff --cc drivers/iio/adc/at91_adc.c
Simple merge

diff --cc drivers/iio/buffer_cb.c
Simple merge

diff --cc drivers/iio/dac/mcp4725.c
Simple merge

diff --cc drivers/iio/iio_core.h
Simple merge

diff --cc drivers/iio/industrialio-buffer.c
index 2361fbc,2710f72..e9f389b
--- 1/drivers/iio/industrialio-buffer.c
--- 2/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@@ -521,9 -546,16 +540,16 @@@ int iio_update_buffers(struct iio_dev *
                         * Roll back.
                         * Note can only occur when adding a buffer.
                         */
 -                      list_del(&insert_buffer->buffer_list);
 +                      list_del_init(&insert_buffer->buffer_list);
-                       indio_dev->active_scan_mask = old_mask;
-                       success = -EINVAL;
+                       if (old_mask) {
+                               indio_dev->active_scan_mask = old_mask;
+                               success = -EINVAL;
+                       }
+                       else {
+                               kfree(compound_mask);
+                               ret = -EINVAL;
+                               goto error_ret;
+                       }
                }
        } else {
                indio_dev->active_scan_mask = compound_mask;

diff --cc drivers/iio/industrialio-core.c
Simple merge

diff --cc drivers/iio/industrialio-event.c
index 2390e3d,6be65ef..36f0c8e
--- 1/drivers/iio/industrialio-event.c
--- 2/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@@ -158,8 -163,10 +163,10 @@@ int iio_event_getfd(struct iio_dev *ind
                return -EBUSY;
        }
        spin_unlock_irq(&ev_int->wait.lock);
-       fd = anon_inode_getfd("iio:event",
-                               &iio_event_chrdev_fileops, ev_int, O_RDONLY | O_CLOEXEC);
+       iio_device_get(indio_dev);
+ 
+       fd = anon_inode_getfd("iio:event", &iio_event_chrdev_fileops,
 -                              indio_dev, O_RDONLY);
++                              indio_dev, O_RDONLY | O_CLOEXEC);
        if (fd < 0) {
                spin_lock_irq(&ev_int->wait.lock);
                __clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags);

diff --cc drivers/iio/temperature/tmp006.c
Simple merge

diff --cc drivers/staging/dgap/dgap_driver.c
Simple merge

diff --cc drivers/staging/dgnc/dgnc_driver.c
Simple merge

diff --cc drivers/staging/iio/light/isl29018.c
Simple merge

diff --cc drivers/staging/iio/magnetometer/hmc5843.c
Simple merge

diff --cc drivers/staging/iio/meter/ade7854-spi.c
index 7cb8d93,4c6d204..94f73bb
--- 1/drivers/staging/iio/meter/ade7854-spi.c
--- 2/drivers/staging/iio/meter/ade7854-spi.c
+++ b/drivers/staging/iio/meter/ade7854-spi.c
@@@ -296,8 -296,10 +296,8 @@@ static int ade7854_spi_probe(struct spi
  
  
        ret = ade7854_probe(indio_dev, &spi->dev);
 -      if (ret)
 -              iio_device_free(indio_dev);
  
-       return 0;
+       return ret;
  }
  
  static int ade7854_spi_remove(struct spi_device *spi)

diff --cc drivers/staging/lustre/lustre/Kconfig
Simple merge

diff --cc drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
Simple merge

diff --cc drivers/staging/rtl8188eu/core/rtw_wlan_util.c
Simple merge

diff --cc drivers/staging/rtl8188eu/include/odm.h
Simple merge