linux-next: manual merge of the gpio tree with the reset tree

[Mark Brown]

Hi Linus,

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

  MAINTAINERS

between commit:

  376349232a9364 ("ARC: reset: introduce AXS10x reset driver")

from the reset tree and commit:

   a3c1295280c8a ("MAINTAINERS: Add entry for Synopsys DesignWare APB GPIO driver")

from the gpio 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 310030b5b593,00c8be748ed2..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12963,12 -12883,13 +12963,19 @@@ F:	arch/arc/plat-axs10
  F:	arch/arc/boot/dts/ax*
  F:	Documentation/devicetree/bindings/arc/axs10*
  
 +SYNOPSYS AXS10x RESET CONTROLLER DRIVER
 +M:	Eugeniy Paltsev <Eugeniy.Paltsev@xxxxxxxxxxxx>
 +S:	Supported
 +F:	drivers/reset/reset-axs10x.c
 +F:	Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
 +
+ SYNOPSYS DESIGNWARE APB GPIO DRIVER
+ M:	Hoan Tran <hotran@xxxxxxx>
+ L:	linux-gpio@xxxxxxxxxxxxxxx
+ S:	Maintained
+ F:	drivers/gpio/gpio-dwapb.c
+ F:	Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
+ 
  SYNOPSYS DESIGNWARE DMAC DRIVER
  M:	Viresh Kumar <vireshk@xxxxxxxxxx>
  M:	Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>

Attachment: signature.asc
Description: PGP signature