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 B0D43A034C for ; Fri, 25 Feb 2022 18:17:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A7544410FD; Fri, 25 Feb 2022 18:17:44 +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 BE3BC410FD for ; Fri, 25 Feb 2022 18:17:42 +0100 (CET) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (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 DE9CD3FCA6 for ; Fri, 25 Feb 2022 17:17:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809460; bh=g5FPtDHLBZlaCboostRk4zaDbpRMdBGN5btjs+7qJ3k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bzmZGqshjSAU4ZdoWmNQUBywMtuJ9ijVHmjNN/uTkPfdFViLY3YpHw+1L2BBNpOdy CYFAND8sfXvfWIpWld1KLAbE8UH5MF3CvlntC6DBSdaNFzDiypHiYVePt1lOZRWKIR 9ElhzCbUKC9wqG8bi+bh7dDs4jlDVlk3bMsuAuDvbtpo5wtMpQXvb4dUWMFRZPDEgU 3Mu+pLnpMAfLFybdn5Nwg7MiK/KhOpRX6/XeISqy1EaitpcgqQyAexQCxOzqUrJKRQ L6g74h/sboJQdsC3Kn/kwJZKb2RF+NawKarxyEgSuTGUuXQCw/R7No8eiHqRAnIwqB CVi7PlB1mrlSw== Received: by mail-wm1-f72.google.com with SMTP id az39-20020a05600c602700b00380e48f5994so1628101wmb.0 for ; Fri, 25 Feb 2022 09:17:40 -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=g5FPtDHLBZlaCboostRk4zaDbpRMdBGN5btjs+7qJ3k=; b=pyk+DeeonCvJd4tJ1Kbk0tqd8JEPMMj27kjAnYDUPcJKyP8K1YZMCfGAJa8FknbMIW HhIpNpgZwAGn2NYuj72ANnr9rt2/og13lkDtFFgioxcYwBmFYgth3xQ3u+nyueByl+NE w4S7y+bKkpZWW2c/+9X8dyNRAN7/OrheI5bF2KKJ78CcrL0kyYcnFbjsdV3rD46RhNX5 7GQAneZIOpVXu0HlPa3Iw3ZRsHTLl4PDrvrfVkeLpsHzgE7JtxutQLVgnTH1fZ+sK3Lf lha6HlOCaMNDKpaYvXkDwdiugprxridcofkbqZT10JvFam25EG80oaxwA60HP7j2Eko1 CZmQ== X-Gm-Message-State: AOAM533vKjF+6jrtZIsqqhC8vzFfPUhK5J29YD6Nt6Fj3kzsSnTF1w/3 CHBx4eE0hUnkqbsFYxMY/jS5LlJcsLhAL3kbBiTmQpuF5wrmnvPY3s4d5xtBvUZFjwpdoSDoCAh B3LlXp97Wxqry20o0O7Y9Ya1j X-Received: by 2002:a5d:6cd3:0:b0:1ea:9be1:655c with SMTP id c19-20020a5d6cd3000000b001ea9be1655cmr6848862wrc.639.1645809460514; Fri, 25 Feb 2022 09:17:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBxETNUlQ2eWi8KKPhD23A2iKklgWKTHE3jkIkt2tfH5KUxxA6aDzbB5NM1/ZYlUbfSZuR+w== X-Received: by 2002:a5d:6cd3:0:b0:1ea:9be1:655c with SMTP id c19-20020a5d6cd3000000b001ea9be1655cmr6848846wrc.639.1645809460253; Fri, 25 Feb 2022 09:17:40 -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 a3-20020adfe5c3000000b001e68a5e1c20sm2830030wrn.4.2022.02.25.09.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:17:39 -0800 (PST) From: christian.ehrhardt@canonical.com To: Weiguo Li Cc: dpdk stable Subject: patch 'net/cxgbe: remove useless C++ include guard' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:29 +0100 Message-Id: <20220225171550.3499040-36-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/08349a7b9bef5393c66c6658f843ec8b5d235ec1 Thanks. Christian Ehrhardt --- >From 08349a7b9bef5393c66c6658f843ec8b5d235ec1 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Mon, 7 Feb 2022 20:36:58 +0800 Subject: [PATCH] net/cxgbe: remove useless C++ include guard [ upstream commit 073ab38ff7ea71f71cb9b9b8b729e4584eaffef3 ] Remove the incomplete cplusplus guard in internal header. Fixes: 3bd122eef2cc ("cxgbe/base: add hardware API for Chelsio T5 series adapters") Signed-off-by: Weiguo Li --- drivers/net/cxgbe/base/common.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/cxgbe/base/common.h b/drivers/net/cxgbe/base/common.h index 7e12624be1..fe944d61eb 100644 --- a/drivers/net/cxgbe/base/common.h +++ b/drivers/net/cxgbe/base/common.h @@ -12,10 +12,6 @@ #include "t4_chip_type.h" #include "t4fw_interface.h" -#ifdef __cplusplus -extern "C" { -#endif - #define CXGBE_PAGE_SIZE RTE_PGSIZE_4K #define T4_MEMORY_WRITE 0 -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.634251718 +0100 +++ 0036-net-cxgbe-remove-useless-C-include-guard.patch 2022-02-25 16:58:44.248990421 +0100 @@ -1 +1 @@ -From 073ab38ff7ea71f71cb9b9b8b729e4584eaffef3 Mon Sep 17 00:00:00 2001 +From 08349a7b9bef5393c66c6658f843ec8b5d235ec1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 073ab38ff7ea71f71cb9b9b8b729e4584eaffef3 ] + @@ -16 +18 @@ -index 58d7d7a8f2..af987b0d5d 100644 +index 7e12624be1..fe944d61eb 100644