From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <maxime.coquelin@redhat.com>
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 <andrius.sirvys@intel.com>, dev@dpdk.org,
 Tiwei Bie <tiwei.bie@intel.com>, Zhihong Wang <zhihong.wang@intel.com>
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 <maxime.coquelin@redhat.com>
Message-ID: <c9ba01b0-4229-052d-7aa3-c8212ad428a9@redhat.com>
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-dev] [PATCH v2] drivers/virtio: fix duplicate naming of
	include guard
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Mar 2019 11:13:39 -0000



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 <andrius.sirvys@intel.com>
> Acked-by: Rami Rosen <ramirose@gmail.com>
> ---
> 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 <stdint.h>
>   #include <linux/types.h>
> 

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

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
	by dpdk.space (Postfix) with ESMTP id 76554A05D3
	for <public@inbox.dpdk.org>; Wed, 27 Mar 2019 12:13:40 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
	by dpdk.org (Postfix) with ESMTP id D26D45A6A;
	Wed, 27 Mar 2019 12:13:39 +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 <andrius.sirvys@intel.com>, dev@dpdk.org,
 Tiwei Bie <tiwei.bie@intel.com>, Zhihong Wang <zhihong.wang@intel.com>
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 <maxime.coquelin@redhat.com>
Message-ID: <c9ba01b0-4229-052d-7aa3-c8212ad428a9@redhat.com>
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-dev] [PATCH v2] drivers/virtio: fix duplicate naming of
	include guard
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Message-ID: <20190327111334.T8CiYLcn-QmwF-WrRzG1DhWXdyd-BPVFYeF-Mt60AyE@z>



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 <andrius.sirvys@intel.com>
> Acked-by: Rami Rosen <ramirose@gmail.com>
> ---
> 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 <stdint.h>
>   #include <linux/types.h>
> 

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