From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E201AA0093 for ; Wed, 9 Mar 2022 12:03:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD74640150; Wed, 9 Mar 2022 12:03:42 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 8A00640150 for ; Wed, 9 Mar 2022 12:03:39 +0100 (CET) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 5B25D40333 for ; Wed, 9 Mar 2022 11:03:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823819; bh=XrhvElPp8A2c5QuUPUmFRWf0i4Vtrrkf8wq2Vsggyi8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=R+HAjzAQOrSJWAoo0v93iF91DLSb+5Nj59sD6mPA/sdjTbjcgUipmgVOZMrHewqie UmG1Sl9ym40btvZiWggGiA+FfHbLjZ7ySFjWy+l4LjpOuDygRSYuM1MaPAXap3n3+Y 2Fp4JYPk6cCwgL58m2fJxRt0nOa8i9TyK2/UtTjmIxRc4OGqt3FB8tlOTLjkhU4juo aSJCTYXqtCGSsnMt5GV4iJEJ9psYqd4sE01nRf+ry4s2GR2pzoQMX/cbW1TuGk7KdE p+Ghw/W0EfHcCGrVUwJ0Czntqy9eG+uaI17gM7AkGGQBY61uHInY6B/GVc3MEsjlCK Vc1jYHcjfH1/Q== Received: by mail-ej1-f72.google.com with SMTP id k16-20020a17090632d000b006ae1cdb0f07so1093479ejk.16 for ; Wed, 09 Mar 2022 03:03:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XrhvElPp8A2c5QuUPUmFRWf0i4Vtrrkf8wq2Vsggyi8=; b=4FZgK0O46aPiyPuTRY8UhA5m+oC+aF6Dz+ajv9j6PClAwd6PLaFlnHSBSOXQciExIg R+bzu5MRgOiykAkaSlGhR4I0pogUblKs7l87rlfgu3nW2Ew7QfMYfTHCYy/H/9IXXJf/ IkcXkZ2i20vLt6DuQX03FxEzO1DI8wrqi1juSQdGG0m/5lfnxwvA0AKCBQF+4dXAz4h6 JhkAzNNGTXnHEooShJzgcgcJACheEIb+q7L6Ajc+XwwfQI87QAzqyyIlfvCfQTRhxDdf Mgv56q7W4q2187oUA7sze3UpYH3ZP45H3hyQ0h4RU305zULAi7npfupBZKU8lB7r9UCb efTQ== X-Gm-Message-State: AOAM531qg3SPl90xTiXhDLqMYCL41+zIoOvm0LDgeUPjc7S+yBSS4U+H T3D5GszXUun5Cgo0bf5QdvEbRnCnDiKE3Ouk7s4JciA8cGcJOvbYt6AHMpAJaJpgOglmBN0FctJ nYEtM1MbSixbtd9/JVMOE83ae X-Received: by 2002:a17:907:9485:b0:6da:aa54:a88 with SMTP id dm5-20020a170907948500b006daaa540a88mr17367509ejc.427.1646823818972; Wed, 09 Mar 2022 03:03:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJx075mIFMNymADGxVXGSWGyIHLSQf/x0DyK/9w/vKx7ftcz9yuBoO0Z5kyeEJzwqVJH9zwMXg== X-Received: by 2002:a17:907:9485:b0:6da:aa54:a88 with SMTP id dm5-20020a170907948500b006daaa540a88mr17367490ejc.427.1646823818750; Wed, 09 Mar 2022 03:03:38 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id kq26-20020a170906abda00b006da87077172sm609472ejb.29.2022.03.09.03.03.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:03:38 -0800 (PST) From: christian.ehrhardt@canonical.com To: Chuanshe Zhang Cc: Bernard Iremonger , dpdk stable Subject: patch 'examples/flow_classify: fix failure message' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:01:14 +0100 Message-Id: <20220309110116.1295395-43-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 19.11.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/c224b272583e004226bb7371987dc4c7c48d74c1 Thanks. Christian Ehrhardt --- >From c224b272583e004226bb7371987dc4c7c48d74c1 Mon Sep 17 00:00:00 2001 From: Chuanshe Zhang Date: Tue, 18 Jan 2022 10:49:34 +0800 Subject: [PATCH] examples/flow_classify: fix failure message [ upstream commit 750c177980cb7642f1893a9ae4076b631fa6a98f ] Fixes: bab16ddaf2c1 ("examples/flow_classify: add sample application") Signed-off-by: Chuanshe Zhang Acked-by: Bernard Iremonger --- examples/flow_classify/flow_classify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/flow_classify/flow_classify.c b/examples/flow_classify/flow_classify.c index 5fb86b50eb..7f0379e471 100644 --- a/examples/flow_classify/flow_classify.c +++ b/examples/flow_classify/flow_classify.c @@ -424,7 +424,7 @@ parse_ipv4_5tuple_rule(char *str, struct rte_eth_ntuple_filter *ntuple_filter) &ntuple_filter->dst_ip, &ntuple_filter->dst_ip_mask); if (ret != 0) { - flow_classify_log("failed to read source address/mask: %s\n", + flow_classify_log("failed to read destination address/mask: %s\n", in[CB_FLD_DST_ADDR]); return ret; } -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:45.608420707 +0100 +++ 0043-examples-flow_classify-fix-failure-message.patch 2022-03-09 11:57:43.420938557 +0100 @@ -1 +1 @@ -From 750c177980cb7642f1893a9ae4076b631fa6a98f Mon Sep 17 00:00:00 2001 +From c224b272583e004226bb7371987dc4c7c48d74c1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 750c177980cb7642f1893a9ae4076b631fa6a98f ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ -index 6185b34060..97708b7084 100644 +index 5fb86b50eb..7f0379e471 100644 @@ -19 +20 @@ -@@ -430,7 +430,7 @@ parse_ipv4_5tuple_rule(char *str, struct rte_eth_ntuple_filter *ntuple_filter) +@@ -424,7 +424,7 @@ parse_ipv4_5tuple_rule(char *str, struct rte_eth_ntuple_filter *ntuple_filter)