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 10B95A034C for ; Fri, 25 Feb 2022 18:18:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C2B741152; Fri, 25 Feb 2022 18:18:00 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id E039141150 for ; Fri, 25 Feb 2022 18:17:57 +0100 (CET) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id C85403FCAD for ; Fri, 25 Feb 2022 17:17:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809477; bh=1AX2oJNMBTnNGTeZ/Q0cyU7Qvg429iJFcQ1JkpwmjHM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TL4K42HNwQGo67F9gNI8PT0x32QlnHN6e3unmeA2ukHsqhrD10mXeqnrY174fRmS2 hXJQx/xWoy6tcKHH0VVIN5z3RAF2Qj+ODk+H2Dsm9qQWtJeZBT58o9N7PJ9547DK8S gkEMbLJf+/vggYudKz9wdBKPz8AiDPXh3POM+1gjyX8TRN9KDkH2sc4guB7tyY8U+J AHY9oB76/2lLassM4NGoYAKgvFHrZqGt3dtYq5OwtvFKChnmXfURf6wiiUwheyuhlk H3B7h/Lr8QWb9nt+DSssKcCi6ux8I1Ru4CmCJ6S8q9YfxAPsmE3ZrrH2P++rXTO72o KwnrGZa3zBC+w== Received: by mail-wr1-f69.google.com with SMTP id w2-20020adfbac2000000b001ea99ca4c50so1105198wrg.11 for ; Fri, 25 Feb 2022 09:17:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1AX2oJNMBTnNGTeZ/Q0cyU7Qvg429iJFcQ1JkpwmjHM=; b=tBDtVvqjWtbsrM5N2Lq0Okarinat+eAEtiabjZZGGXlD5LaWCLcp0HtBZTP6CQHt+E ms+qCGo8tw0eC3dNfcWslLak2MEpx0rALsv7Wfauiod1pGsgfD+UTqyUTiG4/Bm7nYP3 1iPkPAcPE8YarsDPQsd/YjWdHIS3QrY6Bqj/+mhsct23w4peZ1GOLCsARuahJT9e0oKJ vgI0mCbBI4cGzoZMmZbuZ8XHOV8EM4BodAtWaS1ZRFYiA/qby3UAe5QEY+Z/JSSJEKKh NVhysej72xDsR+f+NGHIsgB4ln7XTAo+c3XCHaHahyBIHo+j1p9znH0z9sXm5NM3Y0OC vTrA== X-Gm-Message-State: AOAM5305kVpdE06oUbQvAqdRETJBNSozdTtrYYQNSAwLl0ArUuUJNIji miukBqWoMGlRNwnM4v/tEIBpdaEG6poOCU/lY843AidcfK9Ih+e5Wuu/TeJpn8JCDEK8cuhh+ls RU3tLaB0MwPbJKbHmh+JWVcVi X-Received: by 2002:a05:600c:384b:b0:380:e437:2817 with SMTP id s11-20020a05600c384b00b00380e4372817mr3453603wmr.53.1645809476511; Fri, 25 Feb 2022 09:17:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQaq0yA2e9x+9sGn5Wy18zW0WdluMv3Dnb/2ztsKJSIUXYCV1Sh6WgztREYa0ofe8QssXchQ== X-Received: by 2002:a05:600c:384b:b0:380:e437:2817 with SMTP id s11-20020a05600c384b00b00380e4372817mr3453589wmr.53.1645809476257; Fri, 25 Feb 2022 09:17:56 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id p18-20020adfba92000000b001e4ae791663sm2899611wrg.62.2022.02.25.09.17.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:17:55 -0800 (PST) From: christian.ehrhardt@canonical.com To: David Marchand Cc: dpdk stable Subject: patch 'stack: fix stubs header export' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:37 +0100 Message-Id: <20220225171550.3499040-44-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.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 19.11.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/27/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/6578183ebd2725ce4df8c0af502a4d5785694336 Thanks. Christian Ehrhardt --- >From 6578183ebd2725ce4df8c0af502a4d5785694336 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 10 Feb 2022 09:55:43 +0100 Subject: [PATCH] stack: fix stubs header export [ upstream commit 8adf5f528bf3321feeae2231007ebae162032739 ] The stubs header is included as part of rte_stack.h for architectures other than x86_64 and aarch64 (i.e. x86 32 bits and ppc). Note: chkincs won't catch this issue since it checks headers from within the source directory. Fixes: 7911ba0473e0 ("stack: enable lock-free implementation for aarch64") Signed-off-by: David Marchand --- lib/librte_stack/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/librte_stack/meson.build b/lib/librte_stack/meson.build index f420a5c223..ef29dd6959 100644 --- a/lib/librte_stack/meson.build +++ b/lib/librte_stack/meson.build @@ -8,4 +8,6 @@ headers = files('rte_stack.h', 'rte_stack_std.h', 'rte_stack_lf.h', 'rte_stack_lf_generic.h', - 'rte_stack_lf_c11.h') + 'rte_stack_lf_c11.h', + 'rte_stack_lf_stubs.h', +) -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.940779961 +0100 +++ 0044-stack-fix-stubs-header-export.patch 2022-02-25 16:58:44.288990455 +0100 @@ -1 +1 @@ -From 8adf5f528bf3321feeae2231007ebae162032739 Mon Sep 17 00:00:00 2001 +From 6578183ebd2725ce4df8c0af502a4d5785694336 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8adf5f528bf3321feeae2231007ebae162032739 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - lib/stack/meson.build | 1 + - 1 file changed, 1 insertion(+) + lib/librte_stack/meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) @@ -20,10 +21,12 @@ -diff --git a/lib/stack/meson.build b/lib/stack/meson.build -index 2f53f49677..18177a742f 100644 ---- a/lib/stack/meson.build -+++ b/lib/stack/meson.build -@@ -9,4 +9,5 @@ indirect_headers += files( - 'rte_stack_lf.h', - 'rte_stack_lf_generic.h', - 'rte_stack_lf_c11.h', -+ 'rte_stack_lf_stubs.h', - ) +diff --git a/lib/librte_stack/meson.build b/lib/librte_stack/meson.build +index f420a5c223..ef29dd6959 100644 +--- a/lib/librte_stack/meson.build ++++ b/lib/librte_stack/meson.build +@@ -8,4 +8,6 @@ headers = files('rte_stack.h', + 'rte_stack_std.h', + 'rte_stack_lf.h', + 'rte_stack_lf_generic.h', +- 'rte_stack_lf_c11.h') ++ 'rte_stack_lf_c11.h', ++ 'rte_stack_lf_stubs.h', ++)