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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2FCEC4167B for ; Wed, 1 Nov 2023 02:36:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344943AbjKACgQ (ORCPT ); Tue, 31 Oct 2023 22:36:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343508AbjKACgO (ORCPT ); Tue, 31 Oct 2023 22:36:14 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 682A8BD; Tue, 31 Oct 2023 19:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698806166; bh=TxYijZCRoh5ojMbiyuaBbdMRPr9YE0sS1cIswYJBrNw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=nc14nOhlvjNPxk3F06m3sjqwkgaRGnmXpMxzTrN14V44ZH9c9yeBLsiFnD/+HB4F7 s+TFBz2t2QJGytVoOCag8Hveojw9M9y0SU/Hw8WaN7l4ObQC7bI6oSOCfD4i/wF/Ys Q4eUFpF5/dpFJQ/u3tufZzTA0XNnazUKnywTGB/cIJ/FJF9GZ1p+8kr3xWqz3dQ4c+ 80Cro+gRyF60tEpeApZf7cToBOibXON0eF4bRhtJ22hLfDVNESD8Kc5F2KGfVCc0GI vtLfoTJs0i5zoWiN+47ffZXf7DquDReUg7REhdqBVrlTSsvWnf+jn5nQFlfkykBEfz dGVxV2lBmYx8Q== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SKrjK69Sxz4wcg; Wed, 1 Nov 2023 13:36:05 +1100 (AEDT) Date: Wed, 1 Nov 2023 13:36:04 +1100 From: Stephen Rothwell To: Marc Zyngier , Catalin Marinas , Will Deacon , Paolo Bonzini Cc: Christoffer Dall , Linux Kernel Mailing List , Linux Next Mailing List , Mark Rutland , Oliver Upton , KVM Subject: Re: linux-next: manual merge of the kvm-arm tree with the arm64 tree Message-ID: <20231101133604.4edad0b3@canb.auug.org.au> In-Reply-To: <20231017123017.3907baac@canb.auug.org.au> References: <20231017123017.3907baac@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/+QxrnIxb6+.k+HEe3OnigdV"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/+QxrnIxb6+.k+HEe3OnigdV Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Tue, 17 Oct 2023 12:30:17 +1100 Stephen Rothwell = wrote: > > Today's linux-next merge of the kvm-arm tree got a conflict in: >=20 > arch/arm64/kvm/arm.c >=20 > between commit: >=20 > d8569fba1385 ("arm64: kvm: Use cpus_have_final_cap() explicitly") >=20 > from the arm64 tree and commit: >=20 > ef150908b6bd ("KVM: arm64: Add generic check for system-supported vCPU = features") >=20 > from the kvm-arm tree. >=20 > I fixed it up (I just used the latter) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may also want to consider > cooperating with the maintainer of the conflicting tree to minimise any > particularly complex conflicts. This is now a conflict between the kvm tree and the arm64 tree. --=20 Cheers, Stephen Rothwell --Sig_/+QxrnIxb6+.k+HEe3OnigdV Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVBuZQACgkQAVBC80lX 0GwH5wf/RdBQBcblcMFtgM49SEUF4RHWBHhiep/hIg6tPWG7pKPVgKeyold61+3s a0ifRXxLD0IuXgPuHoiX39UfTE4yH6TcYOaZ8mkZTX3DthWbFGUxINPDgc3TuWMz tXNYH7xvCVFHPUI1jiSeVBT70BjJ4errJm7aG6OxisEEhbKsBENJJpijmuSaCM5J lqmyxsyhGWHrEkoVN+Jim7Krr2c8v1glhbpmqK2rR1JY4ORCm1SPPZJ73cM1lKxn SbBmaOJIqw18H644nM57jPMZcudLI5oXlDK6SzBbbUKShP/Oab6gSR0tgWz94dHP fImX/y4UFkKfrlrziffVjsnrixEKjw== =hLaM -----END PGP SIGNATURE----- --Sig_/+QxrnIxb6+.k+HEe3OnigdV--