* |WARNING| pw137047-137056 [PATCH] [v2, 10/10] doc: update release notes for bnxt
@ 2024-02-26 17:09 dpdklab
0 siblings, 0 replies; 2+ messages in thread
From: dpdklab @ 2024-02-26 17:09 UTC (permalink / raw)
To: test-report; +Cc: dpdk-test-reports
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/137047
_apply patch failure_
Submitter: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Thursday, February 22 2024 19:48:00
Applied on: CommitID:b35f958f6857604480400786840f2537dfdfc323
Apply patch set 137047-137056 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 (92c0ad70caf3ed6f4b93de6ddaf7bc369737c049)
Done: main commit 92c0ad70caf3ed6f4b93de6ddaf7bc369737c049
Trying to checkout branch: origin/next-net-brcm-for-next-net
Checked out to next-net-brcm-for-next-net (b35f958f6857604480400786840f2537dfdfc323)
Applying patch...
Failed to apply patch:
Applying: net/bnxt: extend long bd check for VXLAN GPE
Using index info to reconstruct a base tree...
M drivers/net/bnxt/bnxt_txr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/bnxt/bnxt_txr.c
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_txr.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/bnxt: extend long bd check for VXLAN GPE
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 (b35f958f6857604480400786840f2537dfdfc323)
Applying patch...
Failed to apply patch:
Applying: net/bnxt: extend long bd check for VXLAN GPE
Using index info to reconstruct a base tree...
M drivers/net/bnxt/bnxt_txr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/bnxt/bnxt_txr.c
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_txr.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/bnxt: extend long bd check for VXLAN GPE
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/29230/
UNH-IOL DPDK Community Lab
^ permalink raw reply [flat|nested] 2+ messages in thread
* |WARNING| pw137047-137056 [PATCH] [v2, 10/10] doc: update release notes for bnxt
@ 2024-02-24 3:36 dpdklab
0 siblings, 0 replies; 2+ messages in thread
From: dpdklab @ 2024-02-24 3:36 UTC (permalink / raw)
To: test-report; +Cc: dpdk-test-reports
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/137047
_apply patch failure_
Submitter: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Thursday, February 22 2024 19:48:00
Applied on: CommitID:b35f958f6857604480400786840f2537dfdfc323
Apply patch set 137047-137056 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 (92c0ad70caf3ed6f4b93de6ddaf7bc369737c049)
Done: main commit 92c0ad70caf3ed6f4b93de6ddaf7bc369737c049
Trying to checkout branch: origin/next-net-brcm-for-next-net
Checked out to next-net-brcm-for-next-net (b35f958f6857604480400786840f2537dfdfc323)
Applying patch...
Failed to apply patch:
Applying: net/bnxt: extend long bd check for VXLAN GPE
Using index info to reconstruct a base tree...
M drivers/net/bnxt/bnxt_txr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/bnxt/bnxt_txr.c
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_txr.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/bnxt: extend long bd check for VXLAN GPE
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 (b35f958f6857604480400786840f2537dfdfc323)
Applying patch...
Failed to apply patch:
Applying: net/bnxt: extend long bd check for VXLAN GPE
Using index info to reconstruct a base tree...
M drivers/net/bnxt/bnxt_txr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/bnxt/bnxt_txr.c
CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_txr.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/bnxt: extend long bd check for VXLAN GPE
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/29230/
UNH-IOL DPDK Community Lab
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-02-26 17:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-26 17:09 |WARNING| pw137047-137056 [PATCH] [v2, 10/10] doc: update release notes for bnxt dpdklab
-- strict thread matches above, loose matches on Subject: below --
2024-02-24 3:36 dpdklab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).