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 8781EC4332F for ; Wed, 16 Nov 2022 03:03:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231416AbiKPDDR (ORCPT ); Tue, 15 Nov 2022 22:03:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230424AbiKPDDO (ORCPT ); Tue, 15 Nov 2022 22:03:14 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9815713E23; Tue, 15 Nov 2022 19:03:12 -0800 (PST) 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 4NBnt237r2z4x1T; Wed, 16 Nov 2022 14:03:06 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668567788; bh=UY0ccI3aO6v1TmsIAsEjO7GSYU2Ug6bsvaaUvJWXiMQ=; h=Date:From:To:Cc:Subject:From; b=LTKdcjZwHb/zHQzEtIEVprOBzl+Y3uuuOJpyhuB4GUTkdC+0+++faKzOv8NcEKzId TzL5XOQFwGmx83aRyA4Wx6+lJJMqC9mp4pATzcqvbuC3oUgFxjSCySRSifbsTt13ye VpZSDKh5q2ISpJFGbPfQ5eCxF0G529cmBTqJf1Rb76W6NRFREPNOJKXczdgsKJehlj bQ4SumTu2uyyRxpzyqNJGPERLCe2PX6VRlfv7yvloDsOiBoGXnFsyhnalWIcJd8YGs ZV3GZpixibbbNr/kqz0+fr2F/gJTq3CYnnwdJbLfxlU9aE6GaBiSqMnkFyw4lkhvcv Zf8sauDVR7QNg== Date: Wed, 16 Nov 2022 14:03:04 +1100 From: Stephen Rothwell To: Christian Borntraeger , Janosch Frank , Christoffer Dall , Marc Zyngier Cc: Claudio Imbrenda , Gavin Shan , Linux Kernel Mailing List , Linux Next Mailing List , Oliver Upton , Paolo Bonzini Subject: linux-next: manual merge of the kvms390 tree with the kvm-arm tree Message-ID: <20221116140304.48333261@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/mzxMh2a2MppNBDeVeNrwBI9"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/mzxMh2a2MppNBDeVeNrwBI9 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: include/uapi/linux/kvm.h between commit: 86bdf3ebcfe1 ("KVM: Support dirty ring in conjunction with bitmap") from the kvm-arm tree and commit: 57ecc06995f9 ("KVM: s390: pv: add KVM_CAP_S390_PROTECTED_ASYNC_DISABLE") from the kvms390 tree. I fixed it up (see below) 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 diff --cc include/uapi/linux/kvm.h index c87b5882d7ae,d3f86a280858..000000000000 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@@ -1178,7 -1178,7 +1178,8 @@@ struct kvm_ppc_resize_hpt=20 #define KVM_CAP_S390_ZPCI_OP 221 #define KVM_CAP_S390_CPU_TOPOLOGY 222 #define KVM_CAP_DIRTY_LOG_RING_ACQ_REL 223 -#define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 224 +#define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 224 ++#define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 225 =20 #ifdef KVM_CAP_IRQ_ROUTING =20 --Sig_/mzxMh2a2MppNBDeVeNrwBI9 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN0UugACgkQAVBC80lX 0GxI5QgAnyuHlbIYa4BK79/8oGra7RkwRp0ZwR9XEMQa6eP0RzWfwSyLxDJd120O 6NiOy2ZotxsbUKLdMOwRfJoiee6arwccqt13CfgbbhwcHdZCJIKgSR4AteY7m2hJ fjf6toEXqjT1f1WRL+lTlyG+ryllzWv4GtUnwHuuSziqrCgUygy5EduLvIDOlITU lIRWU7R/MrPThcE0RG7O/pXMq5vZbr7VmFC+6XuOe33TtriBnm4LVZmhBJto3f9d 9H0sGBZ6IhBxPQK/fGYz7c7d0jhX7thSYtxnOXdy75/nxQMiUUW35bQoPSYXWVzQ 3XdXWlyJ5iErjNXtzBitpJsKkF+76Q== =PVhU -----END PGP SIGNATURE----- --Sig_/mzxMh2a2MppNBDeVeNrwBI9--