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 CEF09CDB465 for ; Tue, 17 Oct 2023 01:30:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232411AbjJQBaY (ORCPT ); Mon, 16 Oct 2023 21:30:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231955AbjJQBaY (ORCPT ); Mon, 16 Oct 2023 21:30:24 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A1C8AB; Mon, 16 Oct 2023 18:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697506220; bh=Q2fe3Ax/XToviOfwG/USlwkvyK64Re+kcHB9byMn4Qc=; h=Date:From:To:Cc:Subject:From; b=aVfXG4rvQwkg7hEYTCQ//Ce13lpfeouKTHaZYk697NX1g9qjLKQNxCi8lHUqXWg4E MtykLoZAArqvmjlQ5IkYYIIIs2pB73kdrXLDnmYL2TRaQx7mR4XdOXsJQWJWIPysR0 bmlLsLQHEd8SklhFerwDNarRhsEs4WqVkezAKl+Jbkns4CWO9d9imgSHM4ubyONsG7 mv/9a0IhWJ7I+jH1BZmT6LlyE+O4peqlQgGN//ARXRn/x1icIZrYZ0yOjpzVJkwoyk qDRJ0Sn6vRWPrCjLQo8S582GWdT88LoQ22+Gou89QRGduwBFYtigEneZI9EvGlo9vu xwxRrRK2vShTg== 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 4S8byM5Jw6z4wcf; Tue, 17 Oct 2023 12:30:19 +1100 (AEDT) Date: Tue, 17 Oct 2023 12:30:17 +1100 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Catalin Marinas , Will Deacon Cc: Linux Kernel Mailing List , Linux Next Mailing List , Mark Rutland , Oliver Upton Subject: linux-next: manual merge of the kvm-arm tree with the arm64 tree Message-ID: <20231017123017.3907baac@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/50XVF6ViMpX4.y.BB1WplxR"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/50XVF6ViMpX4.y.BB1WplxR Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/kvm/arm.c between commit: d8569fba1385 ("arm64: kvm: Use cpus_have_final_cap() explicitly") from the arm64 tree and commit: ef150908b6bd ("KVM: arm64: Add generic check for system-supported vCPU fe= atures") from the kvm-arm tree. 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. --=20 Cheers, Stephen Rothwell --Sig_/50XVF6ViMpX4.y.BB1WplxR Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUt46kACgkQAVBC80lX 0GxkHAgAhlQlvJz1zakFg+zxpviTi/spDGQRUfRn/V99p7H4qFfphq0GaW6/LBrL ZwBc6KeoECdVKHAIqUAqBn4A3gj4+ccqrTzKQBFx1DYiigvaYfbdiP2TkyPxVIEG D8Z6NWqDMs7cloluXLgKKoByQVPkmGql4/15q8Q70e0wORLl8HfgR66RI7hPOEsF sV2dXXBEMdQrGgnVymp1eS6seUKs+Pnj4FH7f/gs4UQYZkWhqNJnwpl5vS5onh3N SJmG4lSu+t6Cb3FcLWC0Escl1BJMvSWyjmZLqQDl2vPUOynQzeCbrGEFZpMMsKNv wDdiABlOzF2ikSVoS+33FKbM1TJBPw== =piPe -----END PGP SIGNATURE----- --Sig_/50XVF6ViMpX4.y.BB1WplxR--