From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Date: Sat, 12 Oct 2024 10:22:25 +0000 (+0100)
Subject: Merge tag 'v6.12-rc2' into test2
X-Git-Tag: v6.13-rc1~28^2~41^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=220c71dafaa28cbb75fd785670cf68a758347026;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'v6.12-rc2' into test2

Linux 6.12-rc2

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

220c71dafaa28cbb75fd785670cf68a758347026
diff --cc drivers/iio/adc/max1363.c
index d59cd638db96f,d0c6e94f7204e..8da2d8d7a9c67
--- a/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/dac/ad5770r.c
index 12c98f3e62a54,c360ebf5297ab..7d7f5110d66a5
--- a/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/light/ltr390.c
index a92034cdd67af,4f6975e63a8fe..8e0a3fc3d923a
--- a/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/proximity/vl53l0x-i2c.c
index 5a137859c2b69,8d4f3f849fe24..87d10faaff9b1
--- a/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)