[dpdk-stable] patch 'net/virtio: fix duplicate naming of include guard' has been queued to LTS release 17.11.7

[Yongseok Koh]

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 <andrius.sirvys at intel.com>
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 <andrius.sirvys at intel.com>
Acked-by: Rami Rosen <ramirose at gmail.com>
Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
---
 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 <stdint.h>
 #include <linux/types.h>
-- 
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 <andrius.sirvys at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Andrius Sirvys <andrius.sirvys at intel.com>
 Acked-by: Rami Rosen <ramirose at gmail.com>
@@ -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