drm/i915: Delete stray .rej file
authorLucas De Marchi <lucas.demarchi@intel.com>
Mon, 25 Mar 2024 14:47:28 +0000 (07:47 -0700)
committerLucas De Marchi <lucas.demarchi@intel.com>
Tue, 26 Mar 2024 13:43:28 +0000 (06:43 -0700)
commite580fc47b50c528b9a1210b0b6ef540d79c2cfa8
treee211378942e25d370fe584ad2c8b51858975ea1a
parent92714006eb4d10ddfaa0eca41c81e6b483e02f93
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 <sfr@canb.auug.org.au>
Closes: https://lore.kernel.org/r/20240325083435.4f970eec@canb.auug.org.au
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240325144728.537855-1-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/i915/gt/intel_workarounds.c.rej [deleted file]