linux-next: manual merge of the pwm tree with the devicetree tree

Posted by Stephen Rothwell 7 months, 3 weeks ago
Hi all,

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

  MAINTAINERS

between commit:

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

from the devicetree tree and commit:

  b6b5683e9692 ("dt-bindings: pwm: vt8500-pwm: Convert to YAML")

from the pwm 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 b5c2ce4cb560,26ef29a0c9bf..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3453,7 -3428,7 +3453,8 @@@ M:	Krzysztof Kozlowski <krzk@kernel.org
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Odd Fixes
  F:	Documentation/devicetree/bindings/i2c/i2c-wmt.txt
 +F:	Documentation/devicetree/bindings/interrupt-controller/via,vt8500-intc.yaml
+ F:	Documentation/devicetree/bindings/pwm/via,vt8500-pwm.yaml
  F:	arch/arm/boot/dts/vt8500/
  F:	arch/arm/mach-vt8500/
  F:	drivers/clocksource/timer-vt8500.c