Merge 6.12-rc4 into char-misc-next

We need the iio fixes from 6.12-rc4 in here as well.

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

diff --cc MAINTAINERS
index b1c25f0d8f9c0b7ddc4124b6c4061634957cb654,e9659a5a7fb3347d649855992a559e3526d18443..ba4d3aaf572637ccf03a51607bc23508dae2d1e9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11638,8 -11574,18 +11608,18 @@@ F: drivers/crypto/intel/keembay/keembay
  F:    drivers/crypto/intel/keembay/ocs-hcu.c
  F:    drivers/crypto/intel/keembay/ocs-hcu.h
  
+ INTEL LA JOLLA COVE ADAPTER (LJCA) USB I/O EXPANDER DRIVERS
+ M:    Wentong Wu <wentong.wu@intel.com>
+ M:    Sakari Ailus <sakari.ailus@linux.intel.com>
+ S:    Maintained
+ F:    drivers/gpio/gpio-ljca.c
+ F:    drivers/i2c/busses/i2c-ljca.c
+ F:    drivers/spi/spi-ljca.c
+ F:    drivers/usb/misc/usb-ljca.c
+ F:    include/linux/usb/ljca.h
+ 
  INTEL MANAGEMENT ENGINE (mei)
 -M:    Tomas Winkler <tomas.winkler@intel.com>
 +M:    Alexander Usyskin <alexander.usyskin@intel.com>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    Documentation/driver-api/mei/*

diff --cc drivers/iio/adc/Kconfig
Simple merge

diff --cc drivers/iio/dac/Kconfig
Simple merge

diff --cc drivers/iio/imu/bmi323/bmi323_core.c
Simple merge

diff --cc drivers/iio/light/Kconfig
Simple merge

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