Re: linux-next: manual merge of the audit tree with the arm-soc tree

[Geert Uytterhoeven]

Hi Mark,

On Wed, 8 Apr 2026 at 16:15, Mark Brown <broonie@xxxxxxxxxx> 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@xxxxxxxxxxxxxx

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