Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/99311 _apply patch failure_ Submitter: Dmitry Kozlyuk Date: Monday, September 20 2021 12:53:02 Applied on: CommitID:4777674c4428f528fa2890d8afab551f6dd54c24 Apply patch set 99311-99313 failed: Checking patch doc/guides/linux_gsg/linux_eal_parameters.rst... Checking patch lib/eal/common/eal_common_dynmem.c... Checking patch lib/eal/common/eal_common_options.c... error: while searching for: {OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM }, {OPT_MAIN_LCORE, 1, NULL, OPT_MAIN_LCORE_NUM }, {OPT_MBUF_POOL_OPS_NAME, 1, NULL, OPT_MBUF_POOL_OPS_NAME_NUM}, {OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM }, {OPT_NO_HUGE, 0, NULL, OPT_NO_HUGE_NUM }, {OPT_NO_PCI, 0, NULL, OPT_NO_PCI_NUM }, error: patch failed: lib/eal/common/eal_common_options.c:86 Hunk #2 succeeded at 1879 (offset -20 lines). Hunk #3 succeeded at 2001 (offset -20 lines). Checking patch lib/eal/common/eal_internal_cfg.h... Checking patch lib/eal/common/eal_memalloc.h... Checking patch lib/eal/common/eal_options.h... error: while searching for: OPT_NO_TELEMETRY_NUM, #define OPT_FORCE_MAX_SIMD_BITWIDTH "force-max-simd-bitwidth" OPT_FORCE_MAX_SIMD_BITWIDTH_NUM, /* legacy option that will be removed in future */ #define OPT_PCI_BLACKLIST "pci-blacklist" error: patch failed: lib/eal/common/eal_options.h:93 Checking patch lib/eal/common/malloc_elem.c... Checking patch lib/eal/common/malloc_heap.h... Checking patch lib/eal/common/rte_malloc.c... Checking patch lib/eal/include/rte_memory.h... Checking patch lib/eal/linux/eal.c... Checking patch lib/eal/linux/eal_hugepage_info.c... Checking patch lib/eal/linux/eal_memalloc.c... Applied patch doc/guides/linux_gsg/linux_eal_parameters.rst cleanly. Applied patch lib/eal/common/eal_common_dynmem.c cleanly. Applying patch lib/eal/common/eal_common_options.c with 1 reject... Rejected hunk #1. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Applied patch lib/eal/common/eal_internal_cfg.h cleanly. Applied patch lib/eal/common/eal_memalloc.h cleanly. Applying patch lib/eal/common/eal_options.h with 1 reject... Rejected hunk #1. Applied patch lib/eal/common/malloc_elem.c cleanly. Applied patch lib/eal/common/malloc_heap.h cleanly. Applied patch lib/eal/common/rte_malloc.c cleanly. Applied patch lib/eal/include/rte_memory.h cleanly. Applied patch lib/eal/linux/eal.c cleanly. Applied patch lib/eal/linux/eal_hugepage_info.c cleanly. Applied patch lib/eal/linux/eal_memalloc.c cleanly. diff a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c (rejected hunks) @@ -86,6 +86,7 @@ eal_long_options[] = { {OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM }, {OPT_MAIN_LCORE, 1, NULL, OPT_MAIN_LCORE_NUM }, {OPT_MBUF_POOL_OPS_NAME, 1, NULL, OPT_MBUF_POOL_OPS_NAME_NUM}, + {OPT_MEM_FILE, 1, NULL, OPT_MEM_FILE_NUM }, {OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM }, {OPT_NO_HUGE, 0, NULL, OPT_NO_HUGE_NUM }, {OPT_NO_PCI, 0, NULL, OPT_NO_PCI_NUM }, diff a/lib/eal/common/eal_options.h b/lib/eal/common/eal_options.h (rejected hunks) @@ -93,6 +93,8 @@ enum { OPT_NO_TELEMETRY_NUM, #define OPT_FORCE_MAX_SIMD_BITWIDTH "force-max-simd-bitwidth" OPT_FORCE_MAX_SIMD_BITWIDTH_NUM, +#define OPT_MEM_FILE "mem-file" + OPT_MEM_FILE_NUM, /* legacy option that will be removed in future */ #define OPT_PCI_BLACKLIST "pci-blacklist" https://lab.dpdk.org/results/dashboard/patchsets/18864/ UNH-IOL DPDK Community Lab