[dpdk-stable] patch 'build: remove unneeded meson option' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 12/17/19. 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/02c22bcda42a57a49b432bd7a20c08d9997958e4

Thanks.

Kevin.

---
>From 02c22bcda42a57a49b432bd7a20c08d9997958e4 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 19 Nov 2019 13:59:23 +0100
Subject: [PATCH] build: remove unneeded meson option

[ upstream commit 8980d7da64693e5115324cbd9880b94012064d6b ]

The meson option has been missed when removing this code.

Fixes: 8e35792c5325 ("eal: remove dead code on NUMA node detection")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 meson_options.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meson_options.txt b/meson_options.txt
index 91b0449a1..379e5b8d2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,2 @@
-option('allow_invalid_socket_id', type: 'boolean', value: false,
-	description: 'allow out-of-range NUMA socket id\'s for platforms that don\'t report the value correctly')
 option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
 	description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-11 21:24:15.126004792 +0000
+++ 0030-build-remove-unneeded-meson-option.patch	2019-12-11 21:24:12.657651424 +0000
@@ -1 +1 @@
-From 8980d7da64693e5115324cbd9880b94012064d6b Mon Sep 17 00:00:00 2001
+From 02c22bcda42a57a49b432bd7a20c08d9997958e4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8980d7da64693e5115324cbd9880b94012064d6b ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 89650b0e9..e6fcb884b 100644
+index 91b0449a1..379e5b8d2 100644
@@ -21,3 +22 @@
-@@ -1,6 +1,4 @@
- # Please keep these options sorted alphabetically.
- 
+@@ -1,4 +1,2 @@
@@ -26,2 +25,2 @@
- option('disable_drivers', type: 'string', value: '',
- 	description: 'Comma-separated list of drivers to explicitly disable.')
+ option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
+ 	description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')