|WARNING| pw136978-136987 [PATCH] [10/10] doc: update release notes for bnxt

|WARNING| pw136978-136987 [PATCH] [10/10] doc: update release notes for bnxt

[dpdklab]

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

_apply patch failure_

Submitter: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Wednesday, February 21 2024 21:20:45 
Applied on: CommitID:c5af8a22cc7a073efa45fbcd8448ba1ad8f386be
Apply patch set 136978-136987 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 (92d644f1d58838561d0996b2d4a9f5d276e41651)
Done: main commit 92d644f1d58838561d0996b2d4a9f5d276e41651
Trying to checkout branch: origin/next-net-brcm-for-next-net
Checked out to next-net-brcm-for-next-net (c5af8a22cc7a073efa45fbcd8448ba1ad8f386be)
Applying patch...

Failed to apply patch:
Applying: net/bnxt: extend long bd check for VXLAN GPE
Applying: net/bnxt: add dual rate module detection log
Applying: net/bnxt: increase queue size for async handling
Applying: net/bnxt: fix AGG ID computation
Applying: net/bnxt: fix a null pointer dereference
Applying: net/bnxt: handle UDP GSO Tx
Applying: net/bnxt: add IPv6 flow label based RSS support
Applying: net/bnxt: fix compressed CQE handling
Applying: net/bnxt: fix compressed Rx CQE handling
Applying: doc: update release notes for bnxt
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0010 doc: update release notes for bnxt
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 (c5af8a22cc7a073efa45fbcd8448ba1ad8f386be)
Applying patch...

Failed to apply patch:
Applying: net/bnxt: extend long bd check for VXLAN GPE
Applying: net/bnxt: add dual rate module detection log
Applying: net/bnxt: increase queue size for async handling
Applying: net/bnxt: fix AGG ID computation
Applying: net/bnxt: fix a null pointer dereference
Applying: net/bnxt: handle UDP GSO Tx
Applying: net/bnxt: add IPv6 flow label based RSS support
Applying: net/bnxt: fix compressed CQE handling
Applying: net/bnxt: fix compressed Rx CQE handling
Applying: doc: update release notes for bnxt
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0010 doc: update release notes for bnxt
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/29215/

UNH-IOL DPDK Community Lab