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

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

[Stephen Rothwell]

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

Hi all,

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

  MAINTAINERS

between commits:

  785eb0bca34b ("dt-bindings: i2c: i2c-wmt: Convert to YAML")
  2b18eda58c86 ("dt-bindings: interrupt-controller: via,vt8500-intc: Convert to YAML")
  47cbd5d8693d ("ARM: vt8500: MAINTAINERS: Include vt8500 soc driver in maintainers entry")

from the i2c-host, devicetree and dt-krzk trees 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 a7e1980b6b15,26ef29a0c9bf..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3469,9 -3427,8 +3469,10 @@@ 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/i2c/i2c-wmt.txt
 +F:	Documentation/devicetree/bindings/hwinfo/via,vt8500-scc-id.yaml
 +F:	Documentation/devicetree/bindings/i2c/wm,wm8505-i2c.yaml
 +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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]