linux-kernel - linux-next: manual merge of the riscv-dt tree with the renesas 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20221121102318.40c58114@canb.auug.org.au>
Date:   Mon, 21 Nov 2022 10:23:18 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Conor Dooley <Conor.Dooley@...rochip.com>,
        Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:     Geert Uytterhoeven <geert+renesas@...der.be>,
        Lad Prabhakar <prabhakar.mahadev-lad.rj@...renesas.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Samuel Holland <samuel@...lland.org>
Subject: linux-next: manual merge of the riscv-dt tree with the renesas tree

Hi all,

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

  Documentation/devicetree/bindings/riscv/cpus.yaml

between commit:

  57e1b873c2f5 ("dt-bindings: riscv: Sort the CPU core list alphabetically")

from the renesas tree and commit:

  41adc2fbad8b ("dt-bindings: riscv: Add T-HEAD C906 and C910 compatibles")

from the riscv-dt 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/riscv/cpus.yaml
index 2bf91829c8de,e98a716c6f18..000000000000
--- a/Documentation/devicetree/bindings/riscv/cpus.yaml
+++ b/Documentation/devicetree/bindings/riscv/cpus.yaml
@@@ -34,12 -33,14 +34,14 @@@ properties
                - sifive,e5
                - sifive,e7
                - sifive,e71
 -              - sifive,u74-mc
 -              - sifive,u54
 -              - sifive,u74
 +              - sifive,rocket0
                - sifive,u5
 +              - sifive,u54
                - sifive,u7
 -              - canaan,k210
 +              - sifive,u74
 +              - sifive,u74-mc
+               - thead,c906
+               - thead,c910
            - const: riscv
        - items:
            - enum:

Content of type "application/pgp-signature" skipped