|WARNING| pw169236-169254 [PATCH] [v2, 19/19] net/i40e: advertise flow keep capability

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
https://dpdk.org/patch/169254

_apply patch failure_

Submitter: Anatoly Burakov <anatoly.burakov at intel.com>
Date: Tuesday, September 08 2026 15:21:01 
Applied on: CommitID:d55ccd4e6de64e3f797f60de9e81f1d60f849775
Apply patch set 169236-169254 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 (d55ccd4e6de64e3f797f60de9e81f1d60f849775)
Done: main commit d55ccd4e6de64e3f797f60de9e81f1d60f849775
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (d8c1188a61e9c4734aec9a030d89329564723008)
Applying patch...

Failed to apply patch:
Applying: ethdev: add flow graph API
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_11.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_11.rst
Applying: net/intel/common: add flow engines infrastructure
Applying: net/intel/common: add utility functions
Applying: net/ixgbe: add support for common flow parsing
Using index info to reconstruct a base tree...
M	drivers/net/intel/ixgbe/ixgbe_ethdev.c
M	drivers/net/intel/ixgbe/ixgbe_ethdev.h
M	drivers/net/intel/ixgbe/ixgbe_flow.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/ixgbe/ixgbe_flow.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_ethdev.h
Auto-merging drivers/net/intel/ixgbe/ixgbe_ethdev.c
Applying: net/ixgbe: reimplement ethertype parser
Using index info to reconstruct a base tree...
M	drivers/net/intel/ixgbe/ixgbe_ethdev.c
M	drivers/net/intel/ixgbe/ixgbe_ethdev.h
M	drivers/net/intel/ixgbe/ixgbe_flow.c
M	drivers/net/intel/ixgbe/meson.build
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/ixgbe/meson.build
Auto-merging drivers/net/intel/ixgbe/ixgbe_flow.c
CONFLICT (content): Merge conflict in drivers/net/intel/ixgbe/ixgbe_flow.c
Auto-merging drivers/net/intel/ixgbe/ixgbe_ethdev.h
Auto-merging drivers/net/intel/ixgbe/ixgbe_ethdev.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 net/ixgbe: reimplement ethertype parser
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 (d55ccd4e6de64e3f797f60de9e81f1d60f849775)
Applying patch...

Failed to apply patch:
Applying: ethdev: add flow graph API
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_26_11.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_26_11.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_26_11.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ethdev: add flow graph API
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/36948/

UNH-IOL DPDK Community Lab