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

_apply patch failure_

Submitter: Junfeng Guo <junfeng.guo@intel.com>
Date: Monday, November 01 2021 08:36:12 
Applied on: CommitID:6cc51b1293ceac4a77d4bf7ac91a8bbd59e1f78c
Apply patch set 103303-103306 failed:

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/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/19873/

UNH-IOL DPDK Community Lab