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

_apply patch failure_

Submitter: Junfeng Guo <junfeng.guo@intel.com>
Date: Wednesday, November 03 2021 04:40:03 
Applied on: CommitID:f88b0b892204d071a46a629b00424a8d47055ba4
Apply patch set 103601-103604 failed:

Checking patch doc/guides/nics/features/ice.ini...
Checking patch doc/guides/rel_notes/release_21_11.rst...
Hunk #1 succeeded at 166 (offset -1 lines).
Checking patch drivers/net/ice/ice_ethdev.h...
error: while searching for:
	struct rte_timecounter tx_tstamp_tc;
	bool ptp_ena;
	uint64_t time_hw;
#ifdef RTE_ARCH_X86
	bool rx_use_avx2;
	bool rx_use_avx512;

error: patch failed: drivers/net/ice/ice_ethdev.h:510
Checking patch drivers/net/ice/ice_fdir_filter.c...
Checking patch drivers/net/ice/ice_generic_flow.c...
Checking patch drivers/net/ice/ice_generic_flow.h...
Applied patch doc/guides/nics/features/ice.ini cleanly.
Applied patch doc/guides/rel_notes/release_21_11.rst cleanly.
Applying patch drivers/net/ice/ice_ethdev.h with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Applied patch drivers/net/ice/ice_fdir_filter.c cleanly.
Applied patch drivers/net/ice/ice_generic_flow.c cleanly.
Applied patch drivers/net/ice/ice_generic_flow.h cleanly.
diff a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h	(rejected hunks)
@@ -510,6 +523,7 @@ struct ice_adapter {
 	struct rte_timecounter tx_tstamp_tc;
 	bool ptp_ena;
 	uint64_t time_hw;
+	struct ice_fdir_prof_info fdir_prof_info[ICE_MAX_PTGS];
 #ifdef RTE_ARCH_X86
 	bool rx_use_avx2;
 	bool rx_use_avx512;

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

UNH-IOL DPDK Community Lab