== Series Details == Series: linux-next: build failure after merge of the drm-intel tree (rev3) URL : https://patchwork.freedesktop.org/series/42839/ State : failure == Summary == Applying: linux-next: build failure after merge of the drm-intel tree Using index info to reconstruct a base tree... M include/linux/lockdep.h Falling back to patching base and 3-way merge... Auto-merging include/linux/lockdep.h CONFLICT (content): Merge conflict in include/linux/lockdep.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 linux-next: build failure after merge of the drm-intel tree 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
