Merge tag 'v6.12-rc2' into test2

Linux 6.12-rc2

Resolved movement of asm/unaligned.h to linux/unaligned.h

diff --cc MAINTAINERS
Simple merge

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

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

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

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

diff --cc drivers/iio/adc/max1363.c
index d59cd638db96f45e158746d012f821c5aa45cafb,d0c6e94f7204eed7432d77a0b23de108d2c126f9..8da2d8d7a9c677c6eb5c4b2903a7954c0105707d
--- 1/drivers/iio/adc/max1363.c
--- 2/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@@ -25,6 -25,6 +25,7 @@@
  #include <linux/module.h>
  #include <linux/mod_devicetable.h>
  #include <linux/property.h>
++#include <linux/unaligned.h>
  
  #include <linux/iio/iio.h>
  #include <linux/iio/sysfs.h>

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

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

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

diff --cc drivers/iio/addac/ad74115.c
Simple merge

diff --cc drivers/iio/addac/ad74413r.c
Simple merge

diff --cc drivers/iio/dac/ad5770r.c
index 12c98f3e62a545d8429387618097dcae3fc37114,c360ebf5297ab9461e25ae831af2c291346c66aa..7d7f5110d66a54285e593162544c38ef5743d1fe
--- 1/drivers/iio/dac/ad5770r.c
--- 2/drivers/iio/dac/ad5770r.c
+++ b/drivers/iio/dac/ad5770r.c
@@@ -17,7 -17,6 +17,7 @@@
  #include <linux/regmap.h>
  #include <linux/regulator/consumer.h>
  #include <linux/spi/spi.h>
- #include <asm/unaligned.h>
++#include <linux/unaligned.h>
  
  #define ADI_SPI_IF_CONFIG_A           0x00
  #define ADI_SPI_IF_CONFIG_B           0x01

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

diff --cc drivers/iio/light/ltr390.c
index a92034cdd67afeb5c9aecb50b75d2015bf6a3f17,4f6975e63a8fe152c1eed53a661593760611555a..8e0a3fc3d923a6f65d2a629c87e7bfd35d82a507
--- 1/drivers/iio/light/ltr390.c
--- 2/drivers/iio/light/ltr390.c
+++ b/drivers/iio/light/ltr390.c
@@@ -27,11 -23,11 +27,11 @@@
  #include <linux/module.h>
  #include <linux/mutex.h>
  #include <linux/regmap.h>
 -#include <linux/bitfield.h>
  
  #include <linux/iio/iio.h>
 +#include <linux/iio/events.h>
  
- #include <asm/unaligned.h>
+ #include <linux/unaligned.h>
  
  #define LTR390_MAIN_CTRL              0x00
  #define LTR390_ALS_UVS_MEAS_RATE      0x04

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

diff --cc drivers/iio/pressure/bmp280-core.c
Simple merge

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

diff --cc drivers/iio/proximity/vl53l0x-i2c.c
index 5a137859c2b69222dbd0453fcb6a3014a4d0df3d,8d4f3f849fe246370f34d6c4b0a4dbaf90204d6a..87d10faaff9b11eb37d22a9372187425072976a7
--- 1/drivers/iio/proximity/vl53l0x-i2c.c
--- 2/drivers/iio/proximity/vl53l0x-i2c.c
+++ b/drivers/iio/proximity/vl53l0x-i2c.c
@@@ -20,15 -20,9 +20,14 @@@
  #include <linux/irq.h>
  #include <linux/interrupt.h>
  #include <linux/module.h>
++#include <linux/unaligned.h>
  
  #include <linux/iio/iio.h>
 +#include <linux/iio/buffer.h>
 +#include <linux/iio/trigger.h>
 +#include <linux/iio/trigger_consumer.h>
 +#include <linux/iio/triggered_buffer.h>
  
- #include <asm/unaligned.h>
- 
  #define VL_REG_SYSRANGE_START                         0x00
  
  #define VL_REG_SYSRANGE_MODE_MASK                     GENMASK(3, 0)