Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/68918

_apply issues_

Submitter: Wei Zhao <wei.zhao1@intel.com>
Date: 2020-04-20 05:18:53
Reply_mail: 20200420051855.11126-2-wei.zhao1@intel.com
DPDK git baseline:
	Repo:dpdk-next-net-intel, CommitID: 82ea4f8e00bec2e7015366410dd7e88b94f15f75
	Repo:dpdk, CommitID: 4e648fb70c9de2597a6987c88f0a5aa16a28a2d1

Apply patchset failed, the failed patch is:                                    http://dpdk.org/patch/68918
*Repo: dpdk
ICE_AH,
	ICE_PROTOCOL_LAST
};


error: patch failed: drivers/net/ice/base/ice_protocol_type.h:50
error: drivers/net/ice/base/ice_protocol_type.h: patch does not apply
Checking patch drivers/net/ice/base/ice_switch.c...
Hunk #1 succeeded at 581 (offset -9 lines).
Hunk #2 succeeded at 5014 (offset -103 lines).
Hunk #3 succeeded at 5046 (offset -103 lines).
--
	case ICE_SW_TUN_PROFID_IPV6_NAT_T:
		ice_set_bit(ICE_PROFID_IPV6_NAT_T, bm);
		return;
	case ICE_SW_TUN_PROFID_IPV4_PFCP_NODE:

error: patch failed: drivers/net/ice/base/ice_switch.c:5762
error: drivers/net/ice/base/ice_switch.c: patch does not apply
Checking patch drivers/net/ice/base/ice_switch.h...
error: while searching for:
/* Switch Profile IDs for Profile related switch rules */
#define ICE_PROFID_IPV6_ESP		72
#define ICE_PROFID_IPV6_AH		74
#define ICE_PROFID_IPV6_NAT_T		76
#define ICE_PROFID_MAC_IPV6_L2TPV3	78
#define ICE_PROFID_IPV4_PFCP_NODE	79

error: patch failed: drivers/net/ice/base/ice_switch.h:18
error: drivers/net/ice/base/ice_switch.h: patch does not apply

DPDK STV team