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 E6FADA0A0E for ; Mon, 10 May 2021 18:16:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E14C240140; Mon, 10 May 2021 18:16:28 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2085.outbound.protection.outlook.com [40.107.94.85]) by mails.dpdk.org (Postfix) with ESMTP id 866D640140 for ; Mon, 10 May 2021 18:16:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E8DPZCetQ3aqoHJO8xHniueDEW2NgqQrfKPQ79C8vGWMe9Mrx6eyE/CffadM6N7fFUhIvFNz0gousYOa5V3kUI3iCRBzpeNQ4CuaZCLUvnA0wyUHMycMiRsYd/UIL1pbhecpWtrK992PfS1yBI/bw2QQOJ9WERR+385HpOUEYdN0GSk6ZNyyESMoJfsS7164lHZrRQ1sHsXkDZFAANESJ78QQuYwT9uFTcocsJaLYswSzJLCLJKaaLH9gRPhKD2b+q/Bma63bhYkXYinkTuu8fJW1gtp+Tmxmyty27l3OJmlezZdn5HMwuxppsOkFnxaP1IXNpi5Iwex98pIH3Y6yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FfDNwVecmb0WAGqkocK9tq1K4jXFayxgYiGkClDTq1k=; b=nw2Ux0qPDIWCEmLRQ/KsNdhQr4IUxmSChf5VECptM5wL9UF4QOcYjk9wF+tFOyKxYWechv7vfcyHag4w6xIQF5qScCrJP/YQ+7i6z8a+AJDiYQ5h5abwkTYRR+2fYhm/bxl6xcjEPNwhvHJGIOuUosGo8fY6wqFfLX5UAb6ej5a6rlOLr3uFTIR5PzGIopXiz/4jAyuPavRhCEZL6mYIeG8aKPrfGkQNMBACmuqmaIizEK6Vo2Y/I4zsdGo2116lm6mf9Ip/8o0gfQWAaTmbZwmbEXXvj8bXo0RHNIOvPFlOfks+HAsI8nJlMpEygt2hdgUfgg/X9+x7C/Nclbd3bg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=oktetlabs.ru smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FfDNwVecmb0WAGqkocK9tq1K4jXFayxgYiGkClDTq1k=; b=CkHKISXFAlusx5yW4tvm/Xp7D6eVfl5a4e9Xtl4qxzQoRT4nxnQ6njLM47GXnqfNFzODhuMQpHWjf4z91VLkJsTzRS36lwBdG+ifgWM1JfXSNDtFZMHiE/zysdRRjKX9K+kQxqkAA8cW5y8zhuXCmEEkKY3734QYWw32Rscq0/6p72R3hyz9c9oY4srJHmLnNbXqDwmgMGiTe8gZ/skLbZspR7z+kB1li4AmhlOM6V/bY77vx111raSg09N5f+zhebJ1+l10d1yk8EgWZjLrIv647sO93Trz3qhQ/7Tsny3pSBt5UlOAaUg+a0+wTnTJ59aT/791DX3wsEW222m8Lw== Received: from DM5PR11CA0020.namprd11.prod.outlook.com (2603:10b6:3:115::30) by SN1PR12MB2590.namprd12.prod.outlook.com (2603:10b6:802:2e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:16:26 +0000 Received: from DM6NAM11FT058.eop-nam11.prod.protection.outlook.com (2603:10b6:3:115:cafe::3f) by DM5PR11CA0020.outlook.office365.com (2603:10b6:3:115::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:16:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; oktetlabs.ru; dkim=none (message not signed) header.d=none;oktetlabs.ru; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT058.mail.protection.outlook.com (10.13.172.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:16:24 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:16:21 +0000 From: Xueming Li To: Thomas Monjalon CC: Luca Boccassi , Ori Kam , "Bruce Richardson" , Andrew Rybchenko , David Marchand , dpdk stable Date: Tue, 11 May 2021 00:01:22 +0800 Message-ID: <20210510160258.30982-133-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 90badb03-5edc-471b-4879-08d913cef564 X-MS-TrafficTypeDiagnostic: SN1PR12MB2590: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cxNr5eJtRrA6LZ5MXMfptJia2HDcJu/7aCK4ruyJOzvMvuCgFDxmOU7GoSX01ISdhiLqy8BF4CECqy5WYQtiqHZ+kZM6jF13xt3WXz7EXKatAmHNILAM5Xlc4DVKcoxV39StM/h9Rr5Npty+bzMzwQMJF+JkhsrRIHUUg6FYjIG16d1A4w2CoLwIwPXXMISwxYjGMFm51w8PX88Zr10zlNRaZq5LCYK9F804003kHIaD5BwBGlDFfzRqoOPEuUPMXzQc5O6W8Jw9dTs9LZrhcztgEUu8ohKxfwSScxll2IGMgZk0aPPrlwRbGFNlqBrdWDu+INdG657yZZ56OdH1msnNAMyNsX9KGOn98D+Rc97iBQBNEE0FdHXQ3ODy6jAE0XkfCiKNRVmNqhBaNfAdfqvkTQi+Xel8jzk8QLm2WR7PkLY9FMJYtZf34h543mFQov61FA78XmoqVPZ2uO2zEmrjlKTN/Wyi/1ZS7TjfbIHbR/zpomU2LBtYkbtq+MmApP6w+vgBJZhhpSPKsRIEp4W4NlSccctbeWJaeO1TCg4P5BgOj57zdh0tVPZKoFkYkdtx9WPSyFtHTSGDkdrzi4Qll4Y2UlrpYWqZiS4n7Op0tzy6uswBYqLbF7Cn47qGDwQbJ4x2DKtidFamwT3x2GRXq0JNRt+3p9RcobWqNtJ0jTSjwRRU2DYbxd/xj1pprUYkrze3/IKgwDE+qNOgQf2Riv2bQEo0prPtoVshcxB+HPHn+2lozwnaZvWn5BG28r50lzFAbhgXPwS/5O0CqA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(136003)(346002)(376002)(396003)(36840700001)(46966006)(6916009)(8676002)(426003)(8936002)(2906002)(83380400001)(82310400003)(1076003)(4326008)(2616005)(336012)(26005)(36860700001)(356005)(53546011)(7636003)(55016002)(70586007)(70206006)(16526019)(316002)(86362001)(7696005)(36756003)(5660300002)(6286002)(82740400003)(186003)(47076005)(478600001)(36906005)(54906003)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:16:24.9557 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 90badb03-5edc-471b-4879-08d913cef564 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT058.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2590 Subject: [dpdk-stable] patch 'app/regex: fix usage text' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/7b581788eec45529377f6f9a645d93bf664cd8a0 Thanks. Xueming Li --- >From 7b581788eec45529377f6f9a645d93bf664cd8a0 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Mon, 5 Apr 2021 21:33:24 +0200 Subject: [PATCH] app/regex: fix usage text Cc: Luca Boccassi [ upstream commit e0512833d4acc6d037fa0ce8d453584618b98019 ] The usage syntax help includes the program name which was fake. It is replaced with the real name from argv. Fixes: de06137cb295 ("app/regex: add RegEx test application") Signed-off-by: Thomas Monjalon Acked-by: Ori Kam Acked-by: Bruce Richardson Acked-by: Andrew Rybchenko Acked-by: David Marchand --- app/test-regex/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-regex/main.c b/app/test-regex/main.c index ac6152dea7..17ff392b1c 100644 --- a/app/test-regex/main.c +++ b/app/test-regex/main.c @@ -105,11 +105,11 @@ args_parse(int argc, char **argv, char *rules_file, char *data_file, *nb_iterations = atoi(optarg); break; case ARG_HELP: - usage("RegEx test app"); + usage(argv[0]); break; default: fprintf(stderr, "Invalid option: %s\n", argv[optind]); - usage("RegEx test app"); + usage(argv[0]); rte_exit(EXIT_FAILURE, "Invalid option\n"); break; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.036958000 +0800 +++ 0134-app-regex-fix-usage-text.patch 2021-05-10 23:59:26.530000000 +0800 @@ -1 +1 @@ -From e0512833d4acc6d037fa0ce8d453584618b98019 Mon Sep 17 00:00:00 2001 +From 7b581788eec45529377f6f9a645d93bf664cd8a0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit e0512833d4acc6d037fa0ce8d453584618b98019 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 18a22db533..8e665df73c 100644 +index ac6152dea7..17ff392b1c 100644 @@ -25,2 +27,2 @@ -@@ -159,10 +159,10 @@ args_parse(int argc, char **argv, char *rules_file, char *data_file, - *nb_segs = atoi(optarg); +@@ -105,11 +105,11 @@ args_parse(int argc, char **argv, char *rules_file, char *data_file, + *nb_iterations = atoi(optarg); @@ -32,0 +35 @@ + fprintf(stderr, "Invalid option: %s\n", argv[optind]); @@ -35 +38 @@ - rte_exit(EXIT_FAILURE, "Invalid option: %s\n", argv[optind]); + rte_exit(EXIT_FAILURE, "Invalid option\n");