linux-next: manual merge of the gpio-brgl tree with the iio tree
Mark Brown
maintainerHi all,
Today's linux-next merge of the gpio-brgl tree got a conflict in:
MAINTAINERS
between commits:
02f4bd272bf7b ("iio: adc: add Axiado SARADC driver") a84f9870c16ba ("dt-bindings: iio: adc: add Axiado AX3000/AX3005 SARADC")
from the iio tree and commits:
a7787b818204d ("dt-bindings: gpio: add Axiado AX3005 SGPIO controller") dd36a4b7f391e ("gpio: axiado: add AX3005 SGPIO controller support")
from the gpio-brgl 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.
MAINTAINERS +0 -0
@@@ -4487,15 -4439,15 +4487,24 @@@ S: Orpha F: Documentation/devicetree/bindings/sound/axentia,* F: sound/soc/atmel/tse850-pcm5142.c +AXIADO SARADC DRIVER +M: Petar Stepanovic <[email protected]> +M: Akhila Kavi <[email protected]> +M: Prasad Bolisetty <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/devicetree/bindings/iio/adc/axiado,ax3000-saradc.yaml +F: drivers/iio/adc/axiado_saradc.c + + AXIADO SGPIO DRIVER + M: Petar Stepanovic <[email protected]> + M: SriNavmani A <[email protected]> + M: Prasad Bolisetty <[email protected]> + L: [email protected] + S: Supported + F: Documentation/devicetree/bindings/gpio/axiado,ax3005-sgpio.yaml + F: drivers/gpio/gpio-axiado-sgpio.c + AXIS ARTPEC ARM64 SoC SUPPORT M: Jesper Nilsson <[email protected]> M: Lars Persson <[email protected]>