[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,v2,3/3] lib: Use drm_get_param where it is applicable (rev4)

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,v2,3/3] lib: Use drm_get_param where it is applicable (rev4)
URL   : https://patchwork.freedesktop.org/series/52951/
State : failure

== Summary ==

Applying: lib: Use drm_get_param where it is applicable
Applying: tests: Use drm_get_param where applicable
Applying: lib: Use drm_get_param where it is applicable
Using index info to reconstruct a base tree...
M	lib/drmtest.c
M	lib/i915/gem_scheduler.c
M	lib/i915/gem_submission.c
M	lib/igt_gt.c
M	lib/intel_chipset.c
M	lib/ioctl_wrappers.c
Falling back to patching base and 3-way merge...
Auto-merging lib/i915/gem_submission.c
CONFLICT (content): Merge conflict in lib/i915/gem_submission.c
Auto-merging lib/i915/gem_scheduler.c
CONFLICT (content): Merge conflict in lib/i915/gem_scheduler.c
Patch failed at 0003 lib: Use drm_get_param where it is applicable
Use 'git am --show-current-patch' to see the failed 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".