From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CA778A046B for ; Tue, 23 Jul 2019 03:03:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B49A81BFAD; Tue, 23 Jul 2019 03:03:10 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 6EA131BEF8 for ; Tue, 23 Jul 2019 03:03:09 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:03:05 +0300 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 x6N11Hfj026580; Tue, 23 Jul 2019 04:03:03 +0300 From: Yongseok Koh To: Andrius Sirvys Cc: Rami Rosen , Tiwei Bie , dpdk stable Date: Mon, 22 Jul 2019 18:00:26 -0700 Message-Id: <20190723010115.6446-59-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio: fix duplicate naming of include guard' has been queued to LTS release 17.11.7 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Thanks. Yongseok --- >From d1991b10b50b2abc91daa77adba3b89bcedd1b2c Mon Sep 17 00:00:00 2001 From: Andrius Sirvys Date: Thu, 21 Mar 2019 10:09:53 +0000 Subject: [PATCH] net/virtio: fix duplicate naming of include guard [ upstream commit 1708804ea977668f82a944b29399d376f8e50e9f ] "The macro name '_VHOST_NET_USER_H' of this include guard is used in 2 different header files." lib/librte_vhost/vhost_user.h has the same include guard. Renamed the include guard in vhost.h to differentiate. Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer") Signed-off-by: Andrius Sirvys Acked-by: Rami Rosen Reviewed-by: Tiwei Bie --- drivers/net/virtio/virtio_user/vhost.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h index 5c983bd407..b85e1b5df9 100644 --- a/drivers/net/virtio/virtio_user/vhost.h +++ b/drivers/net/virtio/virtio_user/vhost.h @@ -31,8 +31,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _VHOST_NET_USER_H -#define _VHOST_NET_USER_H +#ifndef _VIRTIO_USER_VHOST_H +#define _VIRTIO_USER_VHOST_H #include #include -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:09.669839560 -0700 +++ 0059-net-virtio-fix-duplicate-naming-of-include-guard.patch 2019-07-22 17:55:06.175473000 -0700 @@ -1,8 +1,10 @@ -From 1708804ea977668f82a944b29399d376f8e50e9f Mon Sep 17 00:00:00 2001 +From d1991b10b50b2abc91daa77adba3b89bcedd1b2c Mon Sep 17 00:00:00 2001 From: Andrius Sirvys Date: Thu, 21 Mar 2019 10:09:53 +0000 Subject: [PATCH] net/virtio: fix duplicate naming of include guard +[ upstream commit 1708804ea977668f82a944b29399d376f8e50e9f ] + "The macro name '_VHOST_NET_USER_H' of this include guard is used in 2 different header files." @@ -10,7 +12,6 @@ Renamed the include guard in vhost.h to differentiate. Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer") -Cc: stable@dpdk.org Signed-off-by: Andrius Sirvys Acked-by: Rami Rosen @@ -20,11 +21,11 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h -index 83a85cc6f1..55f47036bb 100644 +index 5c983bd407..b85e1b5df9 100644 --- a/drivers/net/virtio/virtio_user/vhost.h +++ b/drivers/net/virtio/virtio_user/vhost.h -@@ -2,8 +2,8 @@ - * Copyright(c) 2010-2016 Intel Corporation +@@ -31,8 +31,8 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _VHOST_NET_USER_H