Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/101035 _apply patch failure_ Submitter: Andrew Rybchenko Date: Monday, October 11 2021 13:24:53 Applied on: CommitID:515d20195b17444262a5732831c0615146c7189c Apply patch set 101035 failed: Checking patch doc/guides/nics/features.rst... Hunk #1 succeeded at 662 (offset 11 lines). Checking patch doc/guides/rel_notes/deprecation.rst... error: while searching for: the device packet overhead can be calculated as: ``(struct rte_eth_dev_info).max_rx_pktlen - (struct rte_eth_dev_info).max_mtu`` * ethdev: ``rx_descriptor_done`` dev_ops and ``rte_eth_rx_descriptor_done`` will be removed in 21.11. Existing ``rte_eth_rx_descriptor_status`` and ``rte_eth_tx_descriptor_status`` APIs can be used as replacement. * ethdev: Announce moving from dedicated modify function for each field, to using the general ``rte_flow_modify_field`` action. error: patch failed: doc/guides/rel_notes/deprecation.rst:106 Checking patch doc/guides/rel_notes/release_21_11.rst... error: while searching for: ``rte_eth_mirror_rule_reset`` along with the associated macros ``ETH_MIRROR_*`` are removed. * i40e: Removed i40evf driver. iavf already became the default VF driver for i40e devices, so there is no need to maintain i40evf. error: patch failed: doc/guides/rel_notes/release_21_11.rst:168 Checking patch drivers/net/e1000/e1000_ethdev.h... Checking patch drivers/net/e1000/em_ethdev.c... Checking patch drivers/net/e1000/em_rxtx.c... Hunk #1 succeeded at 1511 (offset -6 lines). Checking patch drivers/net/e1000/igb_ethdev.c... Checking patch drivers/net/e1000/igb_rxtx.c... Hunk #1 succeeded at 1791 (offset -7 lines). Checking patch drivers/net/fm10k/fm10k.h... Checking patch drivers/net/fm10k/fm10k_ethdev.c... Checking patch drivers/net/fm10k/fm10k_rxtx.c... Checking patch drivers/net/i40e/i40e_ethdev.c... Hunk #1 succeeded at 1434 (offset 12 lines). Checking patch drivers/net/i40e/i40e_rxtx.c... Hunk #1 succeeded at 2135 (offset -14 lines). Checking patch drivers/net/i40e/i40e_rxtx.h... Hunk #1 succeeded at 227 (offset -4 lines). Checking patch drivers/net/igc/igc_ethdev.c... Checking patch drivers/net/igc/igc_txrx.c... Checking patch drivers/net/igc/igc_txrx.h... Checking patch drivers/net/ixgbe/ixgbe_ethdev.c... Hunk #1 succeeded at 1057 (offset 7 lines). Hunk #2 succeeded at 1545 (offset 7 lines). Checking patch drivers/net/ixgbe/ixgbe_ethdev.h... Hunk #1 succeeded at 606 (offset 10 lines). Checking patch drivers/net/ixgbe/ixgbe_rxtx.c... Hunk #1 succeeded at 3281 (offset -4 lines). Checking patch drivers/net/octeontx2/otx2_ethdev.c... Hunk #1 succeeded at 2449 (offset 9 lines). Checking patch drivers/net/octeontx2/otx2_ethdev.h... Checking patch drivers/net/octeontx2/otx2_ethdev_ops.c... Checking patch drivers/net/sfc/sfc_ethdev.c... Hunk #1 succeeded at 1296 (offset -1 lines). Hunk #2 succeeded at 2030 (offset -1 lines). Hunk #3 succeeded at 2137 (offset -1 lines). Checking patch drivers/net/virtio/virtio_ethdev.c... Hunk #1 succeeded at 1907 (offset 8 lines). Checking patch drivers/net/virtio/virtio_ethdev.h... Checking patch drivers/net/virtio/virtio_rxtx.c... Checking patch lib/ethdev/rte_ethdev.c... Checking patch lib/ethdev/rte_ethdev.h... Hunk #1 succeeded at 5063 (offset 74 lines). Checking patch lib/ethdev/rte_ethdev_core.h... Applied patch doc/guides/nics/features.rst cleanly. Applying patch doc/guides/rel_notes/deprecation.rst with 1 reject... Rejected hunk #1. Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject... Rejected hunk #1. Applied patch drivers/net/e1000/e1000_ethdev.h cleanly. Applied patch drivers/net/e1000/em_ethdev.c cleanly. Applied patch drivers/net/e1000/em_rxtx.c cleanly. Applied patch drivers/net/e1000/igb_ethdev.c cleanly. Applied patch drivers/net/e1000/igb_rxtx.c cleanly. Applied patch drivers/net/fm10k/fm10k.h cleanly. Applied patch drivers/net/fm10k/fm10k_ethdev.c cleanly. Applied patch drivers/net/fm10k/fm10k_rxtx.c cleanly. Applied patch drivers/net/i40e/i40e_ethdev.c cleanly. Applied patch drivers/net/i40e/i40e_rxtx.c cleanly. Applied patch drivers/net/i40e/i40e_rxtx.h cleanly. Applied patch drivers/net/igc/igc_ethdev.c cleanly. Applied patch drivers/net/igc/igc_txrx.c cleanly. Applied patch drivers/net/igc/igc_txrx.h cleanly. Applied patch drivers/net/ixgbe/ixgbe_ethdev.c cleanly. Applied patch drivers/net/ixgbe/ixgbe_ethdev.h cleanly. Applied patch drivers/net/ixgbe/ixgbe_rxtx.c cleanly. Applied patch drivers/net/octeontx2/otx2_ethdev.c cleanly. Applied patch drivers/net/octeontx2/otx2_ethdev.h cleanly. Applied patch drivers/net/octeontx2/otx2_ethdev_ops.c cleanly. Applied patch drivers/net/sfc/sfc_ethdev.c cleanly. Applied patch drivers/net/virtio/virtio_ethdev.c cleanly. Applied patch drivers/net/virtio/virtio_ethdev.h cleanly. Applied patch drivers/net/virtio/virtio_rxtx.c cleanly. Applied patch lib/ethdev/rte_ethdev.c cleanly. Applied patch lib/ethdev/rte_ethdev.h cleanly. Applied patch lib/ethdev/rte_ethdev_core.h cleanly. diff a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst (rejected hunks) @@ -106,11 +106,6 @@ Deprecation Notices the device packet overhead can be calculated as: ``(struct rte_eth_dev_info).max_rx_pktlen - (struct rte_eth_dev_info).max_mtu`` -* ethdev: ``rx_descriptor_done`` dev_ops and ``rte_eth_rx_descriptor_done`` - will be removed in 21.11. - Existing ``rte_eth_rx_descriptor_status`` and ``rte_eth_tx_descriptor_status`` - APIs can be used as replacement. - * ethdev: Announce moving from dedicated modify function for each field, to using the general ``rte_flow_modify_field`` action. diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst (rejected hunks) @@ -168,6 +168,10 @@ Removed Items ``rte_eth_mirror_rule_reset`` along with the associated macros ``ETH_MIRROR_*`` are removed. +* ethdev: Removed ``rte_eth_rx_descriptor_done`` API function and its + driver callback. It is replaced by the more complete function + ``rte_eth_rx_descriptor_status``. + * i40e: Removed i40evf driver. iavf already became the default VF driver for i40e devices, so there is no need to maintain i40evf. https://lab.dpdk.org/results/dashboard/patchsets/19300/ UNH-IOL DPDK Community Lab