From: "Michael S. Tsirkin" <mst@redhat.com>
To: Jason Wang <jasowang@redhat.com>
Cc: Randy Dunlap <rdunlap@infradead.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
virtualization@lists.linux-foundation.org,
KVM <kvm@vger.kernel.org>
Subject: Re: linux-next: Tree for Mar 30 (vhost)
Date: Tue, 31 Mar 2020 09:13:01 -0400 [thread overview]
Message-ID: <20200331091138-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <649927d4-9851-c369-2ad2-bf25527b057a@redhat.com>
On Tue, Mar 31, 2020 at 10:27:48AM +0800, Jason Wang wrote:
>
> On 2020/3/31 上午1: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 function 'eventfd_fget'; did you mean 'eventfd_signal'? [-Werror=implicit-function-declaration]
> > eventfp = f.fd == -1 ? NULL : eventfd_fget(f.fd);
> > ^~~~~~~~~~~~
> > eventfd_signal
> > ../drivers/vhost/vhost.c:1577:31: warning: pointer/integer type mismatch in conditional expression
> > eventfp = f.fd == -1 ? NULL : eventfd_fget(f.fd);
>
>
> Will fix.
>
> VHOST should depend on EVENTFD now.
>
> Thanks
I did that and pushed. Pls take a look.
>
> > ^
> >
next prev parent reply other threads:[~2020-03-31 13:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 9:43 linux-next: Tree for Mar 30 Stephen Rothwell
2020-03-30 17:15 ` linux-next: Tree for Mar 30 (bpf) Randy Dunlap
2020-03-30 17:25 ` Daniel Borkmann
2020-03-30 17:54 ` KP Singh
2020-03-30 18:05 ` KP Singh
2020-03-30 18:15 ` Randy Dunlap
2020-03-30 18:49 ` KP Singh
2020-03-30 17:22 ` linux-next: Tree for Mar 30 (vhost) Randy Dunlap
2020-03-31 2:27 ` Jason Wang
2020-03-31 2:27 ` Jason Wang
2020-03-31 13:13 ` Michael S. Tsirkin [this message]
2020-03-31 13:11 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200331091138-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.