Re: linux-next: manual merge of the qcom tree with the arm64 tree

[Catalin Marinas]

On Fri, Sep 25, 2026 at 12:53:48PM +0100, Mark Brown wrote:
> Today's linux-next merge of the qcom tree got a conflict in:
> 
>   include/linux/mod_devicetable.h
> 
> between commit:
> 
>   fe7f2a8054433 ("firmware: smccc: Add an Arm SMCCC bus")
> 
> from the arm64 tree and commit:
> 
>   fe7f2a8054433 ("firmware: smccc: Add an Arm SMCCC bus")
> 
> from the qcom tree.

Why does the qcom tree carry these patches? I have a stable branch if
they need them.

-- 
Catalin