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 7D093A0032 for ; Fri, 18 Feb 2022 13:43:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 76C7141142; Fri, 18 Feb 2022 13:43:38 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 29BF340150 for ; Fri, 18 Feb 2022 13:43:36 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id y6-20020a7bc186000000b0037bdc5a531eso5911946wmi.0 for ; Fri, 18 Feb 2022 04:43:36 -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=1u4Dm+1rDkuevuOV3a31o4ZTjRbWKwKcPpaUsbL3H+o=; b=VElCF00EueU+OjpyJ0JDIrT1lVorS4X9eO9DdhNFMA3HKN02BfvZ0cfIVoW9sQw5Kz eT0KdnZqd8spqi5iW/JbfCQDYrqIFlyv2w9C9OdZtZcZnhM6w48VIFmvxSPT9xKuc4iY UbREpLf4uX70z4QlQyaWb0JNxWR7wTESPye16KoxCmwe6g/j/U6CVv6CR5rtlIrp997h 6AGatVFXDcsdy5u6wwKRGshcTKfp6/LlHms2kK+mBFS4qSGIglbdDS/Bcf1EdPOtzI/6 J3b3P0e80JNy1EzgTXKTdDdP6159RGagrC/+NlMr0RvjhsGo/AWkaFxx2e6tsTcwN+oH lRLg== 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=1u4Dm+1rDkuevuOV3a31o4ZTjRbWKwKcPpaUsbL3H+o=; b=DcT8Z3XsQ0bcLMc6oAZB4n5ULAeYZH2TCoGVzll2ixOlDGjTqPJF9MdgSIReAZEfxR X5lt4paXKKXzx5BcTO6p1slVxg03z1PwBkgMDfkVyXZScKdrPDIcY+x4QJXH8xNyV/xi lVFvjVBaS1n6XMMygwGQt0BfDp9G+M/A9E44wdc1cO4dcZ3z83FFMkQWdbm2zejioZNo BzpHjvd58o0VmVNViYDFztewhG0mTOFPHxZFVeYIzAwj9YYtM7pBEh4gYVxpWgKl4aFt ZS5HL2q67l9tkHWoaJ/RYt3w910g8DzVmxDu402DupEcEEJB2lPbS5OVGt0hz2UJlR8S r+2Q== X-Gm-Message-State: AOAM5302hdcRsNtNjqjhe+q3xrg31UsfEnVg4/Ph6EI0Bt8a6lh/+i8O yMPT85VYNlexYIw8xXXYHjK2YY6iLZL1rbGF X-Google-Smtp-Source: ABdhPJxL5qcPPfHwAy5xIRu8Rjc8Vs7j6vHeE2Sb/IKZQFIItSPTDVqLyxMlUyEKGLHr9GIq3+zUtA== X-Received: by 2002:a05:600c:3797:b0:37c:2c83:45d0 with SMTP id o23-20020a05600c379700b0037c2c8345d0mr7020848wmr.163.1645188215869; Fri, 18 Feb 2022 04:43:35 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id u15sm42356689wrn.48.2022.02.18.04.43.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:43:35 -0800 (PST) From: luca.boccassi@gmail.com To: Weiguo Li Cc: dpdk stable Subject: patch 'bus/dpaa: fix C++ include guard' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:47 +0000 Message-Id: <20220218123931.1749595-78-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/8650a0c17cb7ea1c2349abe04be10c8e76fb297a Thanks. Luca Boccassi --- >From 8650a0c17cb7ea1c2349abe04be10c8e76fb297a Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Mon, 7 Feb 2022 20:36:56 +0800 Subject: [PATCH] bus/dpaa: fix C++ include guard [ upstream commit 1785d9eb62eea2b32c08ea30bfdd318e45b8120c ] Supplement the missing half of braces for the extern "C" block, or remove the incomplete guard in internal header. Fixes: 6d6b4f49a155 ("bus/dpaa: add FMAN hardware operations") Fixes: 919eeaccb2ba ("bus/dpaa: introduce NXP DPAA bus driver skeleton") Signed-off-by: Weiguo Li --- drivers/bus/dpaa/include/fsl_fman.h | 4 ---- drivers/bus/dpaa/rte_dpaa_bus.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bus/dpaa/include/fsl_fman.h b/drivers/bus/dpaa/include/fsl_fman.h index a3cf77f0e3..b5408337c8 100644 --- a/drivers/bus/dpaa/include/fsl_fman.h +++ b/drivers/bus/dpaa/include/fsl_fman.h @@ -9,10 +9,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif - /* Status field in FD is updated on Rx side by FMAN with following information. * Refer to field description in FM BG. */ diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h index 48d5cf4625..467baa09b4 100644 --- a/drivers/bus/dpaa/rte_dpaa_bus.h +++ b/drivers/bus/dpaa/rte_dpaa_bus.h @@ -17,6 +17,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* This sequence number field is used to store event entry index for * driver specific usage. For parallel mode queues, invalid * index will be set and for atomic mode queues, valid value -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:40.922505778 +0000 +++ 0078-bus-dpaa-fix-C-include-guard.patch 2022-02-18 12:37:37.754793350 +0000 @@ -1 +1 @@ -From 1785d9eb62eea2b32c08ea30bfdd318e45b8120c Mon Sep 17 00:00:00 2001 +From 8650a0c17cb7ea1c2349abe04be10c8e76fb297a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1785d9eb62eea2b32c08ea30bfdd318e45b8120c ] + @@ -19 +21 @@ -index acb344584f..20690f8329 100644 +index a3cf77f0e3..b5408337c8 100644 @@ -34 +36 @@ -index 31a5ea3fca..54bb1436fd 100644 +index 48d5cf4625..467baa09b4 100644