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

On Thu, 23 Jan 2025, Stephen Rothwell wrote: > Hi all, > > On Wed, 8 Jan 2025 12:16:50 +1100 Stephen Rothwell > wrote: >> >> On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell >> wrote: >> > >> > Today's linux-next merge of the drm-intel tree got a conflict in: >> > >> > drivers/gpu/drm/i91

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

Hi all, On Wed, 8 Jan 2025 12:16:50 +1100 Stephen Rothwell wrote: > > On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the drm-intel tree got a conflict in: > > > > drivers/gpu/drm/i915/display/intel_display_driver.c > > > > between commit: >

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

On Wed, Jan 08, 2025 at 12:16:50PM +1100, Stephen Rothwell wrote: > Hi All, > > On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the drm-intel tree got a conflict in: > > > > drivers/gpu/drm/i915/display/intel_display_driver.c > > > > between co

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

Hi All, On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/display/intel_display_driver.c > > between commit: > > 4fc0cee83590 ("drivers: remove get_task_comm() and print task comm > dir

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

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_display_driver.c between commit: 4fc0cee83590 ("drivers: remove get_task_comm() and print task comm directly") from the mm-nonmm-unstable branch of the mm tree and commit: f5d38d