[Intel-gfx] ✗ Fi.CI.BUILD: failure for mdev based hardware virtio offloading support
Patchwork
patchwork at emeril.freedesktop.org
Mon Nov 18 06:58:41 UTC 2019
== Series Details ==
Series: mdev based hardware virtio offloading support
URL : https://patchwork.freedesktop.org/series/69596/
State : failure
== Summary ==
Applying: mdev: make mdev bus agnostic
Using index info to reconstruct a base tree...
M MAINTAINERS
M drivers/gpu/drm/i915/gvt/kvmgt.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/kvmgt.c
Auto-merging MAINTAINERS
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 mdev: make mdev bus agnostic
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".
More information about the Intel-gfx
mailing list