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 6F82FA0548 for ; Sun, 28 Nov 2021 15:56:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 66C3E4068A; Sun, 28 Nov 2021 15:56:33 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2051.outbound.protection.outlook.com [40.107.93.51]) by mails.dpdk.org (Postfix) with ESMTP id 1011140FDF for ; Sun, 28 Nov 2021 15:56:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MaM9vu4o1rk97rj7kOJcdLttOU3Ydk2bCpDvY9RvqZdHnJr3tFtOwXfCZRW0C+DCVjBsswbOpa+L00+XPrkSk2VnL2OgRENbBBybDDx5FOttmHU3fd477QOYR9oiv+ntVTThBtQe9Dj95Bzf8av72SO0S/+Qn4BQoTRwQh1T2n02JH/TW1ohPHe+ski1X90zLk+WtDtF1+TlQWB9old3bH/FkviDxKgin2NJYArDqqyXOC4ucUrHX0Y3kft/Krc4zMTDdY1xpVgc8GV3LnC3h0/IuVrjRqLFkluT6UL1MQNTCoqEJpfzC/qSK8PkIEBiGBtSyoEaxCOsNVEQ1KVXwA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=r1lO5iTgwGmdNgo0g8wFViuA2WPeVItdMBRgGiXR0gM=; b=aAjGmDLnAAWkPOMfBxg2QSnkGIsWW5p4SY2f2rhSDar1MliZPgyaw0A2dtzXZ383/FWdm2gMqCCnU/Rk6caGPN2upfuRzmhnJlk1S3uWLr5x9zYDdIDXEqdbeLcHY53FWHnif5kA1pCTrCk0SDiaw9mY2UV+/ZO035q5uCxHIQ82HeLgBc2s6xX9N+jK3HiL7ElHhPrNVbo18Q2wdU3QdLbMGzv2IK0TSSdzdrwcjfBsfCm8MY62m3pkj4nve+7unQb7CcHb+8Ufu0eFAFhHsxvl5p3usdt4pptWyOfv5xjVib0FL3osv4TsYdkZvE8iUbT1Qjykiiui5hSAj/0/uQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=r1lO5iTgwGmdNgo0g8wFViuA2WPeVItdMBRgGiXR0gM=; b=ofIbVlfl/6cHFnXpHk+VgAK7QCmbSh0ZOL6feGfICUYZLXc3O0EOWaZPKEzAuMpYblsXrU5L8Nc8QS7qMm/EQKeM0vQ+gAwKL9Phx/s4iGttMujjNPgHFmp3FuVqAuI3zXgRPwWigxmZYH++u/ykpC9hPGrF0U1kO1RGbZu8gK8eB8AG8aMxOiik2Lbat4yp3yypDicVQTRzMU59qMGrdQfWZBUCJ8CksD89/rWFZGp3STxRfYaz8ZS02nD1PUJAITMLd6TgXBaWZ5zWuc3H34frqFD/bXO3h5pwE190rkYthtq1JcRGnNTOvlRZCBatkUAYEbFdeh2p5+4V9APDyw== Received: from DM6PR03CA0100.namprd03.prod.outlook.com (2603:10b6:5:333::33) by BL1PR12MB5127.namprd12.prod.outlook.com (2603:10b6:208:31b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Sun, 28 Nov 2021 14:56:29 +0000 Received: from DM6NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:5:333:cafe::83) by DM6PR03CA0100.outlook.office365.com (2603:10b6:5:333::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23 via Frontend Transport; Sun, 28 Nov 2021 14:56:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;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 DM6NAM11FT047.mail.protection.outlook.com (10.13.172.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 14:56:29 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov 2021 14:56:27 +0000 From: Xueming Li To: Ferruh Yigit CC: Luca Boccassi , Ori Kam , dpdk stable Subject: patch 'ethdev: fix typos' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:53:20 +0800 Message-ID: <20211128145423.3974892-17-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 91771a04-ec92-4d58-215c-08d9b27f4274 X-MS-TrafficTypeDiagnostic: BL1PR12MB5127: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pZFTUBuA1IW6r5+KalggWHY2xLDEtN7tRvzV8fj0UH0933PIgMS7gtJz04FlRC3kwKODsqZ2BDS1hV9y7ut8aYxSKWQjR9MDd62lO55LkJV2a5TTwwkMEvKQz0UcQ+r5IGpW0/Wou+Mial0iBPtEqmR5AaqL0r3TvvwOWD94olg9Ghwf6cNQXtUD1j9xhxi/naudsPfWMtghrLA7yOhxTDB4h23Jq93PJUgsC522iDw/DEEQUsGmQlTLQ+nyk5JnMxdIWZxdMlJdwTTeJUMs9odX+iI7R03mKq5DyhgC2XQy/hNOYQZQ5G862U3DBzZkn7w5HP/9yPndd5k/zSodeyCnuAf0ZFv1jgVniQvExOFe0ZYtmJEZJ7ng/awp9TF1FgFBO91FY4cbthg0D01T5H29dNvBySpi6Z766qYqADrcxu78rdtMVInRl2xi5OjS6oyU6PmGtwqdge8qbSVKmFUtEyhJCvJiP1zNyDWZrteTxmU0CJ9UqlvOB5xoR+EHjiox9og/HAg+iF5JOJIvv2UexiRfwbSp1LMLEXPjTnkR2/Ld8Xlh/wzgrfpRsGgpnN6TXpI4lAkiaaQuXPf7tMXmOuCjwidN+Gof6fAfUoT0clY1exBEuMB+s/ghMDsk6aJFitprWHFMxQH1DhzbrAqwljiqOcPXCOLah1CHlXNJVnEpaHDLi6MsPCjoh2rvxiA3+VuYFBCJ6Kyt8DplGEa2zAI0m9kYHBbYgyu26/Pvb5QieIAO49lbsMN/mUen76d+nYXBwbc0MGFPToI3Mp+DwcWgIER2+qLWmbF4/KeiRbgFmhi+H3UPaNE2yGp8qOELimo3Si86JyQscFaVUA== 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)(46966006)(36840700001)(7636003)(8936002)(5660300002)(2906002)(54906003)(83380400001)(7696005)(47076005)(4326008)(356005)(316002)(53546011)(6666004)(16526019)(186003)(1076003)(426003)(86362001)(36860700001)(336012)(4001150100001)(966005)(70586007)(70206006)(8676002)(6286002)(36756003)(82310400004)(26005)(55016003)(508600001)(2616005)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 14:56:29.3984 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 91771a04-ec92-4d58-215c-08d9b27f4274 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: DM6NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5127 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 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/30/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/0ed3a7333f7a769fbf6dfae651b12176594b66d6 Thanks. Xueming Li --- >From 0ed3a7333f7a769fbf6dfae651b12176594b66d6 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 12 Nov 2021 12:13:39 +0000 Subject: [PATCH] ethdev: fix typos Cc: Xueming Li [ upstream commit 5139502783ed4e3ccaab49548812b8bdd7fb14b5 ] Fixes: 9039c8125730 ("ethdev: change promiscuous callbacks to return status") Fixes: 12e6e3e78fe0 ("ethdev: add API to dump device internal flow info") Fixes: 44bf3c796be3 ("ethdev: support flow aging") Signed-off-by: Ferruh Yigit Acked-by: Ori Kam --- lib/librte_ethdev/rte_ethdev_driver.h | 4 ++-- lib/librte_ethdev/rte_flow.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev_driver.h b/lib/librte_ethdev/rte_ethdev_driver.h index 0eacfd8425..7ee0f797d3 100644 --- a/lib/librte_ethdev/rte_ethdev_driver.h +++ b/lib/librte_ethdev/rte_ethdev_driver.h @@ -73,7 +73,7 @@ typedef int (*eth_is_removed_t)(struct rte_eth_dev *dev); * @retval -E_RTE_SECONDARY * Function was called from a secondary process instance and not supported. * @retval -ETIMEDOUT - * Attempt to enable promiscuos mode failed because of timeout. + * Attempt to enable promiscuous mode failed because of timeout. * @retval -EAGAIN * Failed to enable promiscuous mode. */ @@ -98,7 +98,7 @@ typedef int (*eth_promiscuous_enable_t)(struct rte_eth_dev *dev); * @retval -E_RTE_SECONDARY * Function was called from a secondary process instance and not supported. * @retval -ETIMEDOUT - * Attempt to disable promiscuos mode failed because of timeout. + * Attempt to disable promiscuous mode failed because of timeout. * @retval -EAGAIN * Failed to disable promiscuous mode. */ diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index 5a45f9fab5..8f9e82ce2d 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -3088,7 +3088,7 @@ enum rte_flow_conv_op { * Perform verbose error reporting if not NULL. PMDs initialize this * structure in case of error only. * @return - * 0 on success, a nagative value otherwise. + * 0 on success, a negative value otherwise. */ __rte_experimental int @@ -3449,7 +3449,7 @@ rte_flow_conv(enum rte_flow_conv_op op, * * RTE_ETH_EVENT_FLOW_AGED event will be triggered when at least one new aged * out flow was detected after the last call to rte_flow_get_aged_flows. - * This function can be called to get the aged flows usynchronously from the + * This function can be called to get the aged flows asynchronously from the * event callback or synchronously regardless the event. * This is not safe to call rte_flow_get_aged_flows function with other flow * functions from multiple threads simultaneously. -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:04.342275193 +0800 +++ 0016-ethdev-fix-typos.patch 2021-11-28 22:41:03.226876003 +0800 @@ -1 +1 @@ -From 5139502783ed4e3ccaab49548812b8bdd7fb14b5 Mon Sep 17 00:00:00 2001 +From 0ed3a7333f7a769fbf6dfae651b12176594b66d6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5139502783ed4e3ccaab49548812b8bdd7fb14b5 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -14,2 +16,2 @@ - lib/ethdev/ethdev_driver.h | 4 ++-- - lib/ethdev/rte_flow.h | 4 ++-- + lib/librte_ethdev/rte_ethdev_driver.h | 4 ++-- + lib/librte_ethdev/rte_flow.h | 4 ++-- @@ -18,5 +20,5 @@ -diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h -index dcbffd4265..d95605a355 100644 ---- a/lib/ethdev/ethdev_driver.h -+++ b/lib/ethdev/ethdev_driver.h -@@ -227,7 +227,7 @@ typedef int (*eth_is_removed_t)(struct rte_eth_dev *dev); +diff --git a/lib/librte_ethdev/rte_ethdev_driver.h b/lib/librte_ethdev/rte_ethdev_driver.h +index 0eacfd8425..7ee0f797d3 100644 +--- a/lib/librte_ethdev/rte_ethdev_driver.h ++++ b/lib/librte_ethdev/rte_ethdev_driver.h +@@ -73,7 +73,7 @@ typedef int (*eth_is_removed_t)(struct rte_eth_dev *dev); @@ -31 +33 @@ -@@ -252,7 +252,7 @@ typedef int (*eth_promiscuous_enable_t)(struct rte_eth_dev *dev); +@@ -98,7 +98,7 @@ typedef int (*eth_promiscuous_enable_t)(struct rte_eth_dev *dev); @@ -40,5 +42,5 @@ -diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h -index ebcd3a3c8e..650376c16d 100644 ---- a/lib/ethdev/rte_flow.h -+++ b/lib/ethdev/rte_flow.h -@@ -3954,7 +3954,7 @@ enum rte_flow_conv_op { +diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h +index 5a45f9fab5..8f9e82ce2d 100644 +--- a/lib/librte_ethdev/rte_flow.h ++++ b/lib/librte_ethdev/rte_flow.h +@@ -3088,7 +3088,7 @@ enum rte_flow_conv_op { @@ -53 +55 @@ -@@ -4316,7 +4316,7 @@ rte_flow_conv(enum rte_flow_conv_op op, +@@ -3449,7 +3449,7 @@ rte_flow_conv(enum rte_flow_conv_op op,