From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw152688-152697 [PATCH] [10/10] raw/ifpga: use common base code build handling
Date: Mon, 31 Mar 2025 15:02:51 -0700 (PDT) [thread overview]
Message-ID: <67eb110b.050a0220.f9397.de79SMTPIN_ADDED_MISSING@mx.google.com> (raw)
In-Reply-To: <20250331161000.9886-12-bruce.richardson@intel.com>
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/152697
_apply patch failure_
Submitter: Bruce Richardson <bruce.richardson@intel.com>
Date: Monday, March 31 2025 16:10:00
Applied on: CommitID:edd3f4b1265e6da707c46ca9b6c39d332647baea
Apply patch set 152688-152697 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 (edd3f4b1265e6da707c46ca9b6c39d332647baea)
Done: main commit edd3f4b1265e6da707c46ca9b6c39d332647baea
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (f3cb237103aada7bc83fd3f40929fb6fb3e58c3b)
Applying patch...
Failed to apply patch:
Applying: build: add generic support for base code in drivers
Applying: common/sfc_efx: use common base code build handling
Applying: net/hinic: use common base code build handling
Applying: net/intel: use common base code build handling
Using index info to reconstruct a base tree...
M drivers/net/intel/e1000/meson.build
M drivers/net/intel/fm10k/meson.build
M drivers/net/intel/i40e/meson.build
M drivers/net/intel/ice/base/meson.build
M drivers/net/intel/idpf/meson.build
M drivers/net/intel/ixgbe/meson.build
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/ixgbe/meson.build
CONFLICT (content): Merge conflict in drivers/net/intel/ixgbe/meson.build
Auto-merging drivers/net/intel/idpf/meson.build
CONFLICT (content): Merge conflict in drivers/net/intel/idpf/meson.build
Auto-merging drivers/net/intel/ice/base/meson.build
Auto-merging drivers/net/intel/i40e/meson.build
CONFLICT (content): Merge conflict in drivers/net/intel/i40e/meson.build
Auto-merging drivers/net/intel/fm10k/meson.build
CONFLICT (content): Merge conflict in drivers/net/intel/fm10k/meson.build
Auto-merging drivers/net/intel/e1000/meson.build
CONFLICT (content): Merge conflict in drivers/net/intel/e1000/meson.build
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 net/intel: use common base code build handling
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 (edd3f4b1265e6da707c46ca9b6c39d332647baea)
Applying patch...
Failed to apply patch:
Applying: build: add generic support for base code in drivers
Applying: common/sfc_efx: use common base code build handling
Applying: net/hinic: use common base code build handling
Applying: net/intel: use common base code build handling
Using index info to reconstruct a base tree...
M drivers/net/intel/e1000/meson.build
M drivers/net/intel/fm10k/meson.build
M drivers/net/intel/i40e/meson.build
M drivers/net/intel/ice/base/meson.build
M drivers/net/intel/idpf/meson.build
M drivers/net/intel/ixgbe/meson.build
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/intel/ixgbe/meson.build
CONFLICT (content): Merge conflict in drivers/net/intel/ixgbe/meson.build
Auto-merging drivers/net/intel/idpf/meson.build
CONFLICT (content): Merge conflict in drivers/net/intel/idpf/meson.build
Auto-merging drivers/net/intel/ice/base/meson.build
Auto-merging drivers/net/intel/i40e/meson.build
CONFLICT (content): Merge conflict in drivers/net/intel/i40e/meson.build
Auto-merging drivers/net/intel/fm10k/meson.build
CONFLICT (content): Merge conflict in drivers/net/intel/fm10k/meson.build
Auto-merging drivers/net/intel/e1000/meson.build
CONFLICT (content): Merge conflict in drivers/net/intel/e1000/meson.build
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 net/intel: use common base code build handling
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/32915/
UNH-IOL DPDK Community Lab
prev parent reply other threads:[~2025-03-31 22:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20250331161000.9886-12-bruce.richardson@intel.com>
2025-03-31 16:12 ` |SUCCESS| pw152697 [PATCH 10/10] " checkpatch
2025-03-31 22:02 ` dpdklab [this message]
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=67eb110b.050a0220.f9397.de79SMTPIN_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).