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 D684DA0032 for ; Fri, 18 Feb 2022 13:43:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D141440141; Fri, 18 Feb 2022 13:43:49 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 58BE840141 for ; Fri, 18 Feb 2022 13:43:49 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id d27so14385559wrc.6 for ; Fri, 18 Feb 2022 04:43:49 -0800 (PST) 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=BPyfAE2BNNSi6iC0BN3lV/0v60S5f+bKQB2SgIQ5IL0=; b=E94x7+4Fh6nQj2PcBpCqHpUYK3U4JAf/UeYd7gP1YxXA7G3nYpdIcmtdDnpyCkJOwl hXL8U4XPqZs+cXP9sAIHUaHESLOteS1l6l0RlX5QYwyr3yBz8XOHZQyZBozNyostwKJ7 y9VNQ3G/p6u9SAOZZDndoL/p6CK2wM1ka9IHZWwtFtruoRv0EiZ3DmWw37gWoPPvs8WL 1myZkbExqbfoihNSwcFPJ2iV8jTkQACL5jvgPA1IagVl1+nPT8US9RZMk2t0UIsfhLvL q5QipQDrp9mm81mczyDZEtANFOUG6YFp9xppahkOixQyDH0b9lBIu5T8WwmhuwNJW6Se wYZg== 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=BPyfAE2BNNSi6iC0BN3lV/0v60S5f+bKQB2SgIQ5IL0=; b=ev6mw4whoVXtPdPqL45XnDNUIHC1OqHUXNUXAP0s72NUK6rsFhb64PgvZT/iFke4NN Jtjw6YGXJvnSI/GV4Ot4QqrnzEaCmeBMQWoOlhiDUKt3cO3nMRLRmpZwBmyFFn+9ma7V tWHGzjwrpaLDkYcl5/qL+rOftMFbOcTdCA9BsjB1JekbyNINJGEW0XvuMqSLJVk1zYBv cSbV4dJ5wA1iG3/fOAWCgHnCnAtHh8aCz9GmXX/efeuWvTzACKF1cJDR94qH+i74NtjK pfdymV3JOJklJVUnidxxP7o+FocpAxvz33teiac8J0w3PwxXrm3Rs438baMOBwzZjZCZ UCiw== X-Gm-Message-State: AOAM533nCxhZQNlVrr+6s3OMarjKmFiLde/kjeYLJLFEcwBJitwJ82h3 IfsQeG3yq3aPqtFqlUVXfFI= X-Google-Smtp-Source: ABdhPJyRFAV0mZZ1XSkTCY4nHYUcNP17ZnYN1/I7KoqkoE3//s6EkvTtkgqu0FtMOcxCD2bDg8YFkw== X-Received: by 2002:adf:ec47:0:b0:1e4:a380:bb73 with SMTP id w7-20020adfec47000000b001e4a380bb73mr5960929wrn.86.1645188229067; Fri, 18 Feb 2022 04:43:49 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id t18sm4069198wmi.30.2022.02.18.04.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:43:48 -0800 (PST) From: luca.boccassi@gmail.com To: Weiguo Li Cc: Dmitry Kozlyuk , Pallavi Kadam , dpdk stable Subject: patch 'eal/windows: remove useless C++ include guard' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:50 +0000 Message-Id: <20220218123931.1749595-81-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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 02/20/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/cafb0cbdb4dbddba84bcdd115e6be2cd8deabbe9 Thanks. Luca Boccassi --- >From cafb0cbdb4dbddba84bcdd115e6be2cd8deabbe9 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Mon, 7 Feb 2022 20:37:00 +0800 Subject: [PATCH] eal/windows: remove useless C++ include guard [ upstream commit 0ae7844fcdad143ce4833f4fc8d886740b3f482d ] Remove the incomplete cplusplus guard in internal header. Fixes: 6e1ed4cbbe99 ("eal/windows: add dirent implementation") Signed-off-by: Weiguo Li Acked-by: Dmitry Kozlyuk Acked-by: Pallavi Kadam --- lib/librte_eal/windows/include/dirent.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/librte_eal/windows/include/dirent.h b/lib/librte_eal/windows/include/dirent.h index 34eb077f8c..b522424403 100644 --- a/lib/librte_eal/windows/include/dirent.h +++ b/lib/librte_eal/windows/include/dirent.h @@ -658,7 +658,4 @@ dirent_set_errno(int error) #endif } -#ifdef __cplusplus -} -#endif #endif /*DIRENT_H*/ -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.015786371 +0000 +++ 0081-eal-windows-remove-useless-C-include-guard.patch 2022-02-18 12:37:37.758793438 +0000 @@ -1 +1 @@ -From 0ae7844fcdad143ce4833f4fc8d886740b3f482d Mon Sep 17 00:00:00 2001 +From cafb0cbdb4dbddba84bcdd115e6be2cd8deabbe9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0ae7844fcdad143ce4833f4fc8d886740b3f482d ] + @@ -14 +16 @@ - lib/eal/windows/include/dirent.h | 3 --- + lib/librte_eal/windows/include/dirent.h | 3 --- @@ -17 +19 @@ -diff --git a/lib/eal/windows/include/dirent.h b/lib/eal/windows/include/dirent.h +diff --git a/lib/librte_eal/windows/include/dirent.h b/lib/librte_eal/windows/include/dirent.h @@ -19,2 +21,2 @@ ---- a/lib/eal/windows/include/dirent.h -+++ b/lib/eal/windows/include/dirent.h +--- a/lib/librte_eal/windows/include/dirent.h ++++ b/lib/librte_eal/windows/include/dirent.h