|WARNING| pw136227-136228 [PATCH] [2/2] vhost: add new mbuf allocation failure statistic

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Maxime Coquelin <maxime.coquelin at redhat.com>
Date: Wednesday, January 31 2024 09:31:13 
Applied on: CommitID:289ddcad152ebffa7359e414526707eb3f2c0a4a
Apply patch set 136227-136228 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 (5eedf66ac0e5ce62cd333e523996c63a3c4c2c00)
Done: main commit 5eedf66ac0e5ce62cd333e523996c63a3c4c2c00
Trying to checkout branch: origin/next-virtio-for-next-net
Checked out to next-virtio-for-next-net (289ddcad152ebffa7359e414526707eb3f2c0a4a)
Applying patch...

Failed to apply patch:
Applying: vhost: fix memory leak in Virtio Tx split path
Using index info to reconstruct a base tree...
M	lib/vhost/virtio_net.c
Falling back to patching base and 3-way merge...
Auto-merging lib/vhost/virtio_net.c
Applying: vhost: add new mbuf allocation failure statistic
Using index info to reconstruct a base tree...
M	lib/vhost/vhost.c
M	lib/vhost/vhost.h
M	lib/vhost/virtio_net.c
Falling back to patching base and 3-way merge...
Auto-merging lib/vhost/virtio_net.c
CONFLICT (content): Merge conflict in lib/vhost/virtio_net.c
Auto-merging lib/vhost/vhost.h
Auto-merging lib/vhost/vhost.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 vhost: add new mbuf allocation failure statistic
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 (289ddcad152ebffa7359e414526707eb3f2c0a4a)
Applying patch...

Failed to apply patch:
Applying: vhost: fix memory leak in Virtio Tx split path
Using index info to reconstruct a base tree...
M	lib/vhost/virtio_net.c
Falling back to patching base and 3-way merge...
Auto-merging lib/vhost/virtio_net.c
Applying: vhost: add new mbuf allocation failure statistic
Using index info to reconstruct a base tree...
M	lib/vhost/vhost.c
M	lib/vhost/vhost.h
M	lib/vhost/virtio_net.c
Falling back to patching base and 3-way merge...
Auto-merging lib/vhost/virtio_net.c
CONFLICT (content): Merge conflict in lib/vhost/virtio_net.c
Auto-merging lib/vhost/vhost.h
Auto-merging lib/vhost/vhost.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 vhost: add new mbuf allocation failure statistic
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/28998/

UNH-IOL DPDK Community Lab