Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: linux-next: Tree for Mar 30 (vhost)
To:     Randy Dunlap <rdunlap@infradead.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        virtualization@lists.linux-foundation.org,
        KVM <kvm@vger.kernel.org>, "Michael S. Tsirkin" <mst@redhat.com>
References: <20200330204307.669bbb4d@canb.auug.org.au>
 <347c851a-b9f6-0046-f6c8-1db0b42be213@infradead.org>
From:   Jason Wang <jasowang@redhat.com>
Message-ID: <649927d4-9851-c369-2ad2-bf25527b057a@redhat.com>
Date:   Tue, 31 Mar 2020 10:27:48 +0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.9.0
MIME-Version: 1.0
In-Reply-To: <347c851a-b9f6-0046-f6c8-1db0b42be213@infradead.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


On 2020/3/31 =E4=B8=8A=E5=8D=881:22, Randy Dunlap wrote:
> On 3/30/20 2:43 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> The merge window has opened, so please do not add any material for the
>> next release into your linux-next included trees/branches until after
>> the merge window closes.
>>
>> Changes since 20200327:
>>
>> The vhost tree gained a conflict against the kvm-arm tree.
>>
> (note: today's linux-next is on 5.6-rc7.)
>
> on x86_64:
>
> # CONFIG_EVENTFD is not set
>
> ../drivers/vhost/vhost.c: In function 'vhost_vring_ioctl':
> ../drivers/vhost/vhost.c:1577:33: error: implicit declaration of functi=
on 'eventfd_fget'; did you mean 'eventfd_signal'? [-Werror=3Dimplicit-fun=
ction-declaration]
>     eventfp =3D f.fd =3D=3D -1 ? NULL : eventfd_fget(f.fd);
>                                   ^~~~~~~~~~~~
>                                   eventfd_signal
> ../drivers/vhost/vhost.c:1577:31: warning: pointer/integer type mismatc=
h in conditional expression
>     eventfp =3D f.fd =3D=3D -1 ? NULL : eventfd_fget(f.fd);


Will fix.

VHOST should depend on EVENTFD now.

Thanks


>                                 ^
>