== Series Details == Series: Polish DRAM information readout code (rev4) URL : https://patchwork.freedesktop.org/series/57213/ State : failure == Summary == Applying: drm/i915: Store DIMM rank information as a number Applying: drm/i915: Extract functions to derive SKL+ DIMM info Applying: drm/i915: Polish skl_is_16gb_dimm() Applying: drm/i915: Extract BXT DIMM helpers Applying: drm/i915: Fix DRAM size reporting for BXT Applying: drm/i915: Extract DIMM info on GLK too Applying: drm/i915: Use dram_dimm_info more Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_drv.c Applying: drm/i915: Generalize intel_is_dram_symmetric() Applying: drm/i914: s/l_info/dimm_l/ etc. Applying: drm/i915: Clean up intel_get_dram_info() a bit Applying: drm/i915: Extract DIMM info on cnl+ Applying: drm/i915: Read out memory type Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.c Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0012 drm/i915: Read out memory type 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
