Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/112302 _apply patch failure_ Submitter: Spike Du Date: Friday, June 03 2022 12:48:21 Applied on: CommitID:769723eef91c8f47cdf851df5fa97dca7ccbbbe2 Apply patch set 112302-112308 failed: Checking patch app/test-pmd/cmdline.c... Hunk #1 succeeded at 17803 (offset -20 lines). Hunk #2 succeeded at 18156 (offset -21 lines). Checking patch app/test-pmd/config.c... .git/rebase-apply/patch:126: new blank line at EOF. + Checking patch app/test-pmd/testpmd.c... Hunk #1 succeeded at 417 (offset -3 lines). Hunk #2 succeeded at 3552 (offset -65 lines). Hunk #3 succeeded at 3587 (offset -65 lines). Checking patch app/test-pmd/testpmd.h... Hunk #1 succeeded at 1163 (offset -10 lines). Checking patch lib/ethdev/ethdev_driver.h... Checking patch lib/ethdev/rte_ethdev.c... Hunk #1 succeeded at 4429 (offset 5 lines). Checking patch lib/ethdev/rte_ethdev.h... Hunk #2 succeeded at 3676 (offset -4 lines). Hunk #3 succeeded at 3940 (offset -4 lines). Checking patch lib/ethdev/version.map... error: while searching for: rte_mtr_color_in_protocol_priority_get; rte_mtr_color_in_protocol_set; rte_mtr_meter_vlan_table_update; }; INTERNAL { error: patch failed: lib/ethdev/version.map:285 Applied patch app/test-pmd/cmdline.c cleanly. Applied patch app/test-pmd/config.c cleanly. Applied patch app/test-pmd/testpmd.c cleanly. Applied patch app/test-pmd/testpmd.h cleanly. Applied patch lib/ethdev/ethdev_driver.h cleanly. Applied patch lib/ethdev/rte_ethdev.c cleanly. Applied patch lib/ethdev/rte_ethdev.h cleanly. Applying patch lib/ethdev/version.map with 1 reject... Rejected hunk #1. diff a/lib/ethdev/version.map b/lib/ethdev/version.map (rejected hunks) @@ -285,6 +285,8 @@ EXPERIMENTAL { rte_mtr_color_in_protocol_priority_get; rte_mtr_color_in_protocol_set; rte_mtr_meter_vlan_table_update; + rte_eth_rx_fill_thresh_set; + rte_eth_rx_fill_thresh_query; }; INTERNAL { Checking patch doc/guides/nics/mlx5.rst... Hunk #2 succeeded at 519 (offset -2 lines). .git/rebase-apply/patch:43: new blank line at EOF. + Hunk #3 succeeded at 1682 (offset -2 lines). Checking patch doc/guides/rel_notes/release_22_07.rst... error: while searching for: * Added support for promiscuous mode on Windows. * Added support for MTU on Windows. * Added matching and RSS on IPsec ESP. * **Updated Marvell cnxk crypto driver.** error: patch failed: doc/guides/rel_notes/release_22_07.rst:89 Checking patch drivers/common/mlx5/mlx5_prm.h... Hunk #1 succeeded at 3294 (offset 1 line). Checking patch drivers/net/mlx5/mlx5.c... Hunk #1 succeeded at 2067 (offset -4 lines). Checking patch drivers/net/mlx5/mlx5_rx.c... .git/rebase-apply/patch:285: new blank line at EOF. + Checking patch drivers/net/mlx5/mlx5_rx.h... Applied patch doc/guides/nics/mlx5.rst cleanly. Applying patch doc/guides/rel_notes/release_22_07.rst with 1 reject... Rejected hunk #1. Applied patch drivers/common/mlx5/mlx5_prm.h cleanly. Applied patch drivers/net/mlx5/mlx5.c cleanly. Applied patch drivers/net/mlx5/mlx5_rx.c cleanly. Applied patch drivers/net/mlx5/mlx5_rx.h cleanly. diff a/doc/guides/rel_notes/release_22_07.rst b/doc/guides/rel_notes/release_22_07.rst (rejected hunks) @@ -89,6 +89,7 @@ New Features * Added support for promiscuous mode on Windows. * Added support for MTU on Windows. * Added matching and RSS on IPsec ESP. + * Added Rx queue fill threshold support. * **Updated Marvell cnxk crypto driver.** Checking patch doc/guides/nics/mlx5.rst... error: doc/guides/nics/mlx5.rst: does not match index Checking patch doc/guides/rel_notes/release_22_07.rst... error: while searching for: * Added support for MTU on Windows. * Added matching and RSS on IPsec ESP. * Added Rx queue fill threshold support. * **Updated Marvell cnxk crypto driver.** error: patch failed: doc/guides/rel_notes/release_22_07.rst:90 Checking patch drivers/common/mlx5/linux/meson.build... Checking patch drivers/common/mlx5/mlx5_prm.h... error: drivers/common/mlx5/mlx5_prm.h: does not match index Checking patch drivers/net/mlx5/mlx5.h... Hunk #1 succeeded at 1267 (offset -4 lines). Checking patch drivers/net/mlx5/mlx5_rx.c... error: drivers/net/mlx5/mlx5_rx.c: does not match index Checking patch drivers/net/mlx5/rte_pmd_mlx5.h... Checking patch drivers/net/mlx5/version.map... Applying patch doc/guides/rel_notes/release_22_07.rst with 1 reject... Rejected hunk #1. Applied patch drivers/common/mlx5/linux/meson.build cleanly. Applied patch drivers/net/mlx5/mlx5.h cleanly. Applied patch drivers/net/mlx5/rte_pmd_mlx5.h cleanly. Applied patch drivers/net/mlx5/version.map cleanly. diff a/doc/guides/rel_notes/release_22_07.rst b/doc/guides/rel_notes/release_22_07.rst (rejected hunks) @@ -90,6 +90,7 @@ New Features * Added support for MTU on Windows. * Added matching and RSS on IPsec ESP. * Added Rx queue fill threshold support. + * Added host shaper support. * **Updated Marvell cnxk crypto driver.** Checking patch app/test-pmd/testpmd.c... error: app/test-pmd/testpmd.c: does not match index Checking patch doc/guides/nics/mlx5.rst... error: doc/guides/nics/mlx5.rst: does not match index Checking patch drivers/net/mlx5/meson.build... Checking patch drivers/net/mlx5/mlx5_testpmd.c... .git/rebase-apply/patch:308: new blank line at EOF. + Checking patch drivers/net/mlx5/mlx5_testpmd.h... Applied patch drivers/net/mlx5/meson.build cleanly. Applied patch drivers/net/mlx5/mlx5_testpmd.c cleanly. Applied patch drivers/net/mlx5/mlx5_testpmd.h cleanly. https://lab.dpdk.org/results/dashboard/patchsets/22423/ UNH-IOL DPDK Community Lab