From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 296A0A05D3 for ; Thu, 25 Apr 2019 17:41:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0F8D31B5E3; Thu, 25 Apr 2019 17:41:28 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 0E7501B5DF for ; Thu, 25 Apr 2019 17:41:26 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 738923082163; Thu, 25 Apr 2019 15:41:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3492A5D9C6; Thu, 25 Apr 2019 15:41:24 +0000 (UTC) From: Kevin Traynor To: Andrius Sirvys Cc: Rami Rosen , Tiwei Bie , dpdk stable Date: Thu, 25 Apr 2019 16:40:01 +0100 Message-Id: <20190425154037.28778-26-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 25 Apr 2019 15:41:25 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio: fix duplicate naming of include guard' has been queued to LTS release 18.11.2 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 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 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 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 -- 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@dpdk.org