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 419F8C43331 for ; Mon, 30 Mar 2020 07:08:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0AB7120774 for ; Mon, 30 Mar 2020 07:08:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HyvO3FRy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729346AbgC3HIf (ORCPT ); Mon, 30 Mar 2020 03:08:35 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:56308 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728766AbgC3HIf (ORCPT ); Mon, 30 Mar 2020 03:08:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585552114; 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=ZGH1z3Liep+aojQUBt0mjpc4ZGlP+CR9NlLTQMcuEaQ=; b=HyvO3FRyQHKxqu8aWCfCu7Py17ySo0SsIx7bCPD7WEyJ/0ADDJ8eQxyhW4/cGzwZjnEbIf /JglnIynsKRDPp/JVZ6W6LaJFh4L3hNuj8bGf5hlPUW5F4zUcm/Ej/begxFSeW0kzXhAzj 8HowHMAZXGuQ6zkzabXkcknVcyYaAfk= 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-58-d-TeSxdnPO2JX-VYwSwmig-1; Mon, 30 Mar 2020 03:08:32 -0400 X-MC-Unique: d-TeSxdnPO2JX-VYwSwmig-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 305A7107ACC7; Mon, 30 Mar 2020 07:08:31 +0000 (UTC) Received: from [10.72.13.226] (ovpn-13-226.pek2.redhat.com [10.72.13.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66C7D100EBAF; Mon, 30 Mar 2020 07:08:23 +0000 (UTC) Subject: Re: linux-next: manual merge of the vhost tree with the kvm-arm tree To: Stephen Rothwell , "Michael S. Tsirkin" , Christoffer Dall , Marc Zyngier Cc: Linux Next Mailing List , Linux Kernel Mailing List References: <20200330165614.4973a4bc@canb.auug.org.au> <20200330165701.4e1b8039@canb.auug.org.au> From: Jason Wang Message-ID: Date: Mon, 30 Mar 2020 15:08:16 +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: <20200330165701.4e1b8039@canb.auug.org.au> 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/30 =E4=B8=8B=E5=8D=881:57, Stephen Rothwell wrote: > Hi all, > > On Mon, 30 Mar 2020 16:56:14 +1100 Stephen Rothwell wrote: >> Today's linux-next merge of the vhost tree got a conflict in: >> >> arch/arm/kvm/Kconfig >> >> between commit: >> >> 541ad0150ca4 ("arm: Remove 32bit KVM host support") >> >> from the kvm-arm tree and commit: >> >> ec9d8449a99b ("vhost: refine vhost and vringh kconfig") >> >> from the vhost tree. >> >> I fixed it up (see below) and can carry the fix as necessary. This > ^^^^^^^^^ > I just removed the file, of course. Hi Stephen: If you meant arch/arm/kvm/Kconfig I think it's correct. Thakns