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

Stephen Rothwell
2024-11-25T01:09:26Z

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

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 <sfr@canb.auug.org.au>
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(-)

diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h
index 32480b5563db..7883384acd5e 100644
--- a/include/drm/intel/pciids.h
+++ b/include/drm/intel/pciids.h
@@ -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__ */
--
2.45.2