Merge Linus's staging merge point into staging-next

This resolves the merge issue pointed out by Stephen in
drivers/iio/adc/meson_saradc.c.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/adc/meson_saradc.c
index f0b6502a8904f44fd64b6bd5d29e46ae230ff576,36047147ce7c727003a0f08df34880302ebd2e08..48fdbb3a061b10a051411a166c47097432b576ac
--- 1/drivers/iio/adc/meson_saradc.c
--- 2/drivers/iio/adc/meson_saradc.c
+++ b/drivers/iio/adc/meson_saradc.c
@@@ -732,8 -762,9 +755,7 @@@ static int meson_sar_adc_hw_enable(stru
  err_adc_clk:
        regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG3,
                           MESON_SAR_ADC_REG3_ADC_EN, 0);
-       regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11,
-                          MESON_SAR_ADC_REG11_BANDGAP_EN, 0);
+       meson_sar_adc_set_bandgap(indio_dev, false);
 -      clk_disable_unprepare(priv->sana_clk);
 -err_sana_clk:
        clk_disable_unprepare(priv->core_clk);
  err_core_clk:
        regulator_disable(priv->vref);
@@@ -756,9 -787,10 +778,9 @@@ static int meson_sar_adc_hw_disable(str
  
        regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG3,
                           MESON_SAR_ADC_REG3_ADC_EN, 0);
-       regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11,
-                          MESON_SAR_ADC_REG11_BANDGAP_EN, 0);
+ 
+       meson_sar_adc_set_bandgap(indio_dev, false);
  
 -      clk_disable_unprepare(priv->sana_clk);
        clk_disable_unprepare(priv->core_clk);
  
        regulator_disable(priv->vref);

diff --cc drivers/iio/health/max30102.c
index 490dfbaf35ac25ddb52ab08edffa885980ab3918,147a8c14235f3f8b39302c8f78beec811f6871dd..15ccadc74891f73dca409acb0806cb4136646da9
--- 1/drivers/iio/health/max30102.c
--- 2/drivers/iio/health/max30102.c
+++ b/drivers/iio/health/max30102.c
@@@ -482,22 -355,23 +482,22 @@@ static int max30102_read_raw(struct iio
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
                /*
 -               * Temperature reading can only be acquired while engine
 -               * is running
 +               * Temperature reading can only be acquired when not in
 +               * shutdown; leave shutdown briefly when buffer not running
                 */
                mutex_lock(&indio_dev->mlock);
 -
                if (!iio_buffer_enabled(indio_dev))
 -                      ret = -EBUSY;
 -              else {
 -                      ret = max30102_get_temp(data, val);
 -                      if (!ret)
 -                              ret = IIO_VAL_INT;
 -              }
 -
 +                      ret = max30102_get_temp(data, val, true);
 +              else
 +                      ret = max30102_get_temp(data, val, false);
                mutex_unlock(&indio_dev->mlock);
 +              if (ret)
 +                      return ret;
 +
 +              ret = IIO_VAL_INT;
                break;
        case IIO_CHAN_INFO_SCALE:
-               *val = 1;  /* 0.0625 */
+               *val = 1000;  /* 62.5 */
                *val2 = 16;
                ret = IIO_VAL_FRACTIONAL;
                break;

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

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

diff --cc drivers/staging/ccree/ssi_hash.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_atmio.c
Simple merge

diff --cc drivers/staging/ncpfs/inode.c
Simple merge