[dpdk-stable] patch 'mem: fix config name in error logs' has been queued to LTS release 18.11.11

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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/24/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/0521cca7c8c96f88d2dccffce101ea56a568f608

Thanks.

Kevin.

---
>From 0521cca7c8c96f88d2dccffce101ea56a568f608 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Thu, 22 Oct 2020 19:36:21 +0200
Subject: [PATCH] mem: fix config name in error logs

[ upstream commit a796c922d24da9444be9ede24d925d25519602b7 ]

When introducing the new option CONFIG_RTE_MAX_MEM_MB_PER_TYPE,
some logs were referencing a wrong name: CONFIG_RTE_MAX_MEM_PER_TYPE.

Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_eal/bsdapp/eal/eal_memory.c   | 2 +-
 lib/librte_eal/linuxapp/eal/eal_memory.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c
index 418c4bb0aa..79bd221490 100644
--- a/lib/librte_eal/bsdapp/eal/eal_memory.c
+++ b/lib/librte_eal/bsdapp/eal/eal_memory.c
@@ -181,5 +181,5 @@ rte_eal_hugepage_init(void)
 				RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase %s and/or %s in configuration.\n",
 					RTE_STR(CONFIG_RTE_MAX_MEMSEG_PER_TYPE),
-					RTE_STR(CONFIG_RTE_MAX_MEM_PER_TYPE));
+					RTE_STR(CONFIG_RTE_MAX_MEM_MB_PER_TYPE));
 				return -1;
 			}
diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index ac0424582e..e690d0ffd0 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -705,5 +705,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)
 		RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase %s and/or %s in configuration.\n",
 				RTE_STR(CONFIG_RTE_MAX_MEMSEG_PER_TYPE),
-				RTE_STR(CONFIG_RTE_MAX_MEM_PER_TYPE));
+				RTE_STR(CONFIG_RTE_MAX_MEM_MB_PER_TYPE));
 		return -1;
 	}
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-18 16:33:38.709292424 +0000
+++ 0041-mem-fix-config-name-in-error-logs.patch	2020-11-18 16:33:37.941215070 +0000
@@ -1 +1 @@
-From a796c922d24da9444be9ede24d925d25519602b7 Mon Sep 17 00:00:00 2001
+From 0521cca7c8c96f88d2dccffce101ea56a568f608 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a796c922d24da9444be9ede24d925d25519602b7 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -15,2 +16,2 @@
- lib/librte_eal/freebsd/eal_memory.c | 2 +-
- lib/librte_eal/linux/eal_memory.c   | 2 +-
+ lib/librte_eal/bsdapp/eal/eal_memory.c   | 2 +-
+ lib/librte_eal/linuxapp/eal/eal_memory.c | 2 +-
@@ -19,5 +20,5 @@
-diff --git a/lib/librte_eal/freebsd/eal_memory.c b/lib/librte_eal/freebsd/eal_memory.c
-index b8b337a554..8d4b26b9b8 100644
---- a/lib/librte_eal/freebsd/eal_memory.c
-+++ b/lib/librte_eal/freebsd/eal_memory.c
-@@ -175,5 +175,5 @@ rte_eal_hugepage_init(void)
+diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c
+index 418c4bb0aa..79bd221490 100644
+--- a/lib/librte_eal/bsdapp/eal/eal_memory.c
++++ b/lib/librte_eal/bsdapp/eal/eal_memory.c
+@@ -181,5 +181,5 @@ rte_eal_hugepage_init(void)
@@ -30,5 +31,5 @@
-diff --git a/lib/librte_eal/linux/eal_memory.c b/lib/librte_eal/linux/eal_memory.c
-index 3e47efe582..df0f07ee7e 100644
---- a/lib/librte_eal/linux/eal_memory.c
-+++ b/lib/librte_eal/linux/eal_memory.c
-@@ -715,5 +715,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)
+diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
+index ac0424582e..e690d0ffd0 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
++++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
+@@ -705,5 +705,5 @@ remap_segment(struct hugepage_file *hugepages, int seg_start, int seg_end)