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

_apply patch failure_

Submitter: Simei Su <simei.su@intel.com>
Date: Saturday, September 18 2021 06:56:40 
Applied on: CommitID:4777674c4428f528fa2890d8afab551f6dd54c24
Apply patch set 99268 failed:

Checking patch doc/guides/rel_notes/release_21_11.rst...
error: while searching for:
* **Updated Intel ice driver.**

  Added 1PPS out support by a devargs.


Removed Items

error: patch failed: doc/guides/rel_notes/release_21_11.rst:70
Checking patch drivers/net/ice/ice_ethdev.c...
error: while searching for:
#define ICE_HW_DEBUG_MASK_ARG     "hw_debug_mask"
#define ICE_ONE_PPS_OUT_ARG       "pps_out"

static const char * const ice_valid_args[] = {
	ICE_SAFE_MODE_SUPPORT_ARG,
	ICE_PIPELINE_MODE_SUPPORT_ARG,

error: patch failed: drivers/net/ice/ice_ethdev.c:31
Hunk #2 succeeded at 3475 (offset -200 lines).
Checking patch drivers/net/ice/ice_rxtx.c...
Checking patch drivers/net/ice/ice_rxtx.h...
Checking patch drivers/net/ice/ice_rxtx_vec_common.h...
Applying patch doc/guides/rel_notes/release_21_11.rst with 1 reject...
Rejected hunk #1.
Applying patch drivers/net/ice/ice_ethdev.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applied patch drivers/net/ice/ice_rxtx.c cleanly.
Applied patch drivers/net/ice/ice_rxtx.h cleanly.
Applied patch drivers/net/ice/ice_rxtx_vec_common.h cleanly.
diff a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst	(rejected hunks)
@@ -70,6 +70,7 @@ New Features
 * **Updated Intel ice driver.**
 
   Added 1PPS out support by a devargs.
+  * Added Rx timstamp support by dynamic mbuf on Flex Descriptor.
 
 
 Removed Items
diff a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c	(rejected hunks)
@@ -31,6 +31,9 @@
 #define ICE_HW_DEBUG_MASK_ARG     "hw_debug_mask"
 #define ICE_ONE_PPS_OUT_ARG       "pps_out"
 
+uint64_t ice_timestamp_dynflag;
+int ice_timestamp_dynfield_offset = -1;
+
 static const char * const ice_valid_args[] = {
 	ICE_SAFE_MODE_SUPPORT_ARG,
 	ICE_PIPELINE_MODE_SUPPORT_ARG,

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

UNH-IOL DPDK Community Lab