|WARNING| pw156224-156228 [PATCH] [v2, 3/3] doc: update ABI versioning guide

[dpdklab@iol.unh.edu]

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

_apply patch failure_

Submitter: fengchengwen <fengchengwen@huawei.com>
Date: Friday, August 29 2025 02:34:03 
Applied on: CommitID:f41d2db45d8a23c3315929c190d098154732a1ce
Apply patch set 156224-156228 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 (f41d2db45d8a23c3315929c190d098154732a1ce)
Done: main commit f41d2db45d8a23c3315929c190d098154732a1ce
Trying to checkout branch: origin/main
Checked out to main (f41d2db45d8a23c3315929c190d098154732a1ce)
Applying patch...

Failed to apply patch:
Applying: dpdk: support quick jump to API definition
Using index info to reconstruct a base tree...
M	drivers/bus/dpaa/dpaa_bus.c
M	drivers/bus/vmbus/linux/vmbus_bus.c
M	drivers/bus/vmbus/vmbus_channel.c
M	drivers/common/mlx5/linux/mlx5_nl.c
M	drivers/common/mlx5/mlx5_devx_cmds.c
M	drivers/mempool/dpaa/dpaa_mempool.c
M	drivers/mempool/dpaa2/dpaa2_hw_mempool.c
M	drivers/net/dpaa/dpaa_ethdev.c
M	drivers/net/dpaa2/dpaa2_ethdev.c
M	drivers/net/dpaa2/dpaa2_rxtx.c
M	drivers/net/intel/iavf/iavf_rxtx.c
M	drivers/net/mlx5/mlx5_flow.c
M	drivers/net/mlx5/mlx5_rx.c
M	drivers/net/mlx5/mlx5_rxq.c
M	drivers/net/vhost/rte_eth_vhost.c
M	lib/cfgfile/rte_cfgfile.c
M	lib/cmdline/cmdline_parse_portlist.c
M	lib/eal/common/eal_common_options.c
M	lib/eal/linux/eal_memory.c
M	lib/ethdev/ethdev_driver.c
M	lib/ethdev/ethdev_linux_ethtool.c
M	lib/ethdev/rte_ethdev.c
M	lib/eventdev/rte_event_timer_adapter.c
M	lib/graph/graph_stats.c
M	lib/hash/rte_thash.c
M	lib/rib/rte_rib6.c
M	lib/vhost/vhost.c
M	lib/vhost/vhost_user.c
Falling back to patching base and 3-way merge...
Auto-merging lib/vhost/vhost_user.c
Auto-merging lib/vhost/vhost.c
Auto-merging lib/rib/rte_rib6.c
Auto-merging lib/hash/rte_thash.c
Auto-merging lib/graph/graph_stats.c
Auto-merging lib/eventdev/rte_event_timer_adapter.c
Auto-merging lib/ethdev/rte_ethdev.c
Auto-merging lib/ethdev/ethdev_linux_ethtool.c
CONFLICT (content): Merge conflict in lib/ethdev/ethdev_linux_ethtool.c
Auto-merging lib/ethdev/ethdev_driver.c
CONFLICT (content): Merge conflict in lib/ethdev/ethdev_driver.c
Auto-merging lib/eal/linux/eal_memory.c
Auto-merging lib/eal/common/eal_common_options.c
Auto-merging lib/cmdline/cmdline_parse_portlist.c
Auto-merging lib/cfgfile/rte_cfgfile.c
Auto-merging drivers/net/vhost/rte_eth_vhost.c
Auto-merging drivers/net/mlx5/mlx5_rxq.c
Auto-merging drivers/net/mlx5/mlx5_rx.c
Auto-merging drivers/net/mlx5/mlx5_flow.c
Auto-merging drivers/net/intel/iavf/iavf_rxtx.c
Auto-merging drivers/net/dpaa2/dpaa2_rxtx.c
Auto-merging drivers/net/dpaa2/dpaa2_ethdev.c
Auto-merging drivers/net/dpaa/dpaa_ethdev.c
Auto-merging drivers/mempool/dpaa2/dpaa2_hw_mempool.c
Auto-merging drivers/mempool/dpaa/dpaa_mempool.c
Auto-merging drivers/common/mlx5/mlx5_devx_cmds.c
Auto-merging drivers/common/mlx5/linux/mlx5_nl.c
Auto-merging drivers/bus/vmbus/vmbus_channel.c
CONFLICT (content): Merge conflict in drivers/bus/vmbus/vmbus_channel.c
Auto-merging drivers/bus/vmbus/linux/vmbus_bus.c
Auto-merging drivers/bus/dpaa/dpaa_bus.c
CONFLICT (content): Merge conflict in drivers/bus/dpaa/dpaa_bus.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 dpdk: support quick jump to API definition
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/33982/

UNH-IOL DPDK Community Lab