linux-next: manual merge of the dt-krzk tree with the devicetree, i2c-host trees

linux-next: manual merge of the dt-krzk tree with the devicetree, i2c-host trees

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1536 bytes --]

Hi all,

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

  MAINTAINERS

between commits:

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

from the devicetree, i2c-host trees and commit:

  47cbd5d8693d ("ARM: vt8500: MAINTAINERS: Include vt8500 soc driver in maintainers entry")

from the dt-krzk 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 3097f9470937,dcb10e7175b8..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3443,8 -3427,8 +3443,9 @@@ M:	Alexey Charkov <alchark@gmail.com
  M:	Krzysztof Kozlowski <krzk@kernel.org>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Odd Fixes
+ F:	Documentation/devicetree/bindings/hwinfo/via,vt8500-scc-id.yaml
 -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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]