linux-kernel - linux-next: manual merge of the mfd tree with Linus' tree

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: <20230306094956.414feffc@canb.auug.org.au>
Date:   Mon, 6 Mar 2023 09:49:56 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Lee Jones <lee@...nel.org>
Cc:     Cristian Ciocaltea <cristian.ciocaltea@...labora.com>,
        Emil Renner Berthing <kernel@...il.dk>,
        Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>,
        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 mfd tree with Linus' tree

Hi all,

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

  Documentation/devicetree/bindings/mfd/syscon.yaml

between commit:

  c2e322ae9f06 ("dt-bindings: soc: samsung: exynos-sysreg: split from syscon")

from Linus' tree and commit:

  30e885bbcf29 ("dt-bindings: mfd: syscon: Add StarFive JH7100 sysmain compatible")

from the mfd 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 Documentation/devicetree/bindings/mfd/syscon.yaml
index c828c4f5e4a7,ded70830d91e..000000000000
--- a/Documentation/devicetree/bindings/mfd/syscon.yaml
+++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
@@@ -67,6 -67,13 +67,7 @@@ properties
                - rockchip,rk3568-qos
                - rockchip,rk3588-qos
                - rockchip,rv1126-qos
 -              - samsung,exynos3-sysreg
 -              - samsung,exynos4-sysreg
 -              - samsung,exynos5-sysreg
 -              - samsung,exynos5433-sysreg
 -              - samsung,exynos850-sysreg
 -              - samsung,exynosautov9-sysreg
+               - starfive,jh7100-sysmain
  
            - const: syscon
  

Content of type "application/pgp-signature" skipped