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 C7149A034F for ; Wed, 10 Nov 2021 07:50:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C125F4068B; Wed, 10 Nov 2021 07:50:07 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2069.outbound.protection.outlook.com [40.107.220.69]) by mails.dpdk.org (Postfix) with ESMTP id 0D3B140E03 for ; Wed, 10 Nov 2021 07:50:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e3hkEtIXZfqypRrZ3WD6RYIBRncI7DWvQEvyWMinbOQ05+imOJtT1GoqVJ4KIX5QoZ3VJQt75T3qdXfL9jdd9USjnM0RvmlcB6J+zxM4NAO558umakB2Y+OqCBQ+SwpE7L7/WPrirx8QHxP9WgZ8hkEr9WkNkIioQ8EIs7VVl2AqMOEWhPBGmBj96rmpxeisrITtcD/q5FCqXxrZXEvYSWTmKDktq2IAfRwB7s7OH3ByE82w5ieq2qeI2LAQAJ4vrMIUuV+NkBkO/zPy5PSCN932jbZ1dLz+s9FHHpbSbSWU7xgGIU922H5pDwd74tw5GgJJhObYvbWzrFCUIYZw4A== 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=O4NWXhzSHZz56MfvvF81Cd2HMucj0xOxAYtFOC0l6ys=; b=J7Ux8kvCySd2C85Gtg/7o8UbyGtKFhw8w5TlDtAlYJaVJva9KI3ftgNBnHW6LJmLtdWqkEIuIzGG7SbOh5KuDJL0oXBWNZD69w1lsw9Tb9NmpsKWpfNDrEmAcWqSFFLpNGNUmI9IMtPPsGmNtSbdQlupjS/cX/t8l5ZVGf++7omSLuy+62XuYbBcNsFvS4wB1BcBJouWQrczh4+NHMAZyLo3FyHXil43jglatYT1X3TVR1f+LuoNo7xDtXcfGgXVIKHIbxbHnFgOeUxMRayNo2TvcFZqGncyCpf5SpXckGwrRkPSxEAZTFHGhl1MbLE4XjqWWxvWEJHHwle+cFCGmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.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=O4NWXhzSHZz56MfvvF81Cd2HMucj0xOxAYtFOC0l6ys=; b=FrpzrgD1xzwlUfRi/p7MzjjEm5sTGvqv+68D4sh+iTzsODutRryS6PB7TRp40js2WgMgaMN0ii+GSYkJoMWePkADLTGXxsP2rt7cURAlqEf99CKYtzjdrnbIpWYGJHWB7bD2mAt94+dNiezokaykXdveY4+tf+8iicRsvUbHCl2Hunj3C/OBzQEwF99x3E/oDJJXIWoatYjijIraVd+k1nCUD9vmf8VUcDRcTrxR+VKsOdsNoCUB5vSptJXhhhhx3X74heyZb6T+/BEDJQaHHU67UOgkvAHC4J8FS8rFcRdAs2Zoe1jD9niUoRvXWPjVLvQygt+DiKZnWmDmEr5XMQ== Received: from BN0PR04CA0081.namprd04.prod.outlook.com (2603:10b6:408:ea::26) by SN6PR12MB4750.namprd12.prod.outlook.com (2603:10b6:805:e3::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 06:50:05 +0000 Received: from BN8NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ea:cafe::7) by BN0PR04CA0081.outlook.office365.com (2603:10b6:408:ea::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:50:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; 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 BN8NAM11FT005.mail.protection.outlook.com (10.13.176.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:50:04 +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; Wed, 10 Nov 2021 06:49:55 +0000 From: Xueming Li To: William Tu CC: Luca Boccassi , Haiyue Wang , dpdk stable Date: Wed, 10 Nov 2021 14:30:41 +0800 Message-ID: <20211110063216.2744012-158-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: 179e523d-daf1-41f8-3e53-08d9a4165388 X-MS-TrafficTypeDiagnostic: SN6PR12MB4750: 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: 0/bYBUYQPD8sZ9RAoPIMAulYDYGzh1DBK+e1anlugNyC/N+OmC0mVdazQ4Xkq+tu+zCT+z5zVRhOaJaz+O3H4fbeVPnoomyrqjFeZ2D2C7N9XcvKCE/KL2q8+TO49O1bs/tii8XXfKc3sWhmZonf2eXXcGrXKbGFixTJ9Q+RpY16k7SC79VSK+2ysp0Sz4w83RSy1Z7nQrdFq3ZtH2/+RpMlJkTmc77nSqrdcwOgpYKHt+0VetdTDlTUji3/6hETyrSN0+IiyfJtjxdfHOpYA6uJ4dVjcpRIGKhTIDLqcIe0WhvDE1efemwoByEJRHTxxoqqzgjA6mq5j6OSCquQ1uXOAwjlL5TCUTO3mLfqqfdgw132RPcJtlitrCwevYRAXt3qHdiGmo+ZnbWrqumejv/58GgVXem8WJvJvL5ePrW9i/gTfPq5xyhnxnn2Wm/obsLW5Fp+5tPqJSdLKFQNTpmmmW6xTU8UmCC5wftSRgZCJpzkw06dL3wsjzSWDPXBUZ/qrlbBqv5tzuLVQUropUdn3MzG3FgKIY/iPjxTlWAfpfehRbBSJ2CNJigSoOiExRMJQCr05qsV6OWzFX1qwMaYTXMm6C/n1phqLat+FM/R6mlNcvAMcwt6tJrEvG2YMZ6I6MMSgfceR0cdQPPksvxB3R260CcMu4UaTnqTgI1Gz4STtBKsJqMa5Z0s2jAZJQefZCm/8xm4EZ3LLso0eEHbptlciMDZmDLd07+5ozvTG4ZWl0pxz7txNQw7ve7BQpL5ITfghGjqrvH1Q5ak8C4YJSw54cpJBs9LWzl7goWxL7n6mgA530Z6l6mMNTNvGShvBWh+z4Dt6v+/g/uhXA== 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)(6286002)(47076005)(55016002)(336012)(82310400003)(4001150100001)(36860700001)(316002)(70586007)(508600001)(5660300002)(1076003)(426003)(83380400001)(54906003)(8676002)(53546011)(70206006)(2906002)(36756003)(186003)(7696005)(966005)(7636003)(16526019)(86362001)(8936002)(4326008)(6666004)(6916009)(26005)(356005)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:50:04.5010 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 179e523d-daf1-41f8-3e53-08d9a4165388 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: BN8NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB4750 Subject: [dpdk-stable] patch 'doc: fix emulated device names in e1000 guide' has been queued to stable release 20.11.4 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.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/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/2cc21f2431f4f68f81023e8f349c00f19f5003cd Thanks. Xueming Li --- >From 2cc21f2431f4f68f81023e8f349c00f19f5003cd Mon Sep 17 00:00:00 2001 From: William Tu Date: Mon, 11 Oct 2021 11:55:40 -0700 Subject: [PATCH] doc: fix emulated device names in e1000 guide Cc: Xueming Li [ upstream commit d2e5ab2b42444cd7149823fbba29a1227fc2b5cb ] The device name should be 82574L Gigabit Ethernet Controller. The patch also remove a redundant "*". Fixes: fc1f2750a3ec ("doc: programmers guide") Signed-off-by: William Tu Acked-by: Haiyue Wang --- doc/guides/nics/e1000em.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/e1000em.rst b/doc/guides/nics/e1000em.rst index b6a2534e36..63c0b1b337 100644 --- a/doc/guides/nics/e1000em.rst +++ b/doc/guides/nics/e1000em.rst @@ -8,9 +8,9 @@ The DPDK EM poll mode driver supports the following emulated devices: * qemu-kvm emulated Intel® 82540EM Gigabit Ethernet Controller (qemu e1000 device) -* VMware* emulated Intel® 82545EM Gigabit Ethernet Controller +* VMware emulated Intel® 82545EM Gigabit Ethernet Controller -* VMware emulated Intel® 8274L Gigabit Ethernet Controller. +* VMware emulated Intel® 82574L Gigabit Ethernet Controller. Validated Hypervisors --------------------- -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:08.930068461 +0800 +++ 0157-doc-fix-emulated-device-names-in-e1000-guide.patch 2021-11-10 14:17:01.964078660 +0800 @@ -1 +1 @@ -From d2e5ab2b42444cd7149823fbba29a1227fc2b5cb Mon Sep 17 00:00:00 2001 +From 2cc21f2431f4f68f81023e8f349c00f19f5003cd Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d2e5ab2b42444cd7149823fbba29a1227fc2b5cb ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 041c9a09a3..5e752a29e5 100644 +index b6a2534e36..63c0b1b337 100644