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

[Mark Brown]

On Tue, Sep 29, 2026 at 02:38:31PM +0100, Catalin Marinas wrote:
> 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.

I wouldn't trust my report of what the conflicting commit is there -
I've obviously messed up the paste and done the arm64 twice.  I think
the actual conflict was with 06cb5c457dd57 ("soc: qcom: apr: Drop unused
apr_device_id") which seems fairly obviously sensible for the tree.

Attachment: signature.asc
Description: PGP signature