linux-next: manual merge of the devicetree tree with the i2c-host tree

[Stephen Rothwell]

Hi all,

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

  MAINTAINERS

between commit:

  785eb0bca34b ("dt-bindings: i2c: i2c-wmt: Convert to YAML")

from the i2c-host tree and commit:

  2b18eda58c86 ("dt-bindings: interrupt-controller: via,vt8500-intc: Convert to YAML")

from the devicetree 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.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index b4277e45ad4e,63e804277519..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3443,7 -3427,8 +3443,8 @@@ M:	Alexey Charkov <alchark@xxxxxxxxx
  M:	Krzysztof Kozlowski <krzk@xxxxxxxxxx>
  L:	linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
  S:	Odd Fixes
 -F:	Documentation/devicetree/bindings/i2c/i2c-wmt.txt
 +F:	Documentation/devicetree/bindings/i2c/wm,wm8505-i2c.yaml
+ F:	Documentation/devicetree/bindings/interrupt-controller/via,vt8500-intc.yaml
  F:	arch/arm/boot/dts/vt8500/
  F:	arch/arm/mach-vt8500/
  F:	drivers/clocksource/timer-vt8500.c

Attachment: pgp6xrOyJvLet.pgp
Description: OpenPGP digital signature