linux-next: manual merge of the drm-xe tree with Linus' tree

PATCH Stephen Rothwell 3 participants 5 messages Nov 25, 2024 – Jan 9, 2025

Subsystems (5)

DRM drivers Linux-next tree Intel i915 Intel DRM display for xe and i915 drivers +1 more subsystems

lore

Share & tools

lore

Stephen Rothwell

author

2024-11-25 01:09 UTC #0 lore raw

Hi all,

Today's linux-next merge of the drm-xe tree got a conflict in:

include/drm/intel/xe_pciids.h

between commit:

493454445c95 ("drm/xe: switch to common PCI ID macros")

from Linus' tree and commit:

ae78ec0a52c4 ("drm/xe/ptl: Add another PTL PCI ID")

from the drm-xe tree.

I fixed it up (I deleted the file and added the following merge fix patch) 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.

From: Stephen Rothwell <[email protected]>
Date: Mon, 25 Nov 2024 12:05:38 +1100
Subject: [PATCH] fix up for "drm/xe/ptl: Add another PTL PCI ID"

interacting with "drm/xe: switch to common PCI ID macros" from Linus' tree.

---
 include/drm/intel/pciids.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

include/drm/intel/pciids.h +2 -1

index 32480b5563db..7883384acd5e 100644
@@ -829,6 +829,7 @@
 	MACRO__(0xB092, ## __VA_ARGS__), \
 	MACRO__(0xB0A0, ## __VA_ARGS__), \
 	MACRO__(0xB0A1, ## __VA_ARGS__), \
-	MACRO__(0xB0A2, ## __VA_ARGS__)
+	MACRO__(0xB0A2, ## __VA_ARGS__), \
+	MACRO__(0xB0B0, ## __VA_ARGS__)
 
 #endif /* __PCIIDS_H__ */

Signature · 5 lines

2.45.2

-- 
Cheers,
Stephen Rothwell

Patchwork

2024-11-25 01:22 UTC #1 lore raw

✗ CI.Patch_applied: failure for linux-next: manual merge of the drm-xe tree with Linus' tree

== Series Details ==

Series: linux-next: manual merge of the drm-xe tree with Linus' tree
URL : https://patchwork.freedesktop.org/series/141736/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 5b1cbd59111b drm-tip: 2024y-11m-23d-03h-11m-22s UTC integration manifest === git am output follows ===
error: patch failed: include/drm/intel/pciids.h:829
error: include/drm/intel/pciids.h: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: linux-next: manual merge of the drm-xe tree with Linus' tree Patch failed at 0001 linux-next: manual merge of the drm-xe tree with Linus' tree When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Stephen Rothwell

author

2024-12-16 07:38 UTC #2 lore raw

In reply to Stephen Rothwell

Hi all,

Quoted 47 lines · On Mon, 25 Nov 2024 12:09:21 +1100 Stephen Rothwell <[email protected]>…

Today's linux-next merge of the drm-xe tree got a conflict in:
include/drm/intel/xe_pciids.h
between commit:
493454445c95 ("drm/xe: switch to common PCI ID macros")
from Linus' tree and commit:
ae78ec0a52c4 ("drm/xe/ptl: Add another PTL PCI ID")
from the drm-xe tree.
I fixed it up (I deleted the file and added the following merge fix patch) 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.
From: Stephen Rothwell <[email protected]>
Date: Mon, 25 Nov 2024 12:05:38 +1100
Subject: [PATCH] fix up for "drm/xe/ptl: Add another PTL PCI ID"
interacting with "drm/xe: switch to common PCI ID macros" from Linus' tree.
---
 include/drm/intel/pciids.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/drm/intel/pciids.h +2 -1
index 32480b5563db..7883384acd5e 100644
@@ -829,6 +829,7 @@
 	MACRO__(0xB092, ## __VA_ARGS__), \
 	MACRO__(0xB0A0, ## __VA_ARGS__), \
 	MACRO__(0xB0A1, ## __VA_ARGS__), \
-	MACRO__(0xB0A2, ## __VA_ARGS__)
+	MACRO__(0xB0A2, ## __VA_ARGS__), \
+	MACRO__(0xB0B0, ## __VA_ARGS__)
 
 #endif /* __PCIIDS_H__ */
Signature · 1 line
2.45.2

OK, so commits ae78ec0a52c4 and 493454445c95 were merged in commit

8f109f287fdc ("Merge drm/drm-next into drm-xe-next")

but include/drm/intel/xe_pciids.h was not deleted (it is not longer referenced anywhere in the tree) and the above patch was not applied :-(

Since then that part of the drm-xe tree has been merged into the drm tree in commit

bdecb30d579e ("Merge tag 'drm-xe-next-2024-12-11' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next")

So, include/drm/intel/xe_pciids.h needs to be removed from the drm tree and the above patch applied there.

Signature · 2 lines

Cheers,
Stephen Rothwell

Stephen Rothwell

author

2025-01-09 05:41 UTC #3 lore raw

Hi all,

Quoted 57 lines · On Mon, 16 Dec 2024 18:38:01 +1100 Stephen Rothwell <[email protected]>…

Quoted 47 lines · On Mon, 25 Nov 2024 12:09:21 +1100 Stephen Rothwell <[email protected]>…
Today's linux-next merge of the drm-xe tree got a conflict in:
include/drm/intel/xe_pciids.h
between commit:
493454445c95 ("drm/xe: switch to common PCI ID macros")
from Linus' tree and commit:
ae78ec0a52c4 ("drm/xe/ptl: Add another PTL PCI ID")
from the drm-xe tree.
I fixed it up (I deleted the file and added the following merge fix patch) 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.
From: Stephen Rothwell <[email protected]>
Date: Mon, 25 Nov 2024 12:05:38 +1100
Subject: [PATCH] fix up for "drm/xe/ptl: Add another PTL PCI ID"
interacting with "drm/xe: switch to common PCI ID macros" from Linus' tree.
---
 include/drm/intel/pciids.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/drm/intel/pciids.h +2 -1
index 32480b5563db..7883384acd5e 100644
@@ -829,6 +829,7 @@
 	MACRO__(0xB092, ## __VA_ARGS__), \
 	MACRO__(0xB0A0, ## __VA_ARGS__), \
 	MACRO__(0xB0A1, ## __VA_ARGS__), \
-	MACRO__(0xB0A2, ## __VA_ARGS__)
+	MACRO__(0xB0A2, ## __VA_ARGS__), \
+	MACRO__(0xB0B0, ## __VA_ARGS__)
 
 #endif /* __PCIIDS_H__ */
Signature · 1 line
2.45.2  
OK, so commits ae78ec0a52c4 and 493454445c95 were merged in commit
8f109f287fdc ("Merge drm/drm-next into drm-xe-next")
but include/drm/intel/xe_pciids.h was not deleted (it is not longer referenced anywhere in the tree) and the above patch was not applied :-(

Quoted 7 lines

Since then that part of the drm-xe tree has been merged into the drm tree in commit
bdecb30d579e ("Merge tag 'drm-xe-next-2024-12-11' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next")
So, include/drm/intel/xe_pciids.h needs to be removed from the drm tree and the above patch applied there.

Ping?

Signature · 2 lines

Cheers,
Stephen Rothwell

Jani Nikula

2025-01-09 10:52 UTC #4 lore raw

Quoted 63 lines · Stephen Rothwell

Hi all,
Quoted 60 lines · On Mon, 16 Dec 2024 18:38:01 +1100 Stephen Rothwell <[email protected]>…
Quoted 47 lines · On Mon, 25 Nov 2024 12:09:21 +1100 Stephen Rothwell <[email protected]>…
Today's linux-next merge of the drm-xe tree got a conflict in:
include/drm/intel/xe_pciids.h
between commit:
493454445c95 ("drm/xe: switch to common PCI ID macros")
from Linus' tree and commit:
ae78ec0a52c4 ("drm/xe/ptl: Add another PTL PCI ID")
from the drm-xe tree.
I fixed it up (I deleted the file and added the following merge fix patch) 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.
From: Stephen Rothwell <[email protected]>
Date: Mon, 25 Nov 2024 12:05:38 +1100
Subject: [PATCH] fix up for "drm/xe/ptl: Add another PTL PCI ID"
interacting with "drm/xe: switch to common PCI ID macros" from Linus' tree.
---
 include/drm/intel/pciids.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/drm/intel/pciids.h +2 -1
index 32480b5563db..7883384acd5e 100644
@@ -829,6 +829,7 @@
 	MACRO__(0xB092, ## __VA_ARGS__), \
 	MACRO__(0xB0A0, ## __VA_ARGS__), \
 	MACRO__(0xB0A1, ## __VA_ARGS__), \
-	MACRO__(0xB0A2, ## __VA_ARGS__)
+	MACRO__(0xB0A2, ## __VA_ARGS__), \
+	MACRO__(0xB0B0, ## __VA_ARGS__)
 
 #endif /* __PCIIDS_H__ */
Signature · 1 line
2.45.2  
OK, so commits ae78ec0a52c4 and 493454445c95 were merged in commit
8f109f287fdc ("Merge drm/drm-next into drm-xe-next")
but include/drm/intel/xe_pciids.h was not deleted (it is not longer referenced anywhere in the tree) and the above patch was not applied :-(
Since then that part of the drm-xe tree has been merged into the drm tree in commit

Quoted 6 lines

Quoted 4 lines
bdecb30d579e ("Merge tag 'drm-xe-next-2024-12-11' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next")
So, include/drm/intel/xe_pciids.h needs to be removed from the drm tree and the above patch applied there.
Ping?

Thanks for the ping. See [1].

BR,
Jani.

[1] https://lore.kernel.org/r/[email protected]

Signature · 1 line

Jani Nikula, Intel