Merge tag 'v7.0-rc7' into char-misc-next

We need the char/misc/iio/comedi fixes in here as well for testing

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/android/binder/rust_binder_main.rs
Simple merge

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

diff --cc drivers/comedi/drivers/dt2815.c
Simple merge

diff --cc drivers/comedi/drivers/ni_atmio16d.c
Simple merge

diff --cc drivers/gpib/common/gpib_os.c
Simple merge

diff --cc drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
Simple merge

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

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

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

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

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

diff --cc drivers/iio/adc/nxp-sar-adc.c
Simple merge

diff --cc drivers/iio/adc/ti-ads1119.c
index 1157e606bc64a1bad7305dfc5826c9c7617c31be,79be71b4de963a7a50ce978922315ca11f8f9655..2320be0efb50840241d65292f819dd0150fa9471
--- 1/drivers/iio/adc/ti-ads1119.c
--- 2/drivers/iio/adc/ti-ads1119.c
+++ b/drivers/iio/adc/ti-ads1119.c
@@@ -735,12 -738,11 +738,10 @@@ static int ads1119_probe(struct i2c_cli
                return dev_err_probe(dev, ret, "Failed to setup IIO buffer\n");
  
        if (client->irq > 0) {
-               ret = devm_request_threaded_irq(dev, client->irq,
-                                               ads1119_irq_handler,
-                                               NULL, IRQF_ONESHOT,
-                                               "ads1119", indio_dev);
+               ret = devm_request_irq(dev, client->irq, ads1119_irq_handler,
+                                      IRQF_NO_THREAD, "ads1119", indio_dev);
                if (ret)
 -                      return dev_err_probe(dev, ret,
 -                                           "Failed to allocate irq\n");
 +                      return ret;
  
                st->trig = devm_iio_trigger_alloc(dev, "%s-dev%d",
                                                  indio_dev->name,

diff --cc drivers/iio/adc/ti-ads7950.c
Simple merge

diff --cc drivers/misc/mei/Kconfig
Simple merge

diff --cc drivers/misc/mei/hw-me.c
Simple merge