Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/117106 _apply patch failure_ Submitter: Andrew Rybchenko Date: Thursday, September 29 2022 09:22:56 Applied on: CommitID:bbbe6c596b284909e4112ac9573b16da2137ffab Apply patch set 117106-117109 failed: Checking patch app/test-pmd/cmdline_flow.c... error: while searching for: ACTION_METER_COLOR_MODE, ACTION_METER_INIT_COLOR, ACTION_METER_STATE, ACTION_OF_SET_MPLS_TTL, ACTION_OF_SET_MPLS_TTL_MPLS_TTL, ACTION_OF_DEC_MPLS_TTL, ACTION_OF_SET_NW_TTL, ACTION_OF_SET_NW_TTL_NW_TTL, error: patch failed: app/test-pmd/cmdline_flow.c:515 error: while searching for: ACTION_METER, ACTION_METER_COLOR, ACTION_METER_MARK, ACTION_OF_SET_MPLS_TTL, ACTION_OF_DEC_MPLS_TTL, ACTION_OF_SET_NW_TTL, ACTION_OF_DEC_NW_TTL, error: patch failed: app/test-pmd/cmdline_flow.c:1837 Hunk #3 succeeded at 1909 (offset -44 lines). error: while searching for: .args = ARGS(ARGS_ENTRY(struct rte_flow_action_meter_mark, state)), .call = parse_vc_conf, }, [ACTION_OF_SET_MPLS_TTL] = { .name = "of_set_mpls_ttl", .help = "OpenFlow's OFPAT_SET_MPLS_TTL", .priv = PRIV_ACTION (OF_SET_MPLS_TTL, sizeof(struct rte_flow_action_of_set_mpls_ttl)), .next = NEXT(action_of_set_mpls_ttl), .call = parse_vc, }, [ACTION_OF_SET_MPLS_TTL_MPLS_TTL] = { .name = "mpls_ttl", .help = "MPLS TTL", .next = NEXT(action_of_set_mpls_ttl, NEXT_ENTRY(COMMON_UNSIGNED)), .args = ARGS(ARGS_ENTRY(struct rte_flow_action_of_set_mpls_ttl, mpls_ttl)), .call = parse_vc_conf, }, [ACTION_OF_DEC_MPLS_TTL] = { .name = "of_dec_mpls_ttl", .help = "OpenFlow's OFPAT_DEC_MPLS_TTL", error: patch failed: app/test-pmd/cmdline_flow.c:5469 Checking patch doc/guides/prog_guide/rte_flow.rst... Hunk #1 succeeded at 2116 (offset -7 lines). Checking patch doc/guides/rel_notes/deprecation.rst... Checking patch doc/guides/rel_notes/release_22_11.rst... Hunk #1 succeeded at 121 (offset 12 lines). Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c... Checking patch lib/ethdev/rte_flow.c... Hunk #1 succeeded at 191 (offset -1 lines). Checking patch lib/ethdev/rte_flow.h... Hunk #1 succeeded at 2268 (offset -7 lines). Hunk #2 succeeded at 3017 (offset -15 lines). Applying patch app/test-pmd/cmdline_flow.c with 3 rejects... Rejected hunk #1. Rejected hunk #2. Hunk #3 applied cleanly. Rejected hunk #4. Applied patch doc/guides/prog_guide/rte_flow.rst cleanly. Applied patch doc/guides/rel_notes/deprecation.rst cleanly. Applied patch doc/guides/rel_notes/release_22_11.rst cleanly. Applied patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c cleanly. Applied patch lib/ethdev/rte_flow.c cleanly. Applied patch lib/ethdev/rte_flow.h cleanly. diff a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c (rejected hunks) @@ -515,8 +515,6 @@ enum index { ACTION_METER_COLOR_MODE, ACTION_METER_INIT_COLOR, ACTION_METER_STATE, - ACTION_OF_SET_MPLS_TTL, - ACTION_OF_SET_MPLS_TTL_MPLS_TTL, ACTION_OF_DEC_MPLS_TTL, ACTION_OF_SET_NW_TTL, ACTION_OF_SET_NW_TTL_NW_TTL, @@ -1837,7 +1835,6 @@ static const enum index next_action[] = { ACTION_METER, ACTION_METER_COLOR, ACTION_METER_MARK, - ACTION_OF_SET_MPLS_TTL, ACTION_OF_DEC_MPLS_TTL, ACTION_OF_SET_NW_TTL, ACTION_OF_DEC_NW_TTL, @@ -5469,24 +5460,6 @@ static const struct token token_list[] = { .args = ARGS(ARGS_ENTRY(struct rte_flow_action_meter_mark, state)), .call = parse_vc_conf, }, - [ACTION_OF_SET_MPLS_TTL] = { - .name = "of_set_mpls_ttl", - .help = "OpenFlow's OFPAT_SET_MPLS_TTL", - .priv = PRIV_ACTION - (OF_SET_MPLS_TTL, - sizeof(struct rte_flow_action_of_set_mpls_ttl)), - .next = NEXT(action_of_set_mpls_ttl), - .call = parse_vc, - }, - [ACTION_OF_SET_MPLS_TTL_MPLS_TTL] = { - .name = "mpls_ttl", - .help = "MPLS TTL", - .next = NEXT(action_of_set_mpls_ttl, - NEXT_ENTRY(COMMON_UNSIGNED)), - .args = ARGS(ARGS_ENTRY(struct rte_flow_action_of_set_mpls_ttl, - mpls_ttl)), - .call = parse_vc_conf, - }, [ACTION_OF_DEC_MPLS_TTL] = { .name = "of_dec_mpls_ttl", .help = "OpenFlow's OFPAT_DEC_MPLS_TTL", Checking patch app/test-pmd/cmdline_flow.c... error: app/test-pmd/cmdline_flow.c: does not match index Checking patch doc/guides/prog_guide/rte_flow.rst... error: doc/guides/prog_guide/rte_flow.rst: does not match index Checking patch doc/guides/rel_notes/deprecation.rst... error: doc/guides/rel_notes/deprecation.rst: does not match index Checking patch doc/guides/rel_notes/release_22_11.rst... error: doc/guides/rel_notes/release_22_11.rst: does not match index Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c... error: drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c: does not match index Checking patch lib/ethdev/rte_flow.c... error: lib/ethdev/rte_flow.c: does not match index Checking patch lib/ethdev/rte_flow.h... error: lib/ethdev/rte_flow.h: does not match index Checking patch app/test-pmd/cmdline_flow.c... error: app/test-pmd/cmdline_flow.c: does not match index Checking patch doc/guides/prog_guide/rte_flow.rst... error: doc/guides/prog_guide/rte_flow.rst: does not match index Checking patch doc/guides/rel_notes/deprecation.rst... error: doc/guides/rel_notes/deprecation.rst: does not match index Checking patch doc/guides/rel_notes/release_22_11.rst... error: doc/guides/rel_notes/release_22_11.rst: does not match index Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c... error: drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c: does not match index Checking patch lib/ethdev/rte_flow.c... error: lib/ethdev/rte_flow.c: does not match index Checking patch lib/ethdev/rte_flow.h... error: lib/ethdev/rte_flow.h: does not match index Checking patch app/test-pmd/cmdline_flow.c... error: app/test-pmd/cmdline_flow.c: does not match index Checking patch doc/guides/prog_guide/rte_flow.rst... error: doc/guides/prog_guide/rte_flow.rst: does not match index Checking patch doc/guides/rel_notes/deprecation.rst... error: doc/guides/rel_notes/deprecation.rst: does not match index Checking patch doc/guides/rel_notes/release_22_11.rst... error: doc/guides/rel_notes/release_22_11.rst: does not match index Checking patch drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c... error: drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c: does not match index Checking patch lib/ethdev/rte_flow.c... error: lib/ethdev/rte_flow.c: does not match index Checking patch lib/ethdev/rte_flow.h... error: lib/ethdev/rte_flow.h: does not match index https://lab.dpdk.org/results/dashboard/patchsets/23699/ UNH-IOL DPDK Community Lab