== Series Details == Series: series starting with [1/2] drm/i915/gvt: Make intel_gvt_match_device() static URL : https://patchwork.freedesktop.org/series/103237/ State : failure == Summary == Error: patch https://patchwork.freedesktop.org/api/1.0/series/103237/revisions/1/mbox/ not applied Applying: drm/i915/gvt: Make intel_gvt_match_device() static Applying: drm/i915/gvt: Fix the compiling error when CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/intel_gvt.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_gvt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_gvt.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 drm/i915/gvt: Fix the compiling error when CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n 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".
