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=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS 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 F33D0C43331 for ; Mon, 30 Mar 2020 05:57:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA62220732 for ; Mon, 30 Mar 2020 05:57:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="rT8ZR6Zh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728768AbgC3F5F (ORCPT ); Mon, 30 Mar 2020 01:57:05 -0400 Received: from ozlabs.org ([203.11.71.1]:50641 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728571AbgC3F5F (ORCPT ); Mon, 30 Mar 2020 01:57:05 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 48rMDH04lWz9sPR; Mon, 30 Mar 2020 16:57:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1585547823; bh=DCB2IE+JNo2rtrGMjNCg0CRfMfpjrzrgEnSWNGyixUI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=rT8ZR6Zhhoed8IRfKX1diFaFe1MjWejzNznCRHHIHkai8Y1hCthGJLT24TmJwOn6t sMHN26gJVV/IC7nAhQXxxnMfxMD4wYlTeY6B0+tTq8ZAnnfBLEYoLx63xyYJdCHiN4 xmwB9HgBwrgdHRmJ3/BAPaRxE/0kIAu/2tm6LZt8j1bTml8iVkxFN0v/uuZos7OOax KDuF2kHqDjPAUMUZiEPbqMtRjaGs0k0H0dtd4Z0rGI9bu+lstikmN3Gvm9bwudhUVP bkA2Z1OSeg14c2t11Sa+GwFiUD1+rRMGu4OayMQLws+KZWrYm31F94xl2ILd/WDPRM M+WS+C0AeO7kA== Date: Mon, 30 Mar 2020 16:57:01 +1100 From: Stephen Rothwell To: "Michael S. Tsirkin" , Christoffer Dall , Marc Zyngier Cc: Linux Next Mailing List , Linux Kernel Mailing List , Jason Wang Subject: Re: linux-next: manual merge of the vhost tree with the kvm-arm tree Message-ID: <20200330165701.4e1b8039@canb.auug.org.au> In-Reply-To: <20200330165614.4973a4bc@canb.auug.org.au> References: <20200330165614.4973a4bc@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/4/8LVUud4hp=M6BeY9_/rU_"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/4/8LVUud4hp=M6BeY9_/rU_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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: >=20 > arch/arm/kvm/Kconfig >=20 > between commit: >=20 > 541ad0150ca4 ("arm: Remove 32bit KVM host support") >=20 > from the kvm-arm tree and commit: >=20 > ec9d8449a99b ("vhost: refine vhost and vringh kconfig") >=20 > from the vhost tree. >=20 > I fixed it up (see below) and can carry the fix as necessary. This ^^^^^^^^^ I just removed the file, of course. --=20 Cheers, Stephen Rothwell --Sig_/4/8LVUud4hp=M6BeY9_/rU_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl6Bii0ACgkQAVBC80lX 0GzXMAf6A7elp/esZdF7VMhsafrLPvwewf6DMNS44LE5XsFccb7iE66xX0LMHDJH raBX+b5GoGW5Y2KdKwPb7LhTt4t0ekF5KBSNyh8BI9B+bfZnHTHo/zxHOkapGqMY fCz4w7R+sDcLigA+MwktdxVtsG+85U0rqaEWH5buekogJgiwGsLYuBZL4d3ATm1b NRTcgqX2hzMt2KO7z0bTi0Ge72mIu3v9ROx8pjo9Fi7ccdlbfu+rZA3FK1xeDav2 /am5BVTn/z0iJzZuk2zI2VNzDDusXep/rcCyMzuuRxZZGfPtEJQHUFe1Szpj4CTi nrKJqqiOqnniV3Mvaij7X11ooguOcQ== =WGf1 -----END PGP SIGNATURE----- --Sig_/4/8LVUud4hp=M6BeY9_/rU_--