[dpdk-stable] patch 'doc: fix emulated device names in e1000 guide' has been queued to stable release 20.11.4

[Xueming Li]

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 <xuemingl at nvidia.com>

---
>From 2cc21f2431f4f68f81023e8f349c00f19f5003cd Mon Sep 17 00:00:00 2001
From: William Tu <u9012063 at gmail.com>
Date: Mon, 11 Oct 2021 11:55:40 -0700
Subject: [PATCH] doc: fix emulated device names in e1000 guide
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 <u9012063 at gmail.com>
Acked-by: Haiyue Wang <haiyue.wang at intel.com>
---
 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 <xuemingl at nvidia.com>
+
+[ upstream commit d2e5ab2b42444cd7149823fbba29a1227fc2b5cb ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index 041c9a09a3..5e752a29e5 100644
+index b6a2534e36..63c0b1b337 100644