Quoting Patchwork (2021-01-11 14:52:15) > == Series Details == > > Series: drm/i915/selftests: Fix some error codes (rev2) > URL : https://patchwork.freedesktop.org/series/85704/ > State : failure > > == Summary == > > Applying: drm/i915: selftest_lrc: Fix error code in live_preempt_user() > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/gt/selftest_lrc.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/i915/gt/selftest_lrc.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_lrc.c Don't worry; I've applied the patch manually and pushed. Thanks, -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
