Series without cover letter

Submitted by Chris Wilson on Dec. 18, 2017, 9:37 p.m.


Reviewer None
Submitted Dec. 18, 2017, 9:37 p.m.
Last Updated Dec. 18, 2017, 10:25 p.m.
Revision 1


Patches download mbox


Applying: drm/i915/selftests: Fix up igt_reset_engine
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/selftests/intel_hangcheck.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/intel_hangcheck.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/intel_hangcheck.c
Patch failed at 0001 drm/i915/selftests: Fix up igt_reset_engine
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".