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 03E1DA00C5 for ; Wed, 20 Jul 2022 10:22:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EFCD340697; Wed, 20 Jul 2022 10:22:39 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2079.outbound.protection.outlook.com [40.107.96.79]) by mails.dpdk.org (Postfix) with ESMTP id 5C9414003C for ; Wed, 20 Jul 2022 10:22:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eFGE+SP2AMEXThn3h2JAXtJv4CHIx0wQoXnkrp289zCPsEod3XlBEyykLDaZjHEk5nBnsmNsppQ5LzDCCPrGzipJvKOl+IHbuKGn9cnHUOS4OWfJXqyribL5KzRa/CmAvgZhciGSQWJY8iOcq6K7A/eID7WDFDc3WJp3+wh2qbx7Ay6bscLHO9QcvGmzHLji4EHkecNkVd8OFa9EP3vXrD6EnzGAtkWdxIleBe8nqQNWp5+4PCH/fi9jrWhx1JxUaULMnT6I3iSOrAjzG208e2L4NafxBibNePGGJ3Qvvzpi6SGglR0/roNtYsg4D0EZuXIvwJpe1sGDU6uq5lGNvQ== 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=B6CQ2v+cGy3zB6vxN6phH/Zdo9+tCmTJgfdGMzycQNs=; b=NFZxODmUuFRG2fuhjGyed2SWjIMoCdd0G4cLTw5JQmWjAYk0Oy1BvWGD5OdsEdvo68uYRFpTkVzESTQU/1zM19NZz/h1iG9QJSD/bMuaHVs4kc4wBWaAiwGeQZR0+H6GKuiY31ltYEGhCXvGVVKdg9Xu2Y3XvHfJ5/GsDEFV6mrHPkNwdT6yPJgjFlafCGMU+eGvnt5dnxWZyp6eKQSiX4GiZnLSI3MPmazP8hmbSqjUPMPoHL+wIwT3TeGXIKoK8IsHkdsQhJad7l6pa2uLnB5D3kHeWAVkywoUiUOcbUUxAy8qvy4IoQHlOfurSsNp6Yh+/5c98Cc6dd69hvujsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=B6CQ2v+cGy3zB6vxN6phH/Zdo9+tCmTJgfdGMzycQNs=; b=sW3dG8tHjIp5gmFAoeLEAEdAwhZHUh1BcgevnuYG59UWSH8SoBo3kuPx0na56DmVd1GMRPDWtMJkaw+20sIumJTtj/bsOY+6tcGJnd+YVbgKEqRWt+9bNi6cIdGP2kUJGDNruFWi3NBoYpgmAvUNQtmbw/RPOx3mDyJGjyJf9jRhLsExvq/ZatQLunYcDbrtUb+2sfwwM7Gx3W9YMPx0AhvzdE5CWdx1o5+ckYCcGtWo49FsgVfAFHBbU/hUs/6JBVcqZqCnCGBhDCXnjoioGSpfAC00Wcqhjc+VEo9UHzV9zy+I5U1JCBZ9FmVMjIrAfWvEKSPgi4cYSrcAuH6P3g== Received: from BN9PR03CA0341.namprd03.prod.outlook.com (2603:10b6:408:f6::16) by MWHPR1201MB0239.namprd12.prod.outlook.com (2603:10b6:301:50::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.20; Wed, 20 Jul 2022 08:22:36 +0000 Received: from BN8NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f6:cafe::7b) by BN9PR03CA0341.outlook.office365.com (2603:10b6:408:f6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.22 via Frontend Transport; Wed, 20 Jul 2022 08:22:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by BN8NAM11FT040.mail.protection.outlook.com (10.13.177.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:22:35 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:22:34 +0000 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 20 Jul 2022 01:22:33 -0700 From: Xueming Li To: Nicolas Chautru CC: , Maxime Coquelin , "dpdk stable" Subject: patch 'baseband/acc100: remove RTE prefix for internal macros' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:20:36 +0300 Message-ID: <20220720082132.3954126-7-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 45fadc59-d98c-45aa-02e7-08da6a290025 X-MS-TrafficTypeDiagnostic: MWHPR1201MB0239:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3d5mF8j7xoyK/bhDyTPcxOOL9DCdt+tBeQfCa2ngID8adUKSTDll4abzWeeP?= =?us-ascii?Q?Lo/GXiQsoiV4Kngcn8WtDTXgHiyhp6FWc/YlGzZtWWAQMyDICXLjuY+gialw?= =?us-ascii?Q?N7W6Ccl3Uv66QgGWeDp8XgAS9f+WFcuOe1QR3ntALkYkz+k0KOSDCWkfyBkL?= =?us-ascii?Q?MRW11O60l0FB4YcP0JUkWK7Yn/nHlkxU4VtaQ4D1ukiczrfUk8rvZdaTuisD?= =?us-ascii?Q?73p/e12nIIdzAqXlp0lyxV/AuOXQIxSLucUc7SP3+zNCL6ZAhdaA7sqHX6Z8?= =?us-ascii?Q?0mSu7QGk4Ww1pcKgwJUFUyXepZE3ixBaXBSU+zr+SPCn2suOUSJoL/vb8FOU?= =?us-ascii?Q?RJbb2rsONGCbmMbovdD/AaJV16A5gtQoIDO1nHx0z4UoIAKqE7YOU2IxOVmM?= =?us-ascii?Q?RqkaTYsse3rUBjXhTyXSvag1pNIfPdUb632K4SusosBKbtGM4BUI4mA/aUwY?= =?us-ascii?Q?gyzE2Cz+1LusgMk7TEFtKNnUi2lfBwqKiNQwJ1fnl0pcSzuzm/hpeANFA6W7?= =?us-ascii?Q?/rjyuK6jPzU5XyUGwkLK+db/4snCUEtvWbsdKu0PQ+xwN0uLhT0zb+r1qxnn?= =?us-ascii?Q?b1zuAjZD3F5y07mDISfA7sn11CfK5zypxGGpYL5mTEKrEtkhIKYr/Dd31pxl?= =?us-ascii?Q?r2h64BWbpKnb3EfU3EykSRiSMBOyjmyAwk/4JGR8r+fI4FmP0tpTS1y8z5p3?= =?us-ascii?Q?780n6lCRLThZla6hEl+Q/19LWO8T+Krs33MDGzrk5OQS++yW1Ov+lJDbuf9M?= =?us-ascii?Q?UtAYsLccII90JD3jyW7H6rXwwV8grwualEjuBGs0gZ5BHwrgnWiTpa26wr2C?= =?us-ascii?Q?drKE42ysElbGydaXR1d4rbCWIgxSmMoFUdeEUt7c1AgK23LzZ3mLdG4yma4q?= =?us-ascii?Q?s5Uwz3vyLTy4qiuG0hKUoxj85Q3VAVFg2R4+ptyHHRRfKRIzWwFfxNvOSRkP?= =?us-ascii?Q?OohXUMv0k6J8pvYvBvsYYw=3D=3D?= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(376002)(136003)(396003)(40470700004)(46966006)(36840700001)(86362001)(53546011)(426003)(356005)(36756003)(81166007)(82740400003)(7696005)(16526019)(1076003)(26005)(2616005)(966005)(336012)(6286002)(186003)(41300700001)(47076005)(478600001)(70206006)(8936002)(5660300002)(316002)(70586007)(54906003)(4326008)(6916009)(40460700003)(55016003)(8676002)(83380400001)(82310400005)(2906002)(40480700001)(36860700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:22:35.3256 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45fadc59-d98c-45aa-02e7-08da6a290025 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1201MB0239 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/22/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/0af3e2fef90cc20ea801e27d6755c5772f0151bf Thanks. Xueming Li --- >From 0af3e2fef90cc20ea801e27d6755c5772f0151bf Mon Sep 17 00:00:00 2001 From: Nicolas Chautru Date: Tue, 31 May 2022 15:31:44 -0700 Subject: [PATCH] baseband/acc100: remove RTE prefix for internal macros Cc: Xueming Li [ upstream commit 7936b764ecb91b58dfd7b1d81a053fa085e7eef8 ] Cosmetic update to remove RTE_ prefix for a define kept internal. Signed-off-by: Nicolas Chautru Reviewed-by: Maxime Coquelin --- drivers/baseband/acc100/rte_acc100_pmd.c | 4 ++-- drivers/baseband/acc100/rte_acc100_pmd.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c index cc3f54ef29..9254207969 100644 --- a/drivers/baseband/acc100/rte_acc100_pmd.c +++ b/drivers/baseband/acc100/rte_acc100_pmd.c @@ -1131,7 +1131,7 @@ static const struct rte_bbdev_ops acc100_bbdev_ops = { /* ACC100 PCI PF address map */ static struct rte_pci_id pci_id_acc100_pf_map[] = { { - RTE_PCI_DEVICE(RTE_ACC100_VENDOR_ID, RTE_ACC100_PF_DEVICE_ID) + RTE_PCI_DEVICE(ACC100_VENDOR_ID, ACC100_PF_DEVICE_ID) }, {.device_id = 0}, }; @@ -1139,7 +1139,7 @@ static struct rte_pci_id pci_id_acc100_pf_map[] = { /* ACC100 PCI VF address map */ static struct rte_pci_id pci_id_acc100_vf_map[] = { { - RTE_PCI_DEVICE(RTE_ACC100_VENDOR_ID, RTE_ACC100_VF_DEVICE_ID) + RTE_PCI_DEVICE(ACC100_VENDOR_ID, ACC100_VF_DEVICE_ID) }, {.device_id = 0}, }; diff --git a/drivers/baseband/acc100/rte_acc100_pmd.h b/drivers/baseband/acc100/rte_acc100_pmd.h index 071b37cf9d..b3956e9928 100644 --- a/drivers/baseband/acc100/rte_acc100_pmd.h +++ b/drivers/baseband/acc100/rte_acc100_pmd.h @@ -27,9 +27,9 @@ #define ACC100VF_DRIVER_NAME intel_acc100_vf /* ACC100 PCI vendor & device IDs */ -#define RTE_ACC100_VENDOR_ID (0x8086) -#define RTE_ACC100_PF_DEVICE_ID (0x0d5c) -#define RTE_ACC100_VF_DEVICE_ID (0x0d5d) +#define ACC100_VENDOR_ID (0x8086) +#define ACC100_PF_DEVICE_ID (0x0d5c) +#define ACC100_VF_DEVICE_ID (0x0d5d) /* Values used in filling in descriptors */ #define ACC100_DMA_DESC_TYPE 2 -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:00:59.135449358 +0800 +++ 0007-baseband-acc100-remove-RTE-prefix-for-internal-macro.patch 2022-07-20 15:00:58.654333922 +0800 @@ -1 +1 @@ -From 7936b764ecb91b58dfd7b1d81a053fa085e7eef8 Mon Sep 17 00:00:00 2001 +From 0af3e2fef90cc20ea801e27d6755c5772f0151bf Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7936b764ecb91b58dfd7b1d81a053fa085e7eef8 ] @@ -17 +20 @@ -index 32c8bc2b34..210028bb15 100644 +index cc3f54ef29..9254207969 100644 @@ -20 +23 @@ -@@ -1133,7 +1133,7 @@ static const struct rte_bbdev_ops acc100_bbdev_ops = { +@@ -1131,7 +1131,7 @@ static const struct rte_bbdev_ops acc100_bbdev_ops = { @@ -29 +32 @@ -@@ -1141,7 +1141,7 @@ static struct rte_pci_id pci_id_acc100_pf_map[] = { +@@ -1139,7 +1139,7 @@ static struct rte_pci_id pci_id_acc100_pf_map[] = {