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

_apply patch failure_

Submitter: Simei Su <simei.su@intel.com>
Date: Friday, August 06 2021 01:34:24 
Applied on: CommitID:2508c18cff9ffb217ac40e44071dc2762d257f31
Apply patch set 96690-96693 failed:

Checking patch drivers/net/ice/ice_ethdev.c...
Hunk #5 succeeded at 3486 (offset 22 lines).
Hunk #6 succeeded at 5299 (offset 22 lines).
Checking patch drivers/net/ice/ice_ethdev.h...
error: while searching for:
	struct ice_devargs devargs;
	enum ice_pkg_type active_pkg_type; /* loaded ddp package type */
	uint16_t fdir_ref_cnt;
};

struct ice_vsi_vlan_pvid_info {

error: patch failed: drivers/net/ice/ice_ethdev.h:487
Checking patch drivers/net/ice/ice_rxtx.c...
Hunk #5 succeeded at 1762 (offset -2 lines).
Hunk #6 succeeded at 1890 (offset -4 lines).
Hunk #7 succeeded at 2236 (offset -4 lines).
Hunk #8 succeeded at 2303 (offset -6 lines).
Hunk #9 succeeded at 2522 (offset -6 lines).
Hunk #10 succeeded at 2691 (offset -6 lines).
Checking patch drivers/net/ice/ice_rxtx.h...
Applied patch drivers/net/ice/ice_ethdev.c cleanly.
Applying patch drivers/net/ice/ice_ethdev.h with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applied patch drivers/net/ice/ice_rxtx.c cleanly.
Applied patch drivers/net/ice/ice_rxtx.h cleanly.
diff a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h	(rejected hunks)
@@ -487,6 +488,10 @@ struct ice_adapter {
 	struct ice_devargs devargs;
 	enum ice_pkg_type active_pkg_type; /* loaded ddp package type */
 	uint16_t fdir_ref_cnt;
+	/* For PTP */
+	struct rte_timecounter systime_tc;
+	struct rte_timecounter rx_tstamp_tc;
+	struct rte_timecounter tx_tstamp_tc;
 };
 
 struct ice_vsi_vlan_pvid_info {

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

UNH-IOL DPDK Community Lab