From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2D6CEA04F5 for ; Wed, 11 Dec 2019 22:28:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1D96F1D9E; Wed, 11 Dec 2019 22:28:35 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 95DA31D9E for ; Wed, 11 Dec 2019 22:28:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1Dcxs3PQfToazRXZaB70z5DP0041LF/O4p6yTD25x9Y=; b=JiUNnE4fXffhB+YjjY2Mz7qarA1Ybc75ohM2vK9+dwlrqHbuInom4n5MYUdwf4lzP5Rc+u rkZugPVwPfJK2jhj+g3tfjh0AnjBQmKlPq4MyBixu0cF5jBp8FuJUxivG9gqZNUrA3Qy7n /EJghMfoHFmkwK3g3FwCnc92qamUGhQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-148-8fQ24LWPNGKKA5Ez5XYgZA-1; Wed, 11 Dec 2019 16:28:28 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D903218543A1; Wed, 11 Dec 2019 21:28:27 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDE5710013A1; Wed, 11 Dec 2019 21:28:26 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Bruce Richardson , dpdk stable Date: Wed, 11 Dec 2019 21:26:22 +0000 Message-Id: <20191211212702.27851-30-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 8fQ24LWPNGKKA5Ez5XYgZA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'build: remove unneeded meson option' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 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 rebasi= ng (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/02c22bcda42a57a49b= 432bd7a20c08d9997958e4 Thanks. Kevin. --- >From 02c22bcda42a57a49b432bd7a20c08d9997958e4 Mon Sep 17 00:00:00 2001 From: David Marchand 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 Acked-by: Bruce Richardson --- 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, -=09description: 'allow out-of-range NUMA socket id\'s for platforms that d= on\'t report the value correctly') option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-', =09description: 'Subdirectory of libdir where to install PMDs. Defaults to= using a versioned subdirectory.') --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:15.126004792 +0000 +++ 0030-build-remove-unneeded-meson-option.patch=092019-12-11 21:24:12.657= 651424 +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@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. -=20 +@@ -1,4 +1,2 @@ @@ -26,2 +25,2 @@ - option('disable_drivers', type: 'string', value: '', - =09description: 'Comma-separated list of drivers to explicitly disable.') + option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-', + =09description: 'Subdirectory of libdir where to install PMDs. Defaults t= o using a versioned subdirectory.')