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 7DAF5A0548 for ; Sun, 28 Nov 2021 16:02:51 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6ADE14111B; Sun, 28 Nov 2021 16:02:51 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2086.outbound.protection.outlook.com [40.107.223.86]) by mails.dpdk.org (Postfix) with ESMTP id 1316240FDF for ; Sun, 28 Nov 2021 16:02:49 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LbNy70npNehCkf+lTcdH5RVhPdw23PLd8L9pzcI3FGkWYVOAcsZdGjnd8HuUzi8IU16w3DRApX4Uy7P2QeSQZMIY5CUZdFpHe93aNE79CgUy+qfYRDz9gYQyfYdOC5tvTyL8Hid7a4b7nAqT2wWCrKeUDSHlD61EDMyaqKOcDYSGsRSTX4Aw+FIDQX3YYgfVxbfDCRO1MLbHy6PDbZ8cZKxvT0JlGXgvVVw/YFvKVVcq9rp8OvHGdOpIHuW7nPmXqBmz7CrKCGmWO3ZIFNvQ6uCjqgA3IuR+9Pjx0qmi3tkfqU4iC8FqDy0TxF5z4BOesH6xvy4NFCHI842WZZALgg== 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=UrM1+1xF6+03FqQzUCthspx+cmS0zm7VVPgaiC1H8Pc=; b=UXHMg9mWPljXEWzedfIbCLR7k5inTR33ipZiDIpRVn7lNpbb94hnNc68ZVm3LpqU1G9/20OTIUCCbp1z4gWR4dK8+iSa9+PFYlPiwWqKLX9tuNkupviPUCbIbMfIyZ6anL0+wC12b2vQ2/kgJHRKU5HkiK7laTlbbDfAW2Itb/yRVxqaJmP7tG7V63ty+h0XzQMxTVmeniR6ZiINlllBhbVIBwDfKKV+bfhln40pNaXykWYubeevesTq2dxji0Zyr/i/OVPsVLhPsfq3Fwy549uhbyBJR/Mnp6jRntPiLv+v2uFXlC32q+J6KuGGNtUGFcMoTTeBx9EzbwkU3qmVkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=broadcom.com 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=UrM1+1xF6+03FqQzUCthspx+cmS0zm7VVPgaiC1H8Pc=; b=jXcsbwjP6GxCjssY+oWs9hYOfiVhMqGjMgxj8/Bgr+Ol0EmIdEJMcIk2sRD++I1hEY9UoXCnYGi4wDNGS+raOjw4vKmdo/shAFJ+GO2pBxGOeF/6YMv1a7FmLX52UUj9b77+RjHO3tO85xArx4HMd14YS5E3EYOVFDoLJgR3GLlVzFcLWRnYXJr+biQAVsMnaoIznGSyJAxAQiT5ikHjmfE7PuhszSxcpkm2n2j4CPZOLsee9hlOtdqc3HfeV0d+8pKqhG+TgAv541180rfFaFLRPTeia9997fZM1+K+cW2qoPiy/ZiYkQX+wAKaQKdy53M0bNUx9ZbgU5+82z4tRQ== Received: from BN1PR10CA0017.namprd10.prod.outlook.com (2603:10b6:408:e0::22) by MW2PR12MB4684.namprd12.prod.outlook.com (2603:10b6:302:13::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20; Sun, 28 Nov 2021 15:02:46 +0000 Received: from BN8NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e0:cafe::7) by BN1PR10CA0017.outlook.office365.com (2603:10b6:408:e0::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 15:02:46 +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 BN8NAM11FT056.mail.protection.outlook.com (10.13.177.26) 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 15:02:45 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov 2021 15:02:42 +0000 From: Xueming Li To: Sean Morrissey CC: Luca Boccassi , Conor Fogarty , John McNamara , Conor Walsh , Somnath Kotur , Ferruh Yigit , dpdk stable Subject: patch 'remove repeated 'the' in the code' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:54:18 +0800 Message-ID: <20211128145423.3974892-75-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.5] 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: 983fcdfd-4d8a-465d-bd3c-08d9b280227c X-MS-TrafficTypeDiagnostic: MW2PR12MB4684: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lyBt9HcJA77co9tr5uL4hPsaYng9e2zGF/aq7mP0nfY1pmscXBfqd10Yd+Piw+smjj+ErbLWW8GjeCN+sPDtCXsy47Z5bJOo0MWlKxn62z+y1aFPgsy77hx587b/I/Y3Z/GoK2QMsCbOZfR/skfx7hNwa/m41S+27OWDm6HANEOCduWq4h5mDzCxIm6Z6uHfM8/oRy0CnoF057T0r3imeMzBrLi47hQTY5q6NiER8h/Q27a2DfSSFoHOk0/e0hmnLT3Q85K9eM/omXy6ycQ7w+4b7GrT+b7t6EuXnode22VHyP2hbAGuxpGlZJPpoFtmy3tULRRFf6RXYBIe+LHf+A8YJM6zSZkEfNFu2lVrEgjFiI39ZaUW97KHmWuThSdg4nM8ZMMVUTJtYJEcrcz0iZMAv/kO2AmzhLbTehQJSgeWQhnPFOvXyvs/yBBlIJ4qpWwptxq7w0FPYPI2neHhsoll7RdHI2tK/ja+IPP97Jvm3K8Qa1XuR+AJDnPs92nj/opAmAPaXUCCF29+JPa3oXF3/V2LQlOlyNMhADuvTyzQvBQXfMoqkL6y/+SeEO5ejKsa+skbC1rbgKOjZCTorUHII70y/P9NhNTutAOwLRsWmWQfUimP0WOrS4a7sMyHrVrEM2dv/zYfmOLu8XFPUAVexUPpnJzCJUo+oKv0ocwDlYfWQH8C73+FKikEA1swy10B865l0KlbBwld3D0QTguOMhcBWBjAWl5wohiNCS8H47tY0cJ0UHtAvDM6h1Yk6f3fLFpbPhQ0bik//rGAqu3lT9OFfYPl0agxtjVYLND3fnjqtcHxTJl0rN0qTJAl 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)(36840700001)(46966006)(47076005)(6916009)(336012)(86362001)(5660300002)(36860700001)(16526019)(426003)(966005)(316002)(1076003)(83380400001)(54906003)(30864003)(82310400004)(55016003)(40140700001)(2616005)(8676002)(508600001)(8936002)(4001150100001)(53546011)(4326008)(26005)(2906002)(7696005)(36756003)(186003)(6286002)(6666004)(356005)(70206006)(7636003)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 15:02:45.0575 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 983fcdfd-4d8a-465d-bd3c-08d9b280227c 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: BN8NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB4684 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/05d7a6b2ec668624da604fe0ae0f1415d2f44136 Thanks. Xueming Li --- >From 05d7a6b2ec668624da604fe0ae0f1415d2f44136 Mon Sep 17 00:00:00 2001 From: Sean Morrissey Date: Mon, 22 Nov 2021 10:50:45 +0000 Subject: [PATCH] remove repeated 'the' in the code Cc: Xueming Li [ upstream commit b53d106d34b5c638f5a2cbdfee0da5bd42d4383f ] Remove the use of double "the" as it does not make sense. Signed-off-by: Sean Morrissey Signed-off-by: Conor Fogarty Acked-by: John McNamara Reviewed-by: Conor Walsh Acked-by: Somnath Kotur Reviewed-by: Ferruh Yigit --- app/test/test_barrier.c | 2 +- drivers/bus/vmbus/rte_bus_vmbus.h | 2 +- drivers/common/cpt/cpt_hw_types.h | 2 +- drivers/net/bnx2x/elink.c | 2 +- drivers/net/bnxt/hsi_struct_def_dpdk.h | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- drivers/net/hinic/base/hinic_pmd_hwdev.c | 2 +- drivers/net/i40e/base/i40e_common.c | 2 +- drivers/net/ice/ice_ethdev.h | 2 +- drivers/net/ionic/ionic_if.h | 2 +- drivers/net/mlx5/mlx5_trigger.c | 2 +- lib/librte_bbdev/rte_bbdev_pmd.h | 2 +- lib/librte_compressdev/rte_compressdev_pmd.h | 2 +- lib/librte_cryptodev/rte_cryptodev_pmd.h | 2 +- lib/librte_eventdev/rte_eventdev_pmd.h | 2 +- lib/librte_ip_frag/rte_ipv6_fragmentation.c | 2 +- lib/librte_rawdev/rte_rawdev_pmd.h | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/test/test_barrier.c b/app/test/test_barrier.c index 8fa93c0032..3951370607 100644 --- a/app/test/test_barrier.c +++ b/app/test/test_barrier.c @@ -6,7 +6,7 @@ * This is a simple functional test for rte_smp_mb() implementation. * I.E. make sure that LOAD and STORE operations that precede the * rte_smp_mb() call are globally visible across the lcores - * before the the LOAD and STORE operations that follows it. + * before the LOAD and STORE operations that follows it. * The test uses simple implementation of Peterson's lock algorithm * (https://en.wikipedia.org/wiki/Peterson%27s_algorithm) * for two execution units to make sure that rte_smp_mb() prevents diff --git a/drivers/bus/vmbus/rte_bus_vmbus.h b/drivers/bus/vmbus/rte_bus_vmbus.h index 4cf73ce815..81b17817f1 100644 --- a/drivers/bus/vmbus/rte_bus_vmbus.h +++ b/drivers/bus/vmbus/rte_bus_vmbus.h @@ -292,7 +292,7 @@ struct iova_list { * @param data * Pointer to the buffer additional data to send * @param dlen - * Maximum size of what the the buffer will hold + * Maximum size of what the buffer will hold * @param xact * Identifier of the request * @param flags diff --git a/drivers/common/cpt/cpt_hw_types.h b/drivers/common/cpt/cpt_hw_types.h index a1f969eb14..522844c351 100644 --- a/drivers/common/cpt/cpt_hw_types.h +++ b/drivers/common/cpt/cpt_hw_types.h @@ -466,7 +466,7 @@ typedef union { uint64_t dbell_cnt : 20; /** [ 19: 0](R/W/H) Number of instruction queue 64-bit words * to add to the CPT instruction doorbell count. Readback value - * is the the current number of pending doorbell requests. + * is the current number of pending doorbell requests. * * If counter overflows CPT()_VQ()_MISC_INT[DBELL_DOVF] is set. * diff --git a/drivers/net/bnx2x/elink.c b/drivers/net/bnx2x/elink.c index b65126d718..2093d8f373 100644 --- a/drivers/net/bnx2x/elink.c +++ b/drivers/net/bnx2x/elink.c @@ -15013,7 +15013,7 @@ static void elink_check_kr2_wa(struct elink_params *params, /* Once KR2 was disabled, wait 5 seconds before checking KR2 recovery * Since some switches tend to reinit the AN process and clear the - * the advertised BP/NP after ~2 seconds causing the KR2 to be disabled + * advertised BP/NP after ~2 seconds causing the KR2 to be disabled * and recovered many times */ if (vars->check_kr2_recovery_cnt > 0) { diff --git a/drivers/net/bnxt/hsi_struct_def_dpdk.h b/drivers/net/bnxt/hsi_struct_def_dpdk.h index 4b8b13e3bb..81fc68d0c9 100644 --- a/drivers/net/bnxt/hsi_struct_def_dpdk.h +++ b/drivers/net/bnxt/hsi_struct_def_dpdk.h @@ -13591,7 +13591,7 @@ struct hwrm_func_resource_qcaps_output { #define HWRM_FUNC_RESOURCE_QCAPS_OUTPUT_VF_RESERVATION_STRATEGY_MINIMAL \ UINT32_C(0x1) /* - * The PF driver should not reserve any resources for each VF until the + * The PF driver should not reserve any resources for each VF until * the VF interface is brought up. */ #define HWRM_FUNC_RESOURCE_QCAPS_OUTPUT_VF_RESERVATION_STRATEGY_MINIMAL_STATIC \ diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index fb430be549..44b2e684d2 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3498,7 +3498,7 @@ bond_ethdev_configure(struct rte_eth_dev *dev) /* * If RSS is enabled, fill table with default values and - * set key to the the value specified in port RSS configuration. + * set key to the value specified in port RSS configuration. * Fall back to default RSS key if the key is not specified */ if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) { diff --git a/drivers/net/hinic/base/hinic_pmd_hwdev.c b/drivers/net/hinic/base/hinic_pmd_hwdev.c index 41c99bdbf8..4c2242ddaf 100644 --- a/drivers/net/hinic/base/hinic_pmd_hwdev.c +++ b/drivers/net/hinic/base/hinic_pmd_hwdev.c @@ -826,7 +826,7 @@ static int set_vf_dma_attr_entry(struct hinic_hwdev *hwdev, u8 entry_idx, } /** - * dma_attr_table_init - initialize the the default dma attributes + * dma_attr_table_init - initialize the default dma attributes * @hwdev: the pointer to the private hardware device object */ static int dma_attr_table_init(struct hinic_hwdev *hwdev) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 6376e685e4..f11d25d0d8 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -5862,7 +5862,7 @@ enum i40e_status_code i40e_aq_add_cloud_filters(struct i40e_hw *hw, * @filter_count: number of filters contained in the buffer * * Set the cloud filters for a given VSI. The contents of the - * i40e_aqc_cloud_filters_element_bb are filled in by the caller of the + * i40e_aqc_cloud_filters_element_bb are filled in by the caller of * the function. * **/ diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index cba2e46eff..b3e518fcbc 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -222,7 +222,7 @@ struct ice_vsi { * needs to add, HW needs to know the layout that VSIs are organized. * Besides that, VSI isan element and can't switch packets, which needs * to add new component VEB to perform switching. So, a new VSI needs - * to specify the the uplink VSI (Parent VSI) before created. The + * to specify the uplink VSI (Parent VSI) before created. The * uplink VSI will check whether it had a VEB to switch packets. If no, * it will try to create one. Then, uplink VSI will move the new VSI * into its' sib_vsi_list to manage all the downlink VSI. diff --git a/drivers/net/ionic/ionic_if.h b/drivers/net/ionic/ionic_if.h index f83c8711b1..673cf19f27 100644 --- a/drivers/net/ionic/ionic_if.h +++ b/drivers/net/ionic/ionic_if.h @@ -604,7 +604,7 @@ enum ionic_txq_desc_opcode { * * Offload 16-bit checksum computation to hardware. * If @csum_l3 is set then the packet's L3 checksum is - * updated. Similarly, if @csum_l4 is set the the L4 + * updated. Similarly, if @csum_l4 is set the L4 * checksum is updated. If @encap is set then encap header * checksums are also updated. * diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index 98055efd50..92eaef87d1 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -812,7 +812,7 @@ error: /* * Unbind the hairpin port pair, HW configuration of both devices will be clear - * and status will be reset for all the queues used between the them. + * and status will be reset for all the queues used between them. * This function only supports to unbind the Tx from one Rx. * * @param dev diff --git a/lib/librte_bbdev/rte_bbdev_pmd.h b/lib/librte_bbdev/rte_bbdev_pmd.h index 237e3361d7..b8a5cb4015 100644 --- a/lib/librte_bbdev/rte_bbdev_pmd.h +++ b/lib/librte_bbdev/rte_bbdev_pmd.h @@ -76,7 +76,7 @@ struct rte_bbdev * rte_bbdev_get_named_dev(const char *name); /** - * Definitions of all functions exported by a driver through the the generic + * Definitions of all functions exported by a driver through the generic * structure of type *rte_bbdev_ops* supplied in the *rte_bbdev* structure * associated with a device. */ diff --git a/lib/librte_compressdev/rte_compressdev_pmd.h b/lib/librte_compressdev/rte_compressdev_pmd.h index 16b6bc6b35..b2a0e25001 100644 --- a/lib/librte_compressdev/rte_compressdev_pmd.h +++ b/lib/librte_compressdev/rte_compressdev_pmd.h @@ -64,7 +64,7 @@ struct rte_compressdev * rte_compressdev_pmd_get_named_dev(const char *name); /** - * Definitions of all functions exported by a driver through the + * Definitions of all functions exported by a driver through * the generic structure of type *comp_dev_ops* supplied in the * *rte_compressdev* structure associated with a device. */ diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h index 1274436870..96bea17c92 100644 --- a/lib/librte_cryptodev/rte_cryptodev_pmd.h +++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h @@ -113,7 +113,7 @@ extern struct rte_cryptodev *rte_cryptodevs; /** * Definitions of all functions exported by a driver through the - * the generic structure of type *crypto_dev_ops* supplied in the + * generic structure of type *crypto_dev_ops* supplied in the * *rte_cryptodev* structure associated with a device. */ diff --git a/lib/librte_eventdev/rte_eventdev_pmd.h b/lib/librte_eventdev/rte_eventdev_pmd.h index 7eb9a77393..5e1c836eb7 100644 --- a/lib/librte_eventdev/rte_eventdev_pmd.h +++ b/lib/librte_eventdev/rte_eventdev_pmd.h @@ -147,7 +147,7 @@ rte_event_pmd_is_valid_dev(uint8_t dev_id) /** * Definitions of all functions exported by a driver through the - * the generic structure of type *event_dev_ops* supplied in the + * generic structure of type *event_dev_ops* supplied in the * *rte_eventdev* structure associated with a device. */ diff --git a/lib/librte_ip_frag/rte_ipv6_fragmentation.c b/lib/librte_ip_frag/rte_ipv6_fragmentation.c index 5d67336f2d..a512c90955 100644 --- a/lib/librte_ip_frag/rte_ipv6_fragmentation.c +++ b/lib/librte_ip_frag/rte_ipv6_fragmentation.c @@ -90,7 +90,7 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in, /* * Ensure the IP payload length of all fragments (except the - * the last fragment) are a multiple of 8 bytes per RFC2460. + * last fragment) are a multiple of 8 bytes per RFC2460. */ frag_size = mtu_size - sizeof(struct rte_ipv6_hdr) - diff --git a/lib/librte_rawdev/rte_rawdev_pmd.h b/lib/librte_rawdev/rte_rawdev_pmd.h index b1bed13ee2..3b7be57d3e 100644 --- a/lib/librte_rawdev/rte_rawdev_pmd.h +++ b/lib/librte_rawdev/rte_rawdev_pmd.h @@ -126,7 +126,7 @@ rte_rawdev_pmd_is_valid_dev(uint8_t dev_id) } /** - * Definitions of all functions exported by a driver through the + * Definitions of all functions exported by a driver through * the generic structure of type *rawdev_ops* supplied in the * *rte_rawdev* structure associated with a device. */ -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:06.963952041 +0800 +++ 0074-remove-repeated-the-in-the-code.patch 2021-11-28 22:41:03.500204388 +0800 @@ -1 +1 @@ -From b53d106d34b5c638f5a2cbdfee0da5bd42d4383f Mon Sep 17 00:00:00 2001 +From 05d7a6b2ec668624da604fe0ae0f1415d2f44136 Mon Sep 17 00:00:00 2001 @@ -4,0 +5 @@ +Cc: Xueming Li @@ -6 +7 @@ -Remove the use of double "the" as it does not make sense. +[ upstream commit b53d106d34b5c638f5a2cbdfee0da5bd42d4383f ] @@ -8 +9 @@ -Cc: stable@dpdk.org +Remove the use of double "the" as it does not make sense. @@ -17,17 +18,17 @@ - app/test/test_barrier.c | 2 +- - drivers/bus/vmbus/rte_bus_vmbus.h | 2 +- - drivers/common/cpt/cpt_hw_types.h | 2 +- - drivers/net/bnx2x/elink.c | 2 +- - drivers/net/bnxt/hsi_struct_def_dpdk.h | 2 +- - drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- - drivers/net/hinic/base/hinic_pmd_hwdev.c | 2 +- - drivers/net/i40e/base/i40e_common.c | 2 +- - drivers/net/ice/ice_ethdev.h | 2 +- - drivers/net/ionic/ionic_if.h | 2 +- - drivers/net/mlx5/mlx5_trigger.c | 2 +- - lib/bbdev/rte_bbdev_pmd.h | 2 +- - lib/compressdev/rte_compressdev_pmd.h | 2 +- - lib/cryptodev/cryptodev_pmd.h | 2 +- - lib/eventdev/eventdev_pmd.h | 2 +- - lib/ip_frag/rte_ipv6_fragmentation.c | 2 +- - lib/rawdev/rte_rawdev_pmd.h | 2 +- + app/test/test_barrier.c | 2 +- + drivers/bus/vmbus/rte_bus_vmbus.h | 2 +- + drivers/common/cpt/cpt_hw_types.h | 2 +- + drivers/net/bnx2x/elink.c | 2 +- + drivers/net/bnxt/hsi_struct_def_dpdk.h | 2 +- + drivers/net/bonding/rte_eth_bond_pmd.c | 2 +- + drivers/net/hinic/base/hinic_pmd_hwdev.c | 2 +- + drivers/net/i40e/base/i40e_common.c | 2 +- + drivers/net/ice/ice_ethdev.h | 2 +- + drivers/net/ionic/ionic_if.h | 2 +- + drivers/net/mlx5/mlx5_trigger.c | 2 +- + lib/librte_bbdev/rte_bbdev_pmd.h | 2 +- + lib/librte_compressdev/rte_compressdev_pmd.h | 2 +- + lib/librte_cryptodev/rte_cryptodev_pmd.h | 2 +- + lib/librte_eventdev/rte_eventdev_pmd.h | 2 +- + lib/librte_ip_frag/rte_ipv6_fragmentation.c | 2 +- + lib/librte_rawdev/rte_rawdev_pmd.h | 2 +- @@ -37 +38 @@ -index 9641133ccf..6d6d48749c 100644 +index 8fa93c0032..3951370607 100644 @@ -50 +51 @@ -index 466d42d277..a24bad831d 100644 +index 4cf73ce815..81b17817f1 100644 @@ -53 +54 @@ -@@ -291,7 +291,7 @@ struct iova_list { +@@ -292,7 +292,7 @@ struct iova_list { @@ -89 +90 @@ -index 0c08171dec..88624f8129 100644 +index 4b8b13e3bb..81fc68d0c9 100644 @@ -92 +93 @@ -@@ -14998,7 +14998,7 @@ struct hwrm_func_resource_qcaps_output { +@@ -13591,7 +13591,7 @@ struct hwrm_func_resource_qcaps_output { @@ -102 +103 @@ -index 9bbe1291bc..84f4900ee5 100644 +index fb430be549..44b2e684d2 100644 @@ -113 +114 @@ - if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS) { + if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) { @@ -115 +116 @@ -index 80f9eb5c30..5eb022297e 100644 +index 41c99bdbf8..4c2242ddaf 100644 @@ -128 +129 @@ -index baa51e1396..9eee104063 100644 +index 6376e685e4..f11d25d0d8 100644 @@ -131 +132 @@ -@@ -5969,7 +5969,7 @@ enum i40e_status_code i40e_aq_add_cloud_filters(struct i40e_hw *hw, +@@ -5862,7 +5862,7 @@ enum i40e_status_code i40e_aq_add_cloud_filters(struct i40e_hw *hw, @@ -141 +142 @@ -index 11f7eb4352..2e3e45f3d7 100644 +index cba2e46eff..b3e518fcbc 100644 @@ -144 +145 @@ -@@ -242,7 +242,7 @@ struct ice_vsi { +@@ -222,7 +222,7 @@ struct ice_vsi { @@ -154 +155 @@ -index ba4cc4b724..693b44d764 100644 +index f83c8711b1..673cf19f27 100644 @@ -157,2 +158,2 @@ -@@ -684,7 +684,7 @@ enum ionic_txq_desc_opcode { - * IONIC_TXQ_DESC_OPCODE_CSUM_HW: +@@ -604,7 +604,7 @@ enum ionic_txq_desc_opcode { + * @@ -167 +168 @@ -index 68df3f8b4d..74c9c0a4ff 100644 +index 98055efd50..92eaef87d1 100644 @@ -170 +171 @@ -@@ -853,7 +853,7 @@ error: +@@ -812,7 +812,7 @@ error: @@ -179,5 +180,5 @@ -diff --git a/lib/bbdev/rte_bbdev_pmd.h b/lib/bbdev/rte_bbdev_pmd.h -index dd0e35994c..3da7a2bdf5 100644 ---- a/lib/bbdev/rte_bbdev_pmd.h -+++ b/lib/bbdev/rte_bbdev_pmd.h -@@ -70,7 +70,7 @@ struct rte_bbdev * +diff --git a/lib/librte_bbdev/rte_bbdev_pmd.h b/lib/librte_bbdev/rte_bbdev_pmd.h +index 237e3361d7..b8a5cb4015 100644 +--- a/lib/librte_bbdev/rte_bbdev_pmd.h ++++ b/lib/librte_bbdev/rte_bbdev_pmd.h +@@ -76,7 +76,7 @@ struct rte_bbdev * @@ -192 +193 @@ -diff --git a/lib/compressdev/rte_compressdev_pmd.h b/lib/compressdev/rte_compressdev_pmd.h +diff --git a/lib/librte_compressdev/rte_compressdev_pmd.h b/lib/librte_compressdev/rte_compressdev_pmd.h @@ -194,2 +195,2 @@ ---- a/lib/compressdev/rte_compressdev_pmd.h -+++ b/lib/compressdev/rte_compressdev_pmd.h +--- a/lib/librte_compressdev/rte_compressdev_pmd.h ++++ b/lib/librte_compressdev/rte_compressdev_pmd.h @@ -205,5 +206,5 @@ -diff --git a/lib/cryptodev/cryptodev_pmd.h b/lib/cryptodev/cryptodev_pmd.h -index 89bf2af399..1bca24e74e 100644 ---- a/lib/cryptodev/cryptodev_pmd.h -+++ b/lib/cryptodev/cryptodev_pmd.h -@@ -159,7 +159,7 @@ rte_cryptodev_pmd_get_named_dev(const char *name); +diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h +index 1274436870..96bea17c92 100644 +--- a/lib/librte_cryptodev/rte_cryptodev_pmd.h ++++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h +@@ -113,7 +113,7 @@ extern struct rte_cryptodev *rte_cryptodevs; @@ -218,5 +219,5 @@ -diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h -index 4787df7ba0..d0b0c00a60 100644 ---- a/lib/eventdev/eventdev_pmd.h -+++ b/lib/eventdev/eventdev_pmd.h -@@ -237,7 +237,7 @@ rte_event_pmd_is_valid_dev(uint8_t dev_id) +diff --git a/lib/librte_eventdev/rte_eventdev_pmd.h b/lib/librte_eventdev/rte_eventdev_pmd.h +index 7eb9a77393..5e1c836eb7 100644 +--- a/lib/librte_eventdev/rte_eventdev_pmd.h ++++ b/lib/librte_eventdev/rte_eventdev_pmd.h +@@ -147,7 +147,7 @@ rte_event_pmd_is_valid_dev(uint8_t dev_id) @@ -231,4 +232,4 @@ -diff --git a/lib/ip_frag/rte_ipv6_fragmentation.c b/lib/ip_frag/rte_ipv6_fragmentation.c -index 88f29c158c..2e692418b5 100644 ---- a/lib/ip_frag/rte_ipv6_fragmentation.c -+++ b/lib/ip_frag/rte_ipv6_fragmentation.c +diff --git a/lib/librte_ip_frag/rte_ipv6_fragmentation.c b/lib/librte_ip_frag/rte_ipv6_fragmentation.c +index 5d67336f2d..a512c90955 100644 +--- a/lib/librte_ip_frag/rte_ipv6_fragmentation.c ++++ b/lib/librte_ip_frag/rte_ipv6_fragmentation.c @@ -244 +245 @@ -diff --git a/lib/rawdev/rte_rawdev_pmd.h b/lib/rawdev/rte_rawdev_pmd.h +diff --git a/lib/librte_rawdev/rte_rawdev_pmd.h b/lib/librte_rawdev/rte_rawdev_pmd.h @@ -246,2 +247,2 @@ ---- a/lib/rawdev/rte_rawdev_pmd.h -+++ b/lib/rawdev/rte_rawdev_pmd.h +--- a/lib/librte_rawdev/rte_rawdev_pmd.h ++++ b/lib/librte_rawdev/rte_rawdev_pmd.h