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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250509180535.01c4c249@canb.auug.org.au>
Date: Fri, 9 May 2025 18:05:35 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Uwe Kleine-König <ukleinek@...nel.org>, Rob Herring
 <robh@...nel.org>, Andi Shyti <andi.shyti@...nel.org>, Krzysztof Kozlowski
 <krzk@...nel.org>
Cc: Alexey Charkov <alchark@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the pwm tree with the i2c-host,
 devicetree trees

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@...il.com
  M:	Krzysztof Kozlowski <krzk@...nel.org>
  L:	linux-arm-kernel@...ts.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

Content of type "application/pgp-signature" skipped