linux-next: manual merge of the gpio-brgl tree with the iio tree

[Mark Brown]

Hi 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.

diff --cc MAINTAINERS
index b6400ebe7d2dd,9aea4c3fd3aee..0000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -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 <pstepanovic@xxxxxxxxxx>
 +M:	Akhila Kavi <akavi@xxxxxxxxxx>
 +M:	Prasad Bolisetty <pbolisetty@xxxxxxxxxx>
 +L:	linux-iio@xxxxxxxxxxxxxxx
 +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 <pstepanovic@xxxxxxxxxx>
+ M:	SriNavmani A <srinavmani@xxxxxxxxxx>
+ M:	Prasad Bolisetty <pbolisetty@xxxxxxxxxx>
+ L:	linux-gpio@xxxxxxxxxxxxxxx
+ 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 <jesper.nilsson@xxxxxxxx>
  M:	Lars Persson <lars.persson@xxxxxxxx>

Attachment: signature.asc
Description: PGP signature