From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 858BC1B518 for ; Fri, 30 Nov 2018 00:15:10 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:21:02 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW8W032075; Fri, 30 Nov 2018 01:15:07 +0200 From: Yongseok Koh To: Shahaf Shuler Cc: Ferruh Yigit , dpdk stable Date: Thu, 29 Nov 2018 15:11:26 -0800 Message-Id: <20181129231202.30436-92-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net: fix build with pedantic' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2018 23:15:10 -0000 Hi, FYI, your patch has been queued to LTS release 17.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 12/01/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From 91e25491c7b676ffaaeffbeb8aa086a4fae9d8dd Mon Sep 17 00:00:00 2001 From: Shahaf Shuler Date: Thu, 1 Nov 2018 14:46:45 +0200 Subject: [PATCH] net: fix build with pedantic [ upstream commit be685863a9ea636bf7924f0a8034bb4c21fb1402 ] The following error popped when compiling with -pedantic: In file included from drivers/net/mlx5/mlx5_flow_dv.c:28:0: include/rte_gre.h:20:2: error: type of bit-field 'res2' is a GCC extension [-Werror=pedantic] uint16_t res2:4; /**< Reserved */ Fixing by adding the __extension__ attribute. Fixes: 894f71a3805d ("net: add GRE header structure") Signed-off-by: Shahaf Shuler Reviewed-by: Ferruh Yigit --- lib/librte_net/rte_gre.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_net/rte_gre.h b/lib/librte_net/rte_gre.h index 46568ff57..8a3414cfb 100644 --- a/lib/librte_net/rte_gre.h +++ b/lib/librte_net/rte_gre.h @@ -43,6 +43,7 @@ extern "C" { /** * GRE Header */ +__extension__ struct gre_hdr { #if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN uint16_t res2:4; /**< Reserved */ -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:49.263404623 -0800 +++ 0092-net-fix-build-with-pedantic.patch 2018-11-29 15:01:45.245966000 -0800 @@ -1,8 +1,10 @@ -From be685863a9ea636bf7924f0a8034bb4c21fb1402 Mon Sep 17 00:00:00 2001 +From 91e25491c7b676ffaaeffbeb8aa086a4fae9d8dd Mon Sep 17 00:00:00 2001 From: Shahaf Shuler Date: Thu, 1 Nov 2018 14:46:45 +0200 Subject: [PATCH] net: fix build with pedantic +[ upstream commit be685863a9ea636bf7924f0a8034bb4c21fb1402 ] + The following error popped when compiling with -pedantic: In file included from @@ -14,7 +16,6 @@ Fixing by adding the __extension__ attribute. Fixes: 894f71a3805d ("net: add GRE header structure") -Cc: stable@dpdk.org Signed-off-by: Shahaf Shuler Reviewed-by: Ferruh Yigit @@ -23,10 +24,10 @@ 1 file changed, 1 insertion(+) diff --git a/lib/librte_net/rte_gre.h b/lib/librte_net/rte_gre.h -index 69499bb82..05aa9d143 100644 +index 46568ff57..8a3414cfb 100644 --- a/lib/librte_net/rte_gre.h +++ b/lib/librte_net/rte_gre.h -@@ -15,6 +15,7 @@ extern "C" { +@@ -43,6 +43,7 @@ extern "C" { /** * GRE Header */