== Series Details == Series: kbuild: allow big modules to sub-divide Makefiles URL : https://patchwork.freedesktop.org/series/64745/ State : failure == Summary == Applying: kbuild: treat an object as multi-used when $(foo-) is set Applying: kbuild: clean up modname calculation Applying: kbuild: rename cmd_ar_builtin to cmd_ar_no_sym Applying: kbuild: support composite objects spanning across multiple Makefiles Applying: drm: i915: hierachize Makefiles Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/Makefile M drivers/gpu/drm/i915/display/Makefile M drivers/gpu/drm/i915/gem/Makefile M drivers/gpu/drm/i915/gt/Makefile Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/gt/Makefile CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/Makefile Auto-merging drivers/gpu/drm/i915/gem/Makefile CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/Makefile Auto-merging drivers/gpu/drm/i915/display/Makefile CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/Makefile Auto-merging drivers/gpu/drm/i915/Makefile CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Makefile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0005 drm: i915: hierachize Makefiles 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
