|WARNING| pw155017 [PATCH] ntb/ae4dma: added Amd userspace DMA and NTB drivers

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Bhagyada Modali <bhagyada.modali at 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