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

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1140 bytes --]

Hi all,

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.

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 include/linux/mod_devicetable.h
index 318c4b5c3451b,4fe1cd64292f1..0000000000000
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@@ -15,8 -15,6 +15,7 @@@
  #include "device-id/acpi.h"
  #include "device-id/amba.h"
  #include "device-id/ap.h"
- #include "device-id/apr.h"
 +#include "device-id/arm_smccc.h"
  #include "device-id/auxiliary.h"
  #include "device-id/bcma.h"
  #include "device-id/ccw.h"

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]