Messages in this thread |  | | Date | Tue, 31 Mar 2020 09:11:06 -0400 | From | "Michael S. Tsirkin" <> | Subject | Re: linux-next: Tree for Mar 30 (vhost) |
| |
On Mon, Mar 30, 2020 at 10:22:22AM -0700, 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
Oh, this is Jason's Kconfig refactoring. Vhost must depend on eventfd of course. I fixed the relevant commit up and pushed the new tree again. Would appreciate a report on whether any problems are left.
> ../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); > ^ > > -- > ~Randy > Reported-by: Randy Dunlap <rdunlap@infradead.org>
|  |