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 41316A00BE for ; Tue, 15 Mar 2022 14:32:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B9EB410EF; Tue, 15 Mar 2022 14:32:54 +0100 (CET) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mails.dpdk.org (Postfix) with ESMTP id 76ADD4014F for ; Tue, 15 Mar 2022 14:32:52 +0100 (CET) Received: by mail-ej1-f48.google.com with SMTP id qx21so41282998ejb.13 for ; Tue, 15 Mar 2022 06:32:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FCvLZh5Tra7Lbp0A8W401cI9Po3jbhZmTn+N6fLHIq0=; b=Vx/1Z0lDmiC+3r+kUhtbjlUiNC59jAA0/eeVDwVlXoGuzObUJpyycyHppSnQxuV4Lb 5+t+GaPE4OJwucvoTdGyx1/6rreyy1CecLU8zrktcgZsq/0Q77hWLpa7jw5MKGu5ZiKi OFUrxsQyeUK/OVRHAMdPKZHXVX4ZBmyu8oH+9YIL7r19z05omFR9wde3D8zE27W9JX7S JJXwtiXO2jE8sf2Vww1EV+INlRoIuSrJ1NPYv94rP8+Gkqic2SPv2TqskWy7aqRnwY5+ QyYoNVey2cgqzijrlpeGA1e6uqI+iL0BK3Zu2ouILhk9EFeYVummHpuYXCpWsgi7TKWc obDQ== 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=FCvLZh5Tra7Lbp0A8W401cI9Po3jbhZmTn+N6fLHIq0=; b=O7gWsfLU76kvhHomOOSDb8U+YnF1HtoqRGU4Ejo3c4EbTLEoHHAVbAB1Al2GHyILPy 8S6yKqzSN1e+/YDxLZTKYib9f9HFGpCCI0sHP5+GYeYJgXnxCnRGzfKCCh2S/0+6twpr jQyA4VciR1UR4BKa09C5QnhU22E26kVvqwlRtZIkOQuLRBQ2cx2XNasItqamhqIAWHbt FjrsgAmYZNXrei3ZZgd8R9anYvsAtCKIrBQX4yXCirUlJmIVpkYwGsVLTjB5bwM14PKV hCuxO2QVIuGG4hkiAg4sQRzJIw+Bpmm7vt5jAelZl72miHXKTbZPH/Ygkql4HhaQzkEx cUpw== X-Gm-Message-State: AOAM530HXlwJRVL4Bpnqeu8yEMcjx7p8nMfaEa53Y8B+vjrUr/k5R08J 6mVvuM2letlxe0ZdD5p8YbxJ7gINy2Q= X-Google-Smtp-Source: ABdhPJxQF30uah2ArY/jB8dXibK/KuyrgBvZesRowESXBKnhDnK6Fg63vAHH8ruolaSdslteL2MY8A== X-Received: by 2002:a17:906:c1c6:b0:6d5:cc27:a66c with SMTP id bw6-20020a170906c1c600b006d5cc27a66cmr22816598ejb.650.1647351172191; Tue, 15 Mar 2022 06:32:52 -0700 (PDT) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id m13-20020a056402510d00b00416ca731b5fsm7517405edd.9.2022.03.15.06.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 06:32:51 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: dpdk stable Subject: patch 'eal/freebsd: add missing C++ include guards' has been queued to stable release 20.11.5 Date: Tue, 15 Mar 2022 13:32:30 +0000 Message-Id: <20220315133233.635559-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220315133233.635559-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220315133233.635559-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 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/eca0c20f67d02cfae989826fd63ef6a034ba0048 Thanks. Luca Boccassi --- >From eca0c20f67d02cfae989826fd63ef6a034ba0048 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 11 Mar 2022 20:05:19 +0000 Subject: [PATCH] eal/freebsd: add missing C++ include guards [ upstream commit 29fd052dcc3be76112bc7b03a918308ebcf901d8 ] Add missing 'extern "C"' to file. Fixes: 428eb983f5f7 ("eal: add OS specific header file") Signed-off-by: Bruce Richardson --- lib/librte_eal/freebsd/include/rte_os.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/librte_eal/freebsd/include/rte_os.h b/lib/librte_eal/freebsd/include/rte_os.h index 627f0483ab..81a32387a0 100644 --- a/lib/librte_eal/freebsd/include/rte_os.h +++ b/lib/librte_eal/freebsd/include/rte_os.h @@ -5,6 +5,10 @@ #ifndef _RTE_OS_H_ #define _RTE_OS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** * This header should contain any definition * which is not supported natively or named differently in FreeBSD. @@ -49,4 +53,8 @@ typedef cpuset_t rte_cpuset_t; } while (0) #endif +#ifdef __cplusplus +} +#endif + #endif /* _RTE_OS_H_ */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-15 12:13:39.350106682 +0000 +++ 0007-eal-freebsd-add-missing-C-include-guards.patch 2022-03-15 12:13:39.072181080 +0000 @@ -1 +1 @@ -From 29fd052dcc3be76112bc7b03a918308ebcf901d8 Mon Sep 17 00:00:00 2001 +From eca0c20f67d02cfae989826fd63ef6a034ba0048 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 29fd052dcc3be76112bc7b03a918308ebcf901d8 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -13 +14 @@ - lib/eal/freebsd/include/rte_os.h | 8 ++++++++ + lib/librte_eal/freebsd/include/rte_os.h | 8 ++++++++ @@ -16,4 +17,4 @@ -diff --git a/lib/eal/freebsd/include/rte_os.h b/lib/eal/freebsd/include/rte_os.h -index 9d8a69008c..b4afd45adc 100644 ---- a/lib/eal/freebsd/include/rte_os.h -+++ b/lib/eal/freebsd/include/rte_os.h +diff --git a/lib/librte_eal/freebsd/include/rte_os.h b/lib/librte_eal/freebsd/include/rte_os.h +index 627f0483ab..81a32387a0 100644 +--- a/lib/librte_eal/freebsd/include/rte_os.h ++++ b/lib/librte_eal/freebsd/include/rte_os.h @@ -31 +32 @@ -@@ -59,4 +63,8 @@ typedef cpuset_t rte_cpuset_t; +@@ -49,4 +53,8 @@ typedef cpuset_t rte_cpuset_t;