|WARNING| pw137984 [PATCH] vhost: fix vring addr update with vDPA

[dpdklab@iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/137984

_apply patch failure_

Submitter: David Marchand <david.marchand@redhat.com>
Date: Tuesday, March 05 2024 09:13:25 
Applied on: CommitID:92c0ad70caf3ed6f4b93de6ddaf7bc369737c049
Apply patch set 137984 failed:

Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: main
Checked out to main (deedfb86a7a6e10064d3cccd593f62072de96e36)
Done: main commit deedfb86a7a6e10064d3cccd593f62072de96e36
Trying to checkout branch: origin/next-virtio-for-next-net
Checked out to next-virtio-for-next-net (92c0ad70caf3ed6f4b93de6ddaf7bc369737c049)
Applying patch...

Failed to apply patch:
Applying: vhost: fix vring addr update with vDPA
Using index info to reconstruct a base tree...
M	lib/vhost/vhost_user.c
Falling back to patching base and 3-way merge...
Auto-merging lib/vhost/vhost_user.c
CONFLICT (content): Merge conflict in lib/vhost/vhost_user.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 vhost: fix vring addr update with vDPA
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".


Trying to checkout branch: main
Checked out to main (92c0ad70caf3ed6f4b93de6ddaf7bc369737c049)
Applying patch...

Failed to apply patch:
Applying: vhost: fix vring addr update with vDPA
Using index info to reconstruct a base tree...
M	lib/vhost/vhost_user.c
Falling back to patching base and 3-way merge...
Auto-merging lib/vhost/vhost_user.c
CONFLICT (content): Merge conflict in lib/vhost/vhost_user.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 vhost: fix vring addr update with vDPA
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".


https://lab.dpdk.org/results/dashboard/patchsets/29412/

UNH-IOL DPDK Community Lab