On Mon, 27 Jan 2020, Patchwork <patchwork@xxxxxxxxxxxxxxxxxxxxxx> wrote: > == Series Details == > > Series: drm: Introduce struct drm_device based WARN* and use them in i915 (rev4) > URL : https://patchwork.freedesktop.org/series/72035/ > State : failure I think the repeated attempts with the patches prove that it's really hard to get patches with such wide impact merged. The driver moves so fast that things like this probably need to be split up more. For example per file. It will result in a lot of patches, but at least we could merge the patches that don't conflict, and keep moving forward. It's also maybe a bad timing, lots of changes like this going on atm. BR, Jani. > > == Summary == > > Applying: drm/i915/display: Make WARN* drm specific where drm_device ptr is available > Using index info to reconstruct a base tree... > M drivers/gpu/drm/i915/display/intel_display.c > M drivers/gpu/drm/i915/display/intel_dp.c > M drivers/gpu/drm/i915/display/intel_dpll_mgr.c > M drivers/gpu/drm/i915/display/intel_hdmi.c > M drivers/gpu/drm/i915/display/intel_hotplug.c > M drivers/gpu/drm/i915/display/intel_lvds.c > M drivers/gpu/drm/i915/display/intel_pipe_crc.c > M drivers/gpu/drm/i915/display/intel_sdvo.c > Falling back to patching base and 3-way merge... > Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c > Auto-merging drivers/gpu/drm/i915/display/intel_pipe_crc.c > Auto-merging drivers/gpu/drm/i915/display/intel_lvds.c > Auto-merging drivers/gpu/drm/i915/display/intel_hotplug.c > Auto-merging drivers/gpu/drm/i915/display/intel_hdmi.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdmi.c > Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c > Auto-merging drivers/gpu/drm/i915/display/intel_dp.c > Auto-merging drivers/gpu/drm/i915/display/intel_display.c > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c > error: Failed to merge in the changes. > hint: Use 'git am --show-current-patch' to see the failed patch > Patch failed at 0001 drm/i915/display: Make WARN* drm specific where drm_device ptr is available > 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 -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
