Hi all,

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

  Documentation/devicetree/bindings/arm/cpus.yaml

between commit:

  96e71f817b02c ("dt-bindings: arm: cpus: Extend Qualcomm Oryon compatibles")

from the arm-soc tree and commits:

  0220405d7e099 ("dt-bindings: arm: cpus: Deprecate Qualcomm generic compatibles")
  d08082a872f08 ("dt-bindings: arm: cpus: Add Apple M3 CPU core compatibles")

from the audit 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.

diff --cc Documentation/devicetree/bindings/arm/cpus.yaml
index 07f3c6a525541,6f189ea3fdfa9..0000000000000
--- a/Documentation/devicetree/bindings/arm/cpus.yaml
+++ b/Documentation/devicetree/bindings/arm/cpus.yaml
@@@ -79,156 -79,155 +79,161 @@@ properties
        All other bits in the reg cells must be set to 0.
  
    compatible:
-     enum:
-       - apm,potenza
-       - apm,strega
-       - apple,avalanche
-       - apple,blizzard
-       - apple,cyclone
-       - apple,firestorm
-       - apple,hurricane-zephyr
-       - apple,icestorm
-       - apple,mistral
-       - apple,monsoon
-       - apple,twister
-       - apple,typhoon
-       - arm,arm710t
-       - arm,arm720t
-       - arm,arm740t
-       - arm,arm7ej-s
-       - arm,arm7tdmi
-       - arm,arm7tdmi-s
-       - arm,arm9es
-       - arm,arm9ej-s
-       - arm,arm920t
-       - arm,arm922t
-       - arm,arm925
-       - arm,arm926e-s
-       - arm,arm926ej-s
-       - arm,arm940t
-       - arm,arm946e-s
-       - arm,arm966e-s
-       - arm,arm968e-s
-       - arm,arm9tdmi
-       - arm,arm1020e
-       - arm,arm1020t
-       - arm,arm1022e
-       - arm,arm1026ej-s
-       - arm,arm1136j-s
-       - arm,arm1136jf-s
-       - arm,arm1156t2-s
-       - arm,arm1156t2f-s
-       - arm,arm1176jzf
-       - arm,arm1176jz-s
-       - arm,arm1176jzf-s
-       - arm,arm11mpcore
-       - arm,armv8 # Only for s/w models
-       - arm,c1-nano
-       - arm,c1-premium
-       - arm,c1-pro
-       - arm,c1-ultra
-       - arm,cortex-a5
-       - arm,cortex-a7
-       - arm,cortex-a8
-       - arm,cortex-a9
-       - arm,cortex-a12
-       - arm,cortex-a15
-       - arm,cortex-a17
-       - arm,cortex-a32
-       - arm,cortex-a34
-       - arm,cortex-a35
-       - arm,cortex-a53
-       - arm,cortex-a55
-       - arm,cortex-a57
-       - arm,cortex-a65
-       - arm,cortex-a72
-       - arm,cortex-a73
-       - arm,cortex-a75
-       - arm,cortex-a76
-       - arm,cortex-a77
-       - arm,cortex-a78
-       - arm,cortex-a78ae
-       - arm,cortex-a78c
-       - arm,cortex-a320
-       - arm,cortex-a510
-       - arm,cortex-a520
-       - arm,cortex-a520ae
-       - arm,cortex-a710
-       - arm,cortex-a715
-       - arm,cortex-a720
-       - arm,cortex-a720ae
-       - arm,cortex-a725
-       - arm,cortex-m0
-       - arm,cortex-m0+
-       - arm,cortex-m1
-       - arm,cortex-m3
-       - arm,cortex-m4
-       - arm,cortex-r4
-       - arm,cortex-r5
-       - arm,cortex-r7
-       - arm,cortex-r52
-       - arm,cortex-x1
-       - arm,cortex-x1c
-       - arm,cortex-x2
-       - arm,cortex-x3
-       - arm,cortex-x4
-       - arm,cortex-x925
-       - arm,neoverse-e1
-       - arm,neoverse-n1
-       - arm,neoverse-n2
-       - arm,neoverse-n3
-       - arm,neoverse-v1
-       - arm,neoverse-v2
-       - arm,neoverse-v3
-       - arm,neoverse-v3ae
-       - arm,rainier
-       - brcm,brahma-b15
-       - brcm,brahma-b53
-       - brcm,vulcan
-       - cavium,thunder
-       - cavium,thunder2
-       - faraday,fa526
-       - intel,sa110
-       - intel,sa1100
-       - marvell,feroceon
-       - marvell,mohawk
-       - marvell,pj4a
-       - marvell,pj4b
-       - marvell,sheeva-v5
-       - marvell,sheeva-v7
-       - nvidia,tegra132-denver
-       - nvidia,tegra186-denver
-       - nvidia,tegra194-carmel
-       - qcom,krait
-       - qcom,kryo
-       - qcom,kryo240
-       - qcom,kryo250
-       - qcom,kryo260
-       - qcom,kryo280
-       - qcom,kryo360
-       - qcom,kryo385
-       - qcom,kryo465
-       - qcom,kryo468
-       - qcom,kryo470
-       - qcom,kryo485
-       - qcom,kryo560
-       - qcom,kryo570
-       - qcom,kryo660
-       - qcom,kryo670
-       - qcom,kryo685
-       - qcom,kryo780
-       - qcom,oryon
-       - qcom,oryon-1-1
-       - qcom,oryon-1-2
-       - qcom,oryon-1-3
-       - qcom,oryon-1-4
-       - qcom,oryon-2-1
-       - qcom,oryon-2-2
-       - qcom,oryon-2-3
-       - qcom,scorpion
-       - samsung,mongoose-m2
-       - samsung,mongoose-m3
-       - samsung,mongoose-m5
+     oneOf:
+       - enum:
+           - apm,potenza
+           - apm,strega
+           - apple,avalanche
+           - apple,blizzard
+           - apple,cyclone
+           - apple,everest
+           - apple,firestorm
+           - apple,hurricane-zephyr
+           - apple,icestorm
+           - apple,mistral
+           - apple,monsoon
+           - apple,sawtooth
+           - apple,twister
+           - apple,typhoon
+           - arm,arm710t
+           - arm,arm720t
+           - arm,arm740t
+           - arm,arm7ej-s
+           - arm,arm7tdmi
+           - arm,arm7tdmi-s
+           - arm,arm9es
+           - arm,arm9ej-s
+           - arm,arm920t
+           - arm,arm922t
+           - arm,arm925
+           - arm,arm926e-s
+           - arm,arm926ej-s
+           - arm,arm940t
+           - arm,arm946e-s
+           - arm,arm966e-s
+           - arm,arm968e-s
+           - arm,arm9tdmi
+           - arm,arm1020e
+           - arm,arm1020t
+           - arm,arm1022e
+           - arm,arm1026ej-s
+           - arm,arm1136j-s
+           - arm,arm1136jf-s
+           - arm,arm1156t2-s
+           - arm,arm1156t2f-s
+           - arm,arm1176jzf
+           - arm,arm1176jz-s
+           - arm,arm1176jzf-s
+           - arm,arm11mpcore
+           - arm,armv8 # Only for s/w models
+           - arm,c1-nano
+           - arm,c1-premium
+           - arm,c1-pro
+           - arm,c1-ultra
+           - arm,cortex-a5
+           - arm,cortex-a7
+           - arm,cortex-a8
+           - arm,cortex-a9
+           - arm,cortex-a12
+           - arm,cortex-a15
+           - arm,cortex-a17
+           - arm,cortex-a32
+           - arm,cortex-a34
+           - arm,cortex-a35
+           - arm,cortex-a53
+           - arm,cortex-a55
+           - arm,cortex-a57
+           - arm,cortex-a65
+           - arm,cortex-a72
+           - arm,cortex-a73
+           - arm,cortex-a75
+           - arm,cortex-a76
+           - arm,cortex-a77
+           - arm,cortex-a78
+           - arm,cortex-a78ae
+           - arm,cortex-a78c
+           - arm,cortex-a320
+           - arm,cortex-a510
+           - arm,cortex-a520
+           - arm,cortex-a520ae
+           - arm,cortex-a710
+           - arm,cortex-a715
+           - arm,cortex-a720
+           - arm,cortex-a720ae
+           - arm,cortex-a725
+           - arm,cortex-m0
+           - arm,cortex-m0+
+           - arm,cortex-m1
+           - arm,cortex-m3
+           - arm,cortex-m4
+           - arm,cortex-r4
+           - arm,cortex-r5
+           - arm,cortex-r7
+           - arm,cortex-r52
+           - arm,cortex-x1
+           - arm,cortex-x1c
+           - arm,cortex-x2
+           - arm,cortex-x3
+           - arm,cortex-x4
+           - arm,cortex-x925
+           - arm,neoverse-e1
+           - arm,neoverse-n1
+           - arm,neoverse-n2
+           - arm,neoverse-n3
+           - arm,neoverse-v1
+           - arm,neoverse-v2
+           - arm,neoverse-v3
+           - arm,neoverse-v3ae
+           - arm,rainier
+           - brcm,brahma-b15
+           - brcm,brahma-b53
+           - brcm,vulcan
+           - cavium,thunder
+           - cavium,thunder2
+           - faraday,fa526
+           - intel,sa110
+           - intel,sa1100
+           - marvell,feroceon
+           - marvell,mohawk
+           - marvell,pj4a
+           - marvell,pj4b
+           - marvell,sheeva-v5
+           - marvell,sheeva-v7
+           - nvidia,tegra132-denver
+           - nvidia,tegra186-denver
+           - nvidia,tegra194-carmel
+           - qcom,krait
+           - qcom,kryo240
+           - qcom,kryo250
+           - qcom,kryo260
+           - qcom,kryo280
+           - qcom,kryo360
+           - qcom,kryo385
+           - qcom,kryo465
+           - qcom,kryo468
+           - qcom,kryo470
+           - qcom,kryo485
+           - qcom,kryo560
+           - qcom,kryo570
+           - qcom,kryo660
+           - qcom,kryo670
+           - qcom,kryo685
+           - qcom,kryo780
++          - qcom,oryon-1-1
++          - qcom,oryon-1-2
++          - qcom,oryon-1-3
++          - qcom,oryon-2-1
++          - qcom,oryon-2-2
++          - qcom,oryon-2-3
+           - qcom,scorpion
+           - samsung,mongoose-m2
+           - samsung,mongoose-m3
+           - samsung,mongoose-m5
+       - enum:
+           - qcom,kryo
+           - qcom,oryon
+         # Too generic, do not use in new code
+         deprecated: true
  
    enable-method:
      $ref: /schemas/types.yaml#/definitions/string

Hi Mark,

On Wed, 8 Apr 2026 at 16:15, Mark Brown <broonie@kernel.org> wrote:
> Today's linux-next merge of the audit tree got a conflict in:
>
>   Documentation/devicetree/bindings/arm/cpus.yaml
>
> between commit:
>
>   96e71f817b02c ("dt-bindings: arm: cpus: Extend Qualcomm Oryon compatibles")
>
> from the arm-soc tree and commits:
>
>   0220405d7e099 ("dt-bindings: arm: cpus: Deprecate Qualcomm generic compatibles")
>   d08082a872f08 ("dt-bindings: arm: cpus: Add Apple M3 CPU core compatibles")
>
> from the audit 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.
>
> diff --cc Documentation/devicetree/bindings/arm/cpus.yaml
> index 07f3c6a525541,6f189ea3fdfa9..0000000000000
> --- a/Documentation/devicetree/bindings/arm/cpus.yaml
> +++ b/Documentation/devicetree/bindings/arm/cpus.yaml

[...]

> -       - qcom,kryo780
> -       - qcom,oryon
> -       - qcom,oryon-1-1
> -       - qcom,oryon-1-2
> -       - qcom,oryon-1-3
> -       - qcom,oryon-1-4
> -       - qcom,oryon-2-1
> -       - qcom,oryon-2-2
> -       - qcom,oryon-2-3
> -       - qcom,scorpion
> -       - samsung,mongoose-m2

[...]

> +           - qcom,kryo780
> ++          - qcom,oryon-1-1
> ++          - qcom,oryon-1-2
> ++          - qcom,oryon-1-3

You have lost qcom,oryon-1-4.

> ++          - qcom,oryon-2-1
> ++          - qcom,oryon-2-2
> ++          - qcom,oryon-2-3
> +           - qcom,scorpion
> +           - samsung,mongoose-m2

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

On 08/04/2026 16:15, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the audit tree got a conflict in:
> 
>   Documentation/devicetree/bindings/arm/cpus.yaml
> 
> between commit:
> 
>   96e71f817b02c ("dt-bindings: arm: cpus: Extend Qualcomm Oryon compatibles")
> 
> from the arm-soc tree and commits:
> 
>   0220405d7e099 ("dt-bindings: arm: cpus: Deprecate Qualcomm generic compatibles")
>   d08082a872f08 ("dt-bindings: arm: cpus: Add Apple M3 CPU core compatibles")
> 
> from the audit tree.

I think that's not audit tree, but Rob's DT tree (+Cc).

Best regards,
Krzysztof