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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/01/19. 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 can be viewed on the 18.11 branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From e76de88781d680f19bf4ba4895db2bd4535b65bc 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 83a85cc6f..55f47036b 100644
--- a/drivers/net/virtio/virtio_user/vhost.h
+++ b/drivers/net/virtio/virtio_user/vhost.h
@@ -3,6 +3,6 @@
  */
 
-#ifndef _VHOST_NET_USER_H
-#define _VHOST_NET_USER_H
+#ifndef _VIRTIO_USER_VHOST_H
+#define _VIRTIO_USER_VHOST_H
 
 #include <stdint.h>
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-25 16:37:47.891329521 +0100
+++ 0026-net-virtio-fix-duplicate-naming-of-include-guard.patch	2019-04-25 16:37:46.731295270 +0100
@@ -1 +1 @@
-From 1708804ea977668f82a944b29399d376f8e50e9f Mon Sep 17 00:00:00 2001
+From e76de88781d680f19bf4ba4895db2bd4535b65bc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1708804ea977668f82a944b29399d376f8e50e9f ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org