Merge 6.13-rc4 into char-misc-next

We need the IIO fixes in here as well, and it resolves a merge conflict
in:
	drivers/iio/adc/ti-ads1119.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/bus/mhi/host/pci_generic.c
Simple merge

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

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

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

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

diff --cc drivers/iio/adc/ti-ads1119.c
index 0a68ecdea4e6f0084d2d0887015f679d2c944edc,c268e27eec12301cfb6bfd345ff7c2fe6778cd39..de019b3faa48152b3bfc251c38205758fcf35e91
--- 1/drivers/iio/adc/ti-ads1119.c
--- 2/drivers/iio/adc/ti-ads1119.c
+++ b/drivers/iio/adc/ti-ads1119.c
@@@ -500,8 -500,8 +500,8 @@@ static irqreturn_t ads1119_trigger_hand
        struct iio_dev *indio_dev = pf->indio_dev;
        struct ads1119_state *st = iio_priv(indio_dev);
        struct {
-               unsigned int sample;
+               s16 sample;
 -              s64 timestamp __aligned(8);
 +              aligned_s64 timestamp;
        } scan;
        unsigned int index;
        int ret;

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

diff --cc drivers/iio/light/bh1745.c
Simple merge

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

diff --cc drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
index 97c7dbe43377bc77a355a5cf1bd5b91ddb987448,3c1359d8d4e6926733e0b45c13e6462d09fc798a..04756302b8780544829ab96383ab6df09f45efe5
--- 1/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
--- 2/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
+++ b/drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
@@@ -147,11 -147,8 +147,11 @@@ static int pci1xxxx_gpio_set_config(str
        case PIN_CONFIG_DRIVE_OPEN_DRAIN:
                pci1xxx_assign_bit(priv->reg_base, OPENDRAIN_OFFSET(offset), (offset % 32), true);
                break;
 +      case PIN_CONFIG_DRIVE_PUSH_PULL:
 +              pci1xxx_assign_bit(priv->reg_base, OPENDRAIN_OFFSET(offset), (offset % 32), false);
 +              break;
        default:
-               ret = -EOPNOTSUPP;
+               ret = -ENOTSUPP;
                break;
        }
        spin_unlock_irqrestore(&priv->lock, flags);