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

Jani Nikula
2025-01-09T10:52:43Z

On Thu, 09 Jan 2025, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Mon, 16 Dec 2024 18:38:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Mon, 25 Nov 2024 12:09:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > 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
>>
>> 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.
>
> Ping?

Thanks for the ping. See [1].

BR,
Jani.

[1] https://lore.kernel.org/r/20250109105032.2585416-1-jani.nikula@intel.com

--
Jani Nikula, Intel