|WARNING| pw136200 [PATCH] net/ark: add PCIe ids for Atomic Rules TK242 devices

[dpdklab at iol.unh.edu]

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

_apply patch failure_

Submitter: Ed Czeck <ed.czeck at atomicrules.com>
Date: Monday, January 29 2024 15:48:27 
Applied on: CommitID:906d2c06b3cfc61620453c6909266fe771f8ccfb
Apply patch set 136200 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 (2ecc673e5e9a19850ba76d6a976596890f2dade1)
Done: main commit 2ecc673e5e9a19850ba76d6a976596890f2dade1
Trying to checkout branch: origin/next-net-for-main
Checked out to next-net-for-main (906d2c06b3cfc61620453c6909266fe771f8ccfb)
Applying patch...

Failed to apply patch:
Applying: net/ark: add PCIe ids for Atomic Rules TK242 devices
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/ark: add PCIe ids for Atomic Rules TK242 devices
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 (906d2c06b3cfc61620453c6909266fe771f8ccfb)
Applying patch...

Failed to apply patch:
Applying: net/ark: add PCIe ids for Atomic Rules TK242 devices
Using index info to reconstruct a base tree...
M	doc/guides/rel_notes/release_24_03.rst
Falling back to patching base and 3-way merge...
Auto-merging doc/guides/rel_notes/release_24_03.rst
CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 net/ark: add PCIe ids for Atomic Rules TK242 devices
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/28979/

UNH-IOL DPDK Community Lab