|WARNING| pw136513-136515 [PATCH] [3/3] net/bnxt: add IPv6 flow label based RSS support

|WARNING| pw136513-136515 [PATCH] [3/3] net/bnxt: add IPv6 flow label based RSS support

[dpdklab]

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

_apply patch failure_

Submitter: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Thursday, February 08 2024 05:43:11 
Applied on: CommitID:67d787e43c304dba6be55f0ce93df006d0997e48
Apply patch set 136513-136515 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 (a4ce111cc89f580b8c4aad51bdb061acbdfde86b)
Done: main commit a4ce111cc89f580b8c4aad51bdb061acbdfde86b
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (67d787e43c304dba6be55f0ce93df006d0997e48)
Applying patch...

Failed to apply patch:
Applying: ethdev: add support for RSS based on IPv6 flow label
Applying: app/testpmd: add IPv6 flow label to RSS types
Applying: net/bnxt: add IPv6 flow label based RSS support
Using index info to reconstruct a base tree...
M	drivers/net/bnxt/bnxt.h
M	drivers/net/bnxt/bnxt_ethdev.c
M	drivers/net/bnxt/bnxt_hwrm.c
M	drivers/net/bnxt/bnxt_vnic.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/bnxt/bnxt_vnic.c
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_vnic.c
Auto-merging drivers/net/bnxt/bnxt_hwrm.c
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_hwrm.c
Auto-merging drivers/net/bnxt/bnxt_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_ethdev.c
Auto-merging drivers/net/bnxt/bnxt.h
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0003 net/bnxt: add IPv6 flow label based RSS support
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 (67d787e43c304dba6be55f0ce93df006d0997e48)
Applying patch...

Failed to apply patch:
Applying: ethdev: add support for RSS based on IPv6 flow label
Applying: app/testpmd: add IPv6 flow label to RSS types
Applying: net/bnxt: add IPv6 flow label based RSS support
Using index info to reconstruct a base tree...
M	drivers/net/bnxt/bnxt.h
M	drivers/net/bnxt/bnxt_ethdev.c
M	drivers/net/bnxt/bnxt_hwrm.c
M	drivers/net/bnxt/bnxt_vnic.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/bnxt/bnxt_vnic.c
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_vnic.c
Auto-merging drivers/net/bnxt/bnxt_hwrm.c
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_hwrm.c
Auto-merging drivers/net/bnxt/bnxt_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_ethdev.c
Auto-merging drivers/net/bnxt/bnxt.h
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0003 net/bnxt: add IPv6 flow label based RSS support
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/29090/

UNH-IOL DPDK Community Lab