|WARNING| pw155009 [PATCH] net/bonding: avoid RSS reta update in flow-isolation mode

[dpdklab@iol.unh.edu]

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

_apply patch failure_

Submitter: Madhuker Mythri <madhuker.mythri@oracle.com>
Date: Friday, July 04 2025 13:22:07 
Applied on: CommitID:0c1a5ff96bfca1ac513b64f081a20f4992c6fcc0
Apply patch set 155009 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 (0c1a5ff96bfca1ac513b64f081a20f4992c6fcc0)
Done: main commit 0c1a5ff96bfca1ac513b64f081a20f4992c6fcc0
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (ba982f9a1ca9b96ed0394b764f1523d482e963a2)
Applying patch...

Failed to apply patch:
Applying: net/bonding: avoid RSS reta update in flow-isolation mode
.git/rebase-apply/patch:15: trailing whitespace.
	/* 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	drivers/net/bonding/rte_eth_bond_pmd.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/bonding/rte_eth_bond_pmd.c
CONFLICT (content): Merge conflict in drivers/net/bonding/rte_eth_bond_pmd.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net/bonding: avoid RSS reta update in flow-isolation mode
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: origin/main
Checked out to main (0c1a5ff96bfca1ac513b64f081a20f4992c6fcc0)
Applying patch...

Failed to apply patch:
Applying: net/bonding: avoid RSS reta update in flow-isolation mode
.git/rebase-apply/patch:15: trailing whitespace.
	/* 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	drivers/net/bonding/rte_eth_bond_pmd.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/bonding/rte_eth_bond_pmd.c
CONFLICT (content): Merge conflict in drivers/net/bonding/rte_eth_bond_pmd.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 net/bonding: avoid RSS reta update in flow-isolation mode
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/33592/

UNH-IOL DPDK Community Lab