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

_apply patch failure_

Submitter: Hanumanth Pothula <hpothula@marvell.com>
Date: Thursday, September 15 2022 07:07:32 
Applied on: CommitID:4aee6110bb10b0225fa9562f2e48af233a9058a1
Apply patch set 116325-116327 failed:

Checking patch lib/ethdev/rte_ethdev.c...
Checking patch lib/ethdev/rte_ethdev.h...
Hunk #1 succeeded at 1216 (offset 181 lines).
Hunk #2 succeeded at 1253 (offset 181 lines).
error: while searching for:
#define RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM  RTE_BIT64(18)
#define RTE_ETH_RX_OFFLOAD_RSS_HASH         RTE_BIT64(19)
#define RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT     RTE_BIT64(20)

#define RTE_ETH_RX_OFFLOAD_CHECKSUM (RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | \
				 RTE_ETH_RX_OFFLOAD_UDP_CKSUM | \

error: patch failed: lib/ethdev/rte_ethdev.h:1395
Hunk #4 succeeded at 1919 (offset 281 lines).
Applied patch lib/ethdev/rte_ethdev.c cleanly.
Applying patch lib/ethdev/rte_ethdev.h with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Hunk #4 applied cleanly.
diff a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h	(rejected hunks)
@@ -1395,6 +1417,7 @@ struct rte_eth_conf {
 #define RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM  RTE_BIT64(18)
 #define RTE_ETH_RX_OFFLOAD_RSS_HASH         RTE_BIT64(19)
 #define RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT     RTE_BIT64(20)
+#define RTE_ETH_RX_OFFLOAD_MUL_MEMPOOL      RTE_BIT64(21)
 
 #define RTE_ETH_RX_OFFLOAD_CHECKSUM (RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | \
 				 RTE_ETH_RX_OFFLOAD_UDP_CKSUM | \

https://lab.dpdk.org/results/dashboard/patchsets/23506/

UNH-IOL DPDK Community Lab