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 71668A05D3 for ; Wed, 27 Mar 2019 12:13:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 43FBD5F13; Wed, 27 Mar 2019 12:13:42 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 1F8885681; Wed, 27 Mar 2019 12:13:39 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 53009307D98A; Wed, 27 Mar 2019 11:13:38 +0000 (UTC) Received: from [10.36.112.59] (ovpn-112-59.ams2.redhat.com [10.36.112.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9ED9660C96; Wed, 27 Mar 2019 11:13:36 +0000 (UTC) To: Andrius Sirvys , dev@dpdk.org, Tiwei Bie , Zhihong Wang Cc: stable@dpdk.org, jianfeng.tan@intel.com References: <1553090259-30893-1-git-send-email-andrius.sirvys@intel.com> <1553162993-42643-1-git-send-email-andrius.sirvys@intel.com> From: Maxime Coquelin Message-ID: Date: Wed, 27 Mar 2019 12:13:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <1553162993-42643-1-git-send-email-andrius.sirvys@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 27 Mar 2019 11:13:38 +0000 (UTC) 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 3/21/19 11:09 AM, 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 > Applied to dpdk-next-virtio/master. Next time please run the check-git-log script before posting, I fixed the issues while applying. Thanks, Maxime