Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/95499 _apply patch failure_ Submitter: David Marchand Date: Wednesday, July 07 2021 12:08:18 Applied on: CommitID:928a0263559647b2d7829bad2a47fdcd6b5014bd Apply patch set 95499-95500 failed: Checking patch drivers/net/ice/base/ice_osdep.h... Checking patch drivers/net/ice/ice_dcf_parent.c... Hunk #1 succeeded at 298 (offset -74 lines). Hunk #2 succeeded at 313 (offset -74 lines). error: while searching for: } } err = ice_dcf_load_pkg(parent_hw); if (err) { PMD_INIT_LOG(ERR, "failed to load package with error %d", err); goto uninit_hw; } parent_adapter->active_pkg_type = ice_load_pkg_type(parent_hw); parent_adapter->pf.main_vsi->idx = hw->num_vfs; ice_dcf_update_pf_vsi_map(parent_hw, error: patch failed: drivers/net/ice/ice_dcf_parent.c:518 Checking patch drivers/net/ice/ice_ethdev.c... Hunk #1 succeeded at 1649 (offset -2 lines). Hunk #2 succeeded at 1673 (offset -2 lines). Hunk #3 succeeded at 1737 (offset -2 lines). Hunk #4 succeeded at 1994 (offset -26 lines). Hunk #5 succeeded at 2050 (offset -26 lines). Checking patch drivers/net/ice/ice_ethdev.h... Applied patch drivers/net/ice/base/ice_osdep.h cleanly. Applying patch drivers/net/ice/ice_dcf_parent.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. Applied patch drivers/net/ice/ice_ethdev.c cleanly. Applied patch drivers/net/ice/ice_ethdev.h cleanly. diff a/drivers/net/ice/ice_dcf_parent.c b/drivers/net/ice/ice_dcf_parent.c (rejected hunks) @@ -518,13 +440,12 @@ ice_dcf_init_parent_adapter(struct rte_eth_dev *eth_dev) } } - err = ice_dcf_load_pkg(parent_hw); + err = ice_dcf_load_pkg(parent_adapter); if (err) { PMD_INIT_LOG(ERR, "failed to load package with error %d", err); goto uninit_hw; } - parent_adapter->active_pkg_type = ice_load_pkg_type(parent_hw); parent_adapter->pf.main_vsi->idx = hw->num_vfs; ice_dcf_update_pf_vsi_map(parent_hw, Skipped patch 'doc/guides/rel_notes/release_21_08.rst'. Checking patch .github/workflows/build.yml... Checking patch .travis.yml... Checking patch config/meson.build... Checking patch drivers/net/bnx2x/bnx2x.c... Checking patch drivers/net/ice/ice_ethdev.c... error: drivers/net/ice/ice_ethdev.c: does not match index Checking patch drivers/net/nfp/nfp_net.c... Checking patch drivers/net/qede/qede_main.c... Checking patch lib/eal/common/eal_firmware.h... Checking patch lib/eal/unix/eal_firmware.c... Checking patch lib/eal/unix/meson.build... Checking patch lib/eal/version.map... Checking patch lib/eal/windows/eal.c... Applied patch .github/workflows/build.yml cleanly. Applied patch .travis.yml cleanly. Applied patch config/meson.build cleanly. Applied patch drivers/net/bnx2x/bnx2x.c cleanly. Applied patch drivers/net/nfp/nfp_net.c cleanly. Applied patch drivers/net/qede/qede_main.c cleanly. Applied patch lib/eal/common/eal_firmware.h cleanly. Applied patch lib/eal/unix/eal_firmware.c cleanly. Applied patch lib/eal/unix/meson.build cleanly. Applied patch lib/eal/version.map cleanly. Applied patch lib/eal/windows/eal.c cleanly. https://lab.dpdk.org/results/dashboard/patchsets/17712/ UNH-IOL DPDK Community Lab