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 783E8A00E6 for ; Fri, 22 Mar 2019 07:06:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CAAAF1B57A; Fri, 22 Mar 2019 07:06:55 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id D75FD1B55E; Fri, 22 Mar 2019 07:06:51 +0100 (CET) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Mar 2019 23:06:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,255,1549958400"; d="scan'208";a="133734325" Received: from dpdk-tbie.sh.intel.com ([10.67.104.173]) by fmsmga008.fm.intel.com with ESMTP; 21 Mar 2019 23:06:49 -0700 Date: Fri, 22 Mar 2019 14:06:32 +0800 From: Tiwei Bie To: Andrius Sirvys Cc: dev@dpdk.org, Maxime Coquelin , Zhihong Wang , stable@dpdk.org, jianfeng.tan@intel.com Message-ID: <20190322060632.GA32747@dpdk-tbie.sh.intel.com> References: <1553090259-30893-1-git-send-email-andrius.sirvys@intel.com> <1553162993-42643-1-git-send-email-andrius.sirvys@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1553162993-42643-1-git-send-email-andrius.sirvys@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-stable] [PATCH v2] drivers/virtio: fix duplicate naming of include guard 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" On Thu, Mar 21, 2019 at 10:09:53AM +0000, Andrius Sirvys wrote: > "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") > Cc: jianfeng.tan@intel.com > Signed-off-by: Andrius Sirvys > Acked-by: Rami Rosen > --- > v2: changed the name of the variable > --- > 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 83a85cc..55f4703 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 > */ > > -#ifndef _VHOST_NET_USER_H > -#define _VHOST_NET_USER_H > +#ifndef _VIRTIO_USER_VHOST_H > +#define _VIRTIO_USER_VHOST_H > > #include > #include > -- > 2.7.4 Reviewed-by: Tiwei Bie