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

On Thu, 09 Jan 2025, Stephen Rothwell wrote: > Hi all, > > On Mon, 16 Dec 2024 18:38:01 +1100 Stephen Rothwell > wrote: >> >> On Mon, 25 Nov 2024 12:09:21 +1100 Stephen Rothwell >> wrote: >> > >> > Today's linux-next merge of the drm-xe tree got a conflict in: >> > >> > include/drm/intel/xe

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

Hi all, On Mon, 16 Dec 2024 18:38:01 +1100 Stephen Rothwell wrote: > > On Mon, 25 Nov 2024 12:09:21 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the drm-xe tree got a conflict in: > > > > include/drm/intel/xe_pciids.h > > > > between commit: > > > > 493454445c95 (

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

Hi all, On Mon, 25 Nov 2024 12:09:21 +1100 Stephen Rothwell 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: > >