Re: [PATCH] drm/i915: Delete stray .rej file

On Mon, 25 Mar 2024, Lucas De Marchi wrote: > drivers/gpu/drm/i915/gt/intel_workarounds.c.rej was incorrectly added to > the tree after solving a conflict. Remove it. > > Fixes: 326e30e4624c ("drm/i915: Drop dead code for pvc") > Reported-by: Stephen Rothwell > Closes: https://lore.kernel.org/r/2

[PATCH] drm/i915: Delete stray .rej file

drivers/gpu/drm/i915/gt/intel_workarounds.c.rej was incorrectly added to the tree after solving a conflict. Remove it. Fixes: 326e30e4624c ("drm/i915: Drop dead code for pvc") Reported-by: Stephen Rothwell Closes: https://lore.kernel.org/r/20240325083435.4f970...@canb.auug.org.au Cc: Jani Nikula