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 276BE455AD for ; Mon, 15 Jul 2024 17:31:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 22B7D40DFB; Mon, 15 Jul 2024 17:31:48 +0200 (CEST) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 2BCB740DF8 for ; Mon, 15 Jul 2024 17:31:47 +0200 (CEST) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-36799a67d9cso3629884f8f.0 for ; Mon, 15 Jul 2024 08:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057507; x=1721662307; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1UE0CrUxUXCWvqzFygzQjZosO/zRWel7TQ5L+6iyimo=; b=XLP4N4n/PaWK5W6Nfxr+uK1yG4nZVyFE2BPNF5/JNBalnBmgD/xvoLKhsXcpTd/8O4 pQiZaAOE2AvRVTN2A/qVhQimLiFzlhtQWjR5l8jZvX2Wzu9rcaJCz8Zq6nw9ubKwoNQE Wp17DppRS3XtGW6rHQB4a6vhjsl4C2kUKwVbR5VEilkX2QJyVcbyCPS4yEFsOXLj/SFt b9t1t3XEI4eVjkrWgToPeEaa6wL4eSXOFMO9VlZQbdwifeSKqW7/EkNucfYFxdFPWMHE tbyT8gn4p0AOHPa+gAp1oQAYF34SReSy0kpvzb13Tj4sEHxssAhzdsodZ65I+CJI7ZW2 sSlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057507; x=1721662307; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1UE0CrUxUXCWvqzFygzQjZosO/zRWel7TQ5L+6iyimo=; b=QJDey0rW7sJNQ7gdtvU/FJeXIgfqgsNMCuAVgxmSo6Ux+iNuf+gSPLaEHwvhPp60d+ GSanSFZQ6nRoyQKinOHBAyuhIE+Wq71cUq/6gvuvP5YE7TyewERwtvrwXwAb/NTobcWw soZNDOuZDoB5nWwTnAxwD13awODiGGAKEbdporBmWuBT9HIeq3bPWBd1bubGlN28cyg+ YX4UWfSSgjLTsBANwR6Y7PistgXVf0BSXWNYzQzre7IyvVsUD5yex5BEoXWsSBCtzhHk LK5uVTe4XBr+r8Zw4+cPZLvOpnVPC1Yckhiy1rkFh9c9r/yVUpaDUrcMyqFFM0Ijyzhp Q/qQ== X-Forwarded-Encrypted: i=1; AJvYcCUMsy024ffJvF9vMil6yxESiunaKRN4P4iMJJwtTwUj7aREPztTbZ+bAe4fUicNVMiOx+rXszGSw+sXBGYdEm8= X-Gm-Message-State: AOJu0Yzi5nxoDJSd8Jh98AaS8cKwt3A8lLYWMJnSAGOey2lIpagin8iO NxxTWkIaHTpZ3uQ1ArZbDJZpQOvxVAZQLo+h/uBinvBuZCr/AFFjnBv6FS8XLlM= X-Google-Smtp-Source: AGHT+IErbLrhNUoEullUKMHjW6+Udlj27TUXQ1ScwtACZ3E7vEHdoexujDdhN69kyANB/wLv9NwBxg== X-Received: by 2002:a5d:52ce:0:b0:368:654:9329 with SMTP id ffacd0b85a97d-36824078b57mr111073f8f.6.1721057506777; Mon, 15 Jul 2024 08:31:46 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680db038f4sm6614015f8f.94.2024.07.15.08.31.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:31:46 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.6 Date: Mon, 15 Jul 2024 16:27:04 +0100 Message-Id: <20240715152704.2229503-86-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.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 07/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a0bb9efc615dd2753788826b1a6ad86024dd298e Thanks. Luca Boccassi --- >From a0bb9efc615dd2753788826b1a6ad86024dd298e 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 7416fd3706..bc3bc737a0 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -4,6 +4,7 @@ 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( 'flower/nfp_flower.c', -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:38.825489437 +0100 +++ 0086-net-nfp-fix-disabling-32-bit-build.patch 2024-07-15 16:19:34.740210136 +0100 @@ -1 +1 @@ -From c7c2199a6a7b3d9bc605bfee7e578d9b0a647e17 Mon Sep 17 00:00:00 2001 +From a0bb9efc615dd2753788826b1a6ad86024dd298e 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 7416fd3706..bc3bc737a0 100644 @@ -29 +29,0 @@ - @@ -30,0 +31 @@ + 'flower/nfp_flower.c',