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 93DF5A0093 for ; Thu, 17 Mar 2022 15:17:58 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6589441154; Thu, 17 Mar 2022 15:17:57 +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 5595241150 for ; Thu, 17 Mar 2022 15:17:56 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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 2628A3F603 for ; Thu, 17 Mar 2022 14:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1647526676; bh=mVZ3BEOsqbQjfJvaCx4pvZGsRViXKTnstTnUAGonUfo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eg/gT5/8cjR+5ls16tXaGin6A21P/t62E7EeAlUT74pwwO04R/j4ZscfGur9eGenl GEMspVagoa3P3UgGmOFAsWlYdMNWCqtGBxDRg5lh7Xi84dgyAc0itCvrzs8xZjECGt 7xixQ5Ar+hUHK0yGk9tK4EyZ8kDK7O0pady/P1FpeAkb5oIzc9Hxfv+7kSPtkHeGQE L9jZ5hc/YGwTT9mbJpWlITkd/4BDzjCm9d1dV7rVweOjD0reNDvuTmvzbtfET6dW2X 3miNCrVLj1CaYbbBGVJq05nkjMhAc5cptxSjeX74GxfzPinpAEjod9QxCdFOjPHOBl nGixvZ8F0+fEw== Received: by mail-ed1-f70.google.com with SMTP id m21-20020a50d7d5000000b00418c7e4c2bbso3222085edj.6 for ; Thu, 17 Mar 2022 07:17:56 -0700 (PDT) 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=mVZ3BEOsqbQjfJvaCx4pvZGsRViXKTnstTnUAGonUfo=; b=NbqtddcB98mWdF+5CMOT+p+Zcpp5uGuWKpedKNlDgx/TX7Y/mIGBa+5QuFBtp0yBaY 1AsmFjxGh6EfvzYiBfbjBNH042f+WxzHPMHL1NtKxEe2VgQ4+AcZgn0Q28ZS1Wi918Y3 SQ9xOosDyAVLODv/moW9QCZs3+JUcIdtm3kDnscKzx0dHhcxT/P88OCR20rMhuveoxGf kwnOwkcjHOjQYIUvbHxzOJe8YgemxT3GSQSoVUyIz+zqJPhbmcIGt6N1FZtBMO5aClSO ZtbkZxGg+UYIHvxkpO4Y02KxENayaVkbfNzYocFQNOCGBwmCq5lTgSnfRGdxwEffnAqf BY/Q== X-Gm-Message-State: AOAM533QyKCPY90yRjJhPsjXuPJw6tHz+MQgfOOxyPr5P+A2OXl1rQL7 wFG+jx0B6sTkImDT/XYIJ1yvn4OOH9N0Nt1w7Bu4WX6rwm9fhR21cMZgrU8Dl8P+6MMat8jkewq OWjfAykmLvz/DYChmwCA2Df7J X-Received: by 2002:a17:906:b757:b0:6d6:e990:b0de with SMTP id fx23-20020a170906b75700b006d6e990b0demr4522341ejb.603.1647526675462; Thu, 17 Mar 2022 07:17:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzpQYULnVKs5yV5K7JZ5TzLH1whM1HMrye/RcMeURAUfy79yyGHe0lAbPHyNkzWpyNrFsEUg== X-Received: by 2002:a17:906:b757:b0:6d6:e990:b0de with SMTP id fx23-20020a170906b75700b006d6e990b0demr4522323ejb.603.1647526675237; Thu, 17 Mar 2022 07:17:55 -0700 (PDT) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id h22-20020a1709062dd600b006dac66b8076sm2382541eji.95.2022.03.17.07.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 07:17:54 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Bruce Richardson Cc: dpdk stable Subject: patch 'eal/freebsd: add missing C++ include guards' has been queued to stable release 19.11.12 Date: Thu, 17 Mar 2022 15:17:43 +0100 Message-Id: <20220317141747.1955930-5-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220317141747.1955930-1-christian.ehrhardt@canonical.com> References: <20220317141747.1955930-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 03/19/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/66be196f77ff1ae5df42446e49041f6f99c4fe5b Thanks. Christian Ehrhardt --- >From 66be196f77ff1ae5df42446e49041f6f99c4fe5b 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/eal/include/rte_os.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/librte_eal/freebsd/eal/include/rte_os.h b/lib/librte_eal/freebsd/eal/include/rte_os.h index c16f2a30e9..78ee6fd8f4 100644 --- a/lib/librte_eal/freebsd/eal/include/rte_os.h +++ b/lib/librte_eal/freebsd/eal/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. @@ -48,4 +52,8 @@ typedef cpuset_t rte_cpuset_t; } while (0) #endif +#ifdef __cplusplus +} +#endif + #endif /* _RTE_OS_H_ */ -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-17 14:33:42.207952321 +0100 +++ 0005-eal-freebsd-add-missing-C-include-guards.patch 2022-03-17 14:33:41.872623036 +0100 @@ -1 +1 @@ -From 29fd052dcc3be76112bc7b03a918308ebcf901d8 Mon Sep 17 00:00:00 2001 +From 66be196f77ff1ae5df42446e49041f6f99c4fe5b 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/eal/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/eal/include/rte_os.h b/lib/librte_eal/freebsd/eal/include/rte_os.h +index c16f2a30e9..78ee6fd8f4 100644 +--- a/lib/librte_eal/freebsd/eal/include/rte_os.h ++++ b/lib/librte_eal/freebsd/eal/include/rte_os.h @@ -31 +32 @@ -@@ -59,4 +63,8 @@ typedef cpuset_t rte_cpuset_t; +@@ -48,4 +52,8 @@ typedef cpuset_t rte_cpuset_t;