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

2025-03-11 Thread Stephen Rothwell
Hi Alistair, On Tue, 11 Mar 2025 16:57:49 +1100 Alistair Popple wrote: > > I'm not sure what the process is here, but having either reviewed or authored > these patches I can add that the fix up carried below looks correct. Thanks. This means that people can have a bit more confidence in the re

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

2025-03-10 Thread Alistair Popple
On Tue, Mar 11, 2025 at 01:12:14PM +1100, Stephen Rothwell wrote: > Hi all, > > On Fri, 7 Mar 2025 12:29:54 +1100 Stephen Rothwell > wrote: > > > > Hi all, > > > > Today's linux-next merge of the drm-xe tree got a conflict in: > > > > mm/memory.c > > > > between commit: > > > > 089b22f60

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

2025-03-10 Thread Stephen Rothwell
Hi all, On Fri, 7 Mar 2025 12:29:54 +1100 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the drm-xe tree got a conflict in: > > mm/memory.c > > between commit: > > 089b22f60a0f ("mm: allow compound zone device pages") > > from the mm-unstable branch of the mm tree a