Subject: linux-next: manual merge of the iio tree with the iio-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 6 May 2025 15:51:26 +1000

Hi all,

Today's linux-next merge of the iio tree got a conflict in:

  drivers/iio/adc/Kconfig

between commit:

  169eaf9ccfb0 ("iio: adc: ti-ads1298: Kconfig: add kfifo dependency to fix module build")

from the iio-fixes tree and commit:

  0de3748d80f3 ("iio: adc: sort TI drivers alphanumerical")

from the iio tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/iio/adc/Kconfig
index b7aac84e5224,ad06cf556785..000000000000
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@@ -1512,6 -1546,41 +1547,42 @@@ config TI_ADS111
           This driver can also be built as a module. If so, the module will be
           called ti-ads1119.
  
+ config TI_ADS124S08
+ 	tristate "Texas Instruments ADS124S08"
+ 	depends on SPI
+ 	select IIO_BUFFER
+ 	select IIO_TRIGGERED_BUFFER
+ 	help
+ 	  If you say yes here you get support for Texas Instruments ADS124S08
+ 	  and ADS124S06 ADC chips
+ 
+ 	  This driver can also be built as a module. If so, the module will be
+ 	  called ti-ads124s08.
+ 
+ config TI_ADS1298
+ 	tristate "Texas Instruments ADS1298"
+ 	depends on SPI
+ 	select IIO_BUFFER
++	select IIO_KFIFO_BUF
+ 	help
+ 	  If you say yes here you get support for Texas Instruments ADS1298
+ 	  medical ADC chips
+ 
+ 	  This driver can also be built as a module. If so, the module will be
+ 	  called ti-ads1298.
+ 
+ config TI_ADS131E08
+ 	tristate "Texas Instruments ADS131E08"
+ 	depends on SPI
+ 	select IIO_BUFFER
+ 	select IIO_TRIGGERED_BUFFER
+ 	help
+ 	  Say yes here to get support for Texas Instruments ADS131E04, ADS131E06
+ 	  and ADS131E08 chips.
+ 
+ 	  This driver can also be built as a module. If so, the module will be
+ 	  called ti-ads131e08.
+ 
  config TI_ADS7138
  	tristate "Texas Instruments ADS7128 and ADS7138 ADC driver"
  	depends on I2C