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

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

Posted by Mark Brown 2 weeks, 3 days ago

Hi all,

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

  drivers/iio/adc/ad9467.c

between commit:

  92452b1760ff2 ("iio: adc: ad9467: fix ad9434 vref mask")

from the iio-fixes tree and commit:

  bac5e3d20c453 ("iio: adc: ad9467: include two's complement in default mode")

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.

diff --cc drivers/iio/adc/ad9467.c
index 2d8f8da3671da,9cfe66425d4e9..0000000000000
--- a/drivers/iio/adc/ad9467.c
+++ b/drivers/iio/adc/ad9467.c
@@@ -94,8 -103,8 +103,8 @@@
   */
  
  #define CHIPID_AD9434			0x6A
- #define AD9434_DEF_OUTPUT_MODE		0x00
+ #define AD9434_DEF_OUTPUT_MODE		0x01
 -#define AD9434_REG_VREF_MASK		0xC0
 +#define AD9434_REG_VREF_MASK		GENMASK(4, 0)
  
  /*
   * Analog Devices AD9467 16-Bit, 200/250 MSPS ADC