== Series Details == Series: x86: Mark up large pm4/5 constants with UL (rev2) URL : https://patchwork.freedesktop.org/series/42387/ State : failure == Summary == Applying: x86: Mark up large pm4/5 constants with UL error: Failed to merge in the changes. Using index info to reconstruct a base tree... M arch/x86/include/asm/pgtable_64_types.h Falling back to patching base and 3-way merge... Auto-merging arch/x86/include/asm/pgtable_64_types.h CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable_64_types.h Patch failed at 0001 x86: Mark up large pm4/5 constants with UL The copy of the patch that failed is found in: .git/rebase-apply/patch 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
