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 0D095C433EF for ; Mon, 23 May 2022 09:14:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232738AbiEWJOG (ORCPT ); Mon, 23 May 2022 05:14:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232732AbiEWJOF (ORCPT ); Mon, 23 May 2022 05:14:05 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E467446B3B; Mon, 23 May 2022 02:14:03 -0700 (PDT) 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 4L6BTk2zSqz4xXg; Mon, 23 May 2022 19:14:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1653297242; bh=bAqoIMEuQquPVKkfMuxks/eKt3v5juteOw3qBcvys58=; h=Date:From:To:Cc:Subject:From; b=M4DRqq3qZTNlqaGQoFdIShgUnBPZxKxEgWUf1nYChNxef9tF0SEpH4Fwmvmb5EZ6s RW9zy0seuf7HoYimzNCAgb/2KaF8mka2LoI/VaVvXWBI/b88bXJHnXNjvoutm1TvpY Aw0aCBinpqsdgOa/Ygv2WdVmamN5Ocph9+gJEqhL6tiO69uH03l/WZPtSOzU1pYCGt uZVWLeplsry+V2S8uzyc1AZfY0LUpC6YCP2l6GA0mDxwhfesCDWBemOK2thqoaiSrG 6OLuIcB5gcwK9cSvYHE2g83BILDfXy/edwVjgcbdf1sgO+lCmjo5BCxqW6QfsfhQ+c Lx+d29ZCx/t7w== Date: Mon, 23 May 2022 19:14:01 +1000 From: Stephen Rothwell To: Yury Norov Cc: Linux Kernel Mailing List , Linux Next Mailing List , Paolo Bonzini Subject: linux-next: manual merge of the bitmap tree with Linus' tree Message-ID: <20220523191401.2fccbdd6@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/8vnJZJq2krq+Nj4hTh=PJWZ"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/8vnJZJq2krq+Nj4hTh=PJWZ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the bitmap tree got a conflict in: arch/x86/kvm/hyperv.c between commit: ea8c66fe8d8f ("KVM: x86: hyper-v: fix type of valid_bank_mask") from Linus' tree and commit: 017a983d0ecf ("KVM: x86: hyper-v: replace bitmap_weight() with hweight64(= )") from the bitmap 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_/8vnJZJq2krq+Nj4hTh=PJWZ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKLUFkACgkQAVBC80lX 0GxdMAf+KQJMtqsd9fpEWss5ITLmbWRZ+ui4Z3Z/jibPYF63fHneeX1hM54ZOI+b UCYPbfOUwJbn+vCUI/mibD6xfudTW42fd+1bSJssuZLthUl0I5Lgc9bYZnJb0Oq3 KsCUH8VQD/ZaXyWmTnhOb+CMI2ed0vS+IIc6JfHfV0NN+nyqq7rLnhH5b4I8v8nD 8ku5s+Hk3oMGXxTgSPiPcNVM2JwYmnJFxEScFGCxz0Cn86TGOst0sgOnZAS4QrBJ gB6+eQ/UCI6zOxSHCoTNlboIN2NtY4Zr82rRE/pGD03mY0OFZpgRPpfBav9nYlm0 S3NeFMH68fcUshx9wooUzpRVnshXpw== =3Jks -----END PGP SIGNATURE----- --Sig_/8vnJZJq2krq+Nj4hTh=PJWZ--