|WARNING| pw152371-152372 [PATCH] [v5, 2/2] dts: add VF configuration and workflow

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Patrick Robb <probb at iol.unh.edu>
Date: Thursday, March 13 2025 03:36:11 
Applied on: CommitID:391ecf83a80b92343b04a7afe622757dde766a8d
Apply patch set 152371-152372 failed:

Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3)
Trying to checkout branch: origin/main
Checked out to main (391ecf83a80b92343b04a7afe622757dde766a8d)
Done: main commit 391ecf83a80b92343b04a7afe622757dde766a8d
Trying to checkout branch: origin/main
Checked out to main (391ecf83a80b92343b04a7afe622757dde766a8d)
Applying patch...

Failed to apply patch:
Applying: dts: add OS abstractions for creating virtual functions
Using index info to reconstruct a base tree...
M	dts/framework/testbed_model/linux_session.py
M	dts/framework/testbed_model/os_session.py
Falling back to patching base and 3-way merge...
Auto-merging dts/framework/testbed_model/os_session.py
Auto-merging dts/framework/testbed_model/linux_session.py
CONFLICT (content): Merge conflict in dts/framework/testbed_model/linux_session.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 dts: add OS abstractions for creating virtual functions
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/32817/

UNH-IOL DPDK Community Lab