From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5C0A145804 for ; Fri, 23 Aug 2024 18:23:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 56A1A43392; Fri, 23 Aug 2024 18:23:32 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 5C4BA43392 for ; Fri, 23 Aug 2024 18:23:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430211; 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=zH1mCJ9Z5dR/9kL1Futler4CDTSU40whEGIRY0HBAUQ=; b=V9/Y+cXucDktZ7Cg3hGIRXRjxOlzhbcy/XoAVFXGu3iZDF2tDBBEJovFa+jhavx4a7uxnK f6txDTuvIznCjGJd40erl5cjS18OhKXCDyAa/c4orG+gcOoc8HuSB8WohyKTMouNp6Ga7I jxX1tQ5dmtKqh5KuMdKvRak0BrHvFHE= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-377-P6_iMxcKNLeZMt5aDkZXMw-1; Fri, 23 Aug 2024 12:23:29 -0400 X-MC-Unique: P6_iMxcKNLeZMt5aDkZXMw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9171B1955F3D; Fri, 23 Aug 2024 16:23:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0DBE61956053; Fri, 23 Aug 2024 16:23:26 +0000 (UTC) From: Kevin Traynor To: Long Wu Cc: Chaoyong He , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix disabling 32-bit build' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:59 +0100 Message-ID: <20240823161929.1004778-111-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/58aac00c7ecc2bffe75d8f551ce974ad5b994a96 Thanks. Kevin --- >From 58aac00c7ecc2bffe75d8f551ce974ad5b994a96 Mon Sep 17 00:00:00 2001 From: Long Wu Date: Tue, 9 Jul 2024 16:24:01 +0800 Subject: [PATCH] net/nfp: fix disabling 32-bit build [ upstream commit c7c2199a6a7b3d9bc605bfee7e578d9b0a647e17 ] NFP PMD only support compile on 64-bit linux OS, add exit logic in other conditions. Fixes: 8741a9074536 ("net/nfp: disable for 32-bit meson builds") Signed-off-by: Long Wu Reviewed-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index 810f02ae5b..b39ae1fa2a 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -5,4 +5,5 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64') build = false reason = 'only supported on 64-bit Linux' + subdir_done() endif sources = files( -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:12.967672758 +0100 +++ 0111-net-nfp-fix-disabling-32-bit-build.patch 2024-08-23 17:18:09.851430563 +0100 @@ -1 +1 @@ -From c7c2199a6a7b3d9bc605bfee7e578d9b0a647e17 Mon Sep 17 00:00:00 2001 +From 58aac00c7ecc2bffe75d8f551ce974ad5b994a96 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c7c2199a6a7b3d9bc605bfee7e578d9b0a647e17 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index d805644ec5..7216c8dff9 100644 +index 810f02ae5b..b39ae1fa2a 100644 @@ -28 +29 @@ - + sources = files(