automatic DPDK test reports
 help / color / mirror / Atom feed
From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw137047-137056 [PATCH] [v2, 10/10] doc: update release notes for bnxt
Date: Mon, 26 Feb 2024 09:09:12 -0800 (PST)	[thread overview]
Message-ID: <65dcc5b8.170a0220.c7425.2866SMTPIN_ADDED_MISSING@mx.google.com> (raw)

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

             reply	other threads:[~2024-02-26 17:09 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-26 17:09 dpdklab [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-24  3:36 dpdklab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=65dcc5b8.170a0220.c7425.2866SMTPIN_ADDED_MISSING@mx.google.com \
    --to=dpdklab@iol.unh.edu \
    --cc=dpdk-test-reports@iol.unh.edu \
    --cc=test-report@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).