[dpdk-stable] patch 'doc: fix some typos in Linux guide' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 07/26/20. 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.

Thanks.

Luca Boccassi

---
>From 423ef2ad5c69a0bbe8039b807e6f597aa5597e19 Mon Sep 17 00:00:00 2001
From: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
Date: Mon, 8 Jun 2020 16:52:07 -0500
Subject: [PATCH] doc: fix some typos in Linux guide

[ upstream commit 5b2b0bd084c4a7096c512465116c471018e4e42f ]

The display was not proper due to the missing space. Changed
arm64 to aarch64.

Fixes: 2eb7c526b929 ("doc: clarify IOMMU disabling for uio_pci_generic")

Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang at arm.com>
---
 doc/guides/linux_gsg/linux_drivers.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst
index 238f3e900..e0816f996 100644
--- a/doc/guides/linux_gsg/linux_drivers.rst
+++ b/doc/guides/linux_gsg/linux_drivers.rst
@@ -52,8 +52,8 @@ be loaded as shown below:
 
    If the devices used for DPDK are bound to the ``uio_pci_generic`` kernel module,
    please make sure that the IOMMU is disabled or passthrough. One can add
-   ``intel_iommu=off`` or ``amd_iommu=off`` or ``intel_iommu=on iommu=pt``in GRUB
-   command line on x86_64 systems, or add ``iommu.passthrough=1`` on arm64 system.
+   ``intel_iommu=off`` or ``amd_iommu=off`` or ``intel_iommu=on iommu=pt`` in GRUB
+   command line on x86_64 systems, or add ``iommu.passthrough=1`` on aarch64 system.
 
 Since DPDK release 1.7 onward provides VFIO support, use of UIO is optional
 for platforms that support using VFIO.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:55.531260261 +0100
+++ 0181-doc-fix-some-typos-in-Linux-guide.patch	2020-07-24 12:53:48.603012347 +0100
@@ -1,13 +1,14 @@
-From 5b2b0bd084c4a7096c512465116c471018e4e42f Mon Sep 17 00:00:00 2001
+From 423ef2ad5c69a0bbe8039b807e6f597aa5597e19 Mon Sep 17 00:00:00 2001
 From: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
 Date: Mon, 8 Jun 2020 16:52:07 -0500
 Subject: [PATCH] doc: fix some typos in Linux guide
 
+[ upstream commit 5b2b0bd084c4a7096c512465116c471018e4e42f ]
+
 The display was not proper due to the missing space. Changed
 arm64 to aarch64.
 
 Fixes: 2eb7c526b929 ("doc: clarify IOMMU disabling for uio_pci_generic")
-Cc: stable at dpdk.org
 
 Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
 Reviewed-by: Ruifeng Wang <ruifeng.wang at arm.com>
@@ -16,10 +17,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst
-index 4eda3d5bf..185074013 100644
+index 238f3e900..e0816f996 100644
 --- a/doc/guides/linux_gsg/linux_drivers.rst
 +++ b/doc/guides/linux_gsg/linux_drivers.rst
-@@ -58,8 +58,8 @@ be loaded as shown below:
+@@ -52,8 +52,8 @@ be loaded as shown below:
  
     If the devices used for DPDK are bound to the ``uio_pci_generic`` kernel module,
     please make sure that the IOMMU is disabled or passthrough. One can add