|WARNING| pw152688-152697 [PATCH] [10/10] raw/ifpga: use common base code build handling

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Bruce Richardson <bruce.richardson at 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