== Series Details == Series: series starting with [RFC,1/3] kbuild: add support for ensuring headers are self-contained (rev2) URL : https://patchwork.freedesktop.org/series/60738/ State : failure == Summary == Applying: kbuild: add support for ensuring headers are self-contained Using index info to reconstruct a base tree... M scripts/Makefile.build Falling back to patching base and 3-way merge... Auto-merging scripts/Makefile.build CONFLICT (content): Merge conflict in scripts/Makefile.build error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 kbuild: add support for ensuring headers are self-contained 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
