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

_apply issues_

Submitter: Rory Sexton <rory.sexton@intel.com>
Date: 2019-12-16 10:15:17
Reply_mail: 20191216101518.15666-1-rory.sexton@intel.com
DPDK git baseline:
	Repo:dpdk-next-net, CommitID: e53a99ffb6b41c2e056a618a182516fe28e733d4
	Repo:dpdk, CommitID: 73c392e24f5e29acbe53044dccb6b07ebbae2467

*Repo: dpdk-next-net
ITEM_TAG_INDEX,

	/* Validate/create actions. */
	ACTIONS,

error: patch failed: app/test-pmd/cmdline_flow.c:213
error: app/test-pmd/cmdline_flow.c: patch does not apply
Checking patch lib/librte_ethdev/rte_flow.c...
error: while searching for:
	MK_FLOW_ITEM(IGMP, sizeof(struct rte_flow_item_igmp)),
	MK_FLOW_ITEM(AH, sizeof(struct rte_flow_item_ah)),
	MK_FLOW_ITEM(HIGIG2, sizeof(struct rte_flow_item_higig2_hdr)),
};

/** Generate flow_action[] entry. */

error: patch failed: lib/librte_ethdev/rte_flow.c:93
error: lib/librte_ethdev/rte_flow.c: patch does not apply
Checking patch lib/librte_ethdev/rte_flow.h...
error: while searching for:
	 */
	RTE_FLOW_ITEM_TYPE_HIGIG2,
--
	/*
	 * [META]
	 *
	 * Matches a tag value.

error: patch failed: lib/librte_ethdev/rte_flow.h:502
error: lib/librte_ethdev/rte_flow.h: patch does not apply
*Repo: dpdk
ITEM_TAG_INDEX,

	/* Validate/create actions. */
	ACTIONS,

error: patch failed: app/test-pmd/cmdline_flow.c:213
error: app/test-pmd/cmdline_flow.c: patch does not apply
Checking patch lib/librte_ethdev/rte_flow.c...
error: while searching for:
	MK_FLOW_ITEM(IGMP, sizeof(struct rte_flow_item_igmp)),
	MK_FLOW_ITEM(AH, sizeof(struct rte_flow_item_ah)),
	MK_FLOW_ITEM(HIGIG2, sizeof(struct rte_flow_item_higig2_hdr)),
};

/** Generate flow_action[] entry. */

error: patch failed: lib/librte_ethdev/rte_flow.c:93
error: lib/librte_ethdev/rte_flow.c: patch does not apply
Checking patch lib/librte_ethdev/rte_flow.h...
error: while searching for:
	 */
	RTE_FLOW_ITEM_TYPE_HIGIG2,
--
	/*
	 * [META]
	 *
	 * Matches a tag value.

error: patch failed: lib/librte_ethdev/rte_flow.h:502
error: lib/librte_ethdev/rte_flow.h: patch does not apply

DPDK STV team