From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 786ACC2D0E9 for ; Tue, 31 Mar 2020 02:28:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E8D12072D for ; Tue, 31 Mar 2020 02:28:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZIHIB8he" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729678AbgCaC2A (ORCPT ); Mon, 30 Mar 2020 22:28:00 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:50130 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729221AbgCaC2A (ORCPT ); Mon, 30 Mar 2020 22:28:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585621678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q2t+J3lF5AuQxznbMUm1nciYFyVRK4OogfDMwj7plOg=; b=ZIHIB8heW+xBsxMoCvlRqaqH/EyLjpknxUY1Yx/RoNlj9nzGd0P1xF7mOWIu76iAXbHPaT q4Ko1hteb3ZMNJiT59618uyKBCBAeMH4yWTD+GosS4r301WBslzxTJrsrhIYjotqLP8whY FYPWYmzhTRKzciKml2tkRydQ+CLpbUk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-159-5evQtK8jNxSPzYKNQlUjZA-1; Mon, 30 Mar 2020 22:27:56 -0400 X-MC-Unique: 5evQtK8jNxSPzYKNQlUjZA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EEA66800D5B; Tue, 31 Mar 2020 02:27:54 +0000 (UTC) Received: from [10.72.12.115] (ovpn-12-115.pek2.redhat.com [10.72.12.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 402E01001B3F; Tue, 31 Mar 2020 02:27:49 +0000 (UTC) Subject: Re: linux-next: Tree for Mar 30 (vhost) To: Randy Dunlap , Stephen Rothwell , Linux Next Mailing List Cc: Linux Kernel Mailing List , virtualization@lists.linux-foundation.org, KVM , "Michael S. Tsirkin" References: <20200330204307.669bbb4d@canb.auug.org.au> <347c851a-b9f6-0046-f6c8-1db0b42be213@infradead.org> From: Jason Wang 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 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > ^ >