Applying: drm/i915/gem: Drop lru bumping on display unpinning
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_display.c
M drivers/gpu/drm/i915/display/intel_overlay.c
M drivers/gpu/drm/i915/gem/i915_gem_domain.c
M drivers/gpu/drm/i915/gem/i915_gem_object.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.h
Auto-merging drivers/gpu/drm/i915/gem/i915_gem_domain.c
Auto-merging drivers/gpu/drm/i915/display/intel_overlay.c
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
No changes -- Patch already applied.