Skip to contentSkip to conversation

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

PATCH Mark Brown 1 participant 1 message Sep 2

Subsystems (4)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

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

drivers/iio/adc/ade9000.c

between commit:

88fda1ed51a57 ("iio: adc: ade9000: request interrupts after powering the device")

from the iio-fixes tree and commit:

b8104703a1a84 ("iio: adc: ade9000: introduce chip_info structure")

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.

drivers/iio/adc/ade9000.c +0 -0
diff --cc drivers/iio/adc/ade9000.c
index da6caabfe2a41,fd1362a980523..0000000000000
@@@ -1724,21 -1808,8 +1796,21 @@@ static int ade9000_probe(struct spi_dev
  		return dev_err_probe(&spi->dev, ret,
  				     "Failed to get and enable vdd regulator\n");
  
 +	/* Request IRQs only after powering the chip; the handlers do SPI access. */
 +	ret = ade9000_request_irq(dev, "irq0", ade9000_irq0_thread, indio_dev);
 +	if (ret)
 +		return ret;
 +
 +	ret = ade9000_request_irq(dev, "irq1", ade9000_irq1_thread, indio_dev);
 +	if (ret)
 +		return ret;
 +
 +	ret = ade9000_request_irq(dev, "dready", ade9000_dready_thread, indio_dev);
 +	if (ret)
 +		return ret;
 +
- 	indio_dev->channels = ade9000_channels;
- 	indio_dev->num_channels = ARRAY_SIZE(ade9000_channels);
+ 	indio_dev->channels = st->info->channels;
+ 	indio_dev->num_channels = st->info->num_channels;
  
  	ret = devm_iio_kfifo_buffer_setup(dev, indio_dev,
  					  &ade9000_buffer_ops);