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

From: Krzysztof Kozlowski <[email-masked]>
Date: Wed, 8 Apr 2026 16:36:24 +0200

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