From: dpdklab@iol.unh.edu
To: test-report@dpdk.org
Cc: dpdk-test-reports@iol.unh.edu
Subject: |WARNING| pw155017 [PATCH] ntb/ae4dma: added Amd userspace DMA and NTB drivers
Date: Sat, 05 Jul 2025 07:31:51 -0700 (PDT) [thread overview]
Message-ID: <68693757.050a0220.2c3481.dd47SMTPIN_ADDED_MISSING@mx.google.com> (raw)
In-Reply-To: <20250705141001.34223-1-bhagyada.modali@amd.com>
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/155017
_apply patch failure_
Submitter: Bhagyada Modali <bhagyada.modali@amd.com>
Date: Saturday, July 05 2025 14:10:01
Applied on: CommitID:70c2297528e7c7789af452f78de1932e9a20c8a2
Apply patch set 155017 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 (70c2297528e7c7789af452f78de1932e9a20c8a2)
Done: main commit 70c2297528e7c7789af452f78de1932e9a20c8a2
Trying to checkout branch: origin/main
Checked out to main (70c2297528e7c7789af452f78de1932e9a20c8a2)
Applying patch...
Failed to apply patch:
Applying: ntb/ae4dma: added Amd userspace DMA and NTB drivers
.git/rebase-apply/patch:3148: trailing whitespace.
.git/rebase-apply/patch:3000: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M app/test/test_dmadev.c
M drivers/raw/ntb/ntb_hw_intel.c
M usertools/dpdk-devbind.py
Falling back to patching base and 3-way merge...
Auto-merging usertools/dpdk-devbind.py
CONFLICT (content): Merge conflict in usertools/dpdk-devbind.py
Auto-merging drivers/raw/ntb/ntb_hw_intel.c
Auto-merging app/test/test_dmadev.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ntb/ae4dma: added Amd userspace DMA and NTB drivers
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/33597/
UNH-IOL DPDK Community Lab
prev parent reply other threads:[~2025-07-05 14:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20250705141001.34223-1-bhagyada.modali@amd.com>
2025-07-05 13:40 ` qemudev
2025-07-05 14:10 ` checkpatch
2025-07-05 14:31 ` 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=68693757.050a0220.2c3481.dd47SMTPIN_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).