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 BF0F8C4332F for ; Sun, 5 Nov 2023 22:32:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229819AbjKEWcJ (ORCPT ); Sun, 5 Nov 2023 17:32:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229652AbjKEWcF (ORCPT ); Sun, 5 Nov 2023 17:32:05 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1FA5DB; Sun, 5 Nov 2023 14:32:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1699223521; bh=tXo2JKdNmipVtk9xtlHrP8gzkKdlJTGNLcUVmH8G0EU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=uNq/aKjSj2jmer3W1oTJYFp/oY+e8XnJWWgtkcB2r0GMZfR66GZwioTHDyPRBmuM7 omJ2ehqW/VciJyHnhSEVWVcHIDxfneaxa4HiblFM7UPJpeIrBIwXZ0Krl6sZQSqE4K UWi71ybUMOW4JGqxkaZ9KE0tiiX/ahwniVYuwx4HQ2/CYc3WECXuLw2lu65bm9OFy8 lvAcB6SrBmqCup2RqX8ajpWdO7FQBxt1EWcKVSboIKs0eOFeuhwBse8S6XrW3qOg86 rXopybaaO6SNr7FP57IN2ss4I7r7thbe13AfZponnGPF4CvkM2SNPhcYsFIRKSxQpo oEMuD4n/e72nw== 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 4SNq3K5nFXz4wxY; Mon, 6 Nov 2023 09:31:57 +1100 (AEDT) Date: Mon, 6 Nov 2023 09:31:57 +1100 From: Stephen Rothwell To: Palmer Dabbelt , Paul Walmsley Cc: Anup Patel , Andrew Jones , Linux Kernel Mailing List , Linux Next Mailing List , Mayuresh Chitale , Palmer Dabbelt , Paolo Bonzini , KVM Subject: Re: linux-next: manual merge of the kvm-riscv tree with the risc-v tree Message-ID: <20231106093157.24f46f82@canb.auug.org.au> In-Reply-To: <20231101133743.70454594@canb.auug.org.au> References: <20231030125302.250fc7e8@canb.auug.org.au> <20231101133743.70454594@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_//TXYKlFMg=EiXnsRQp=JYCH"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_//TXYKlFMg=EiXnsRQp=JYCH Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Wed, 1 Nov 2023 13:37:43 +1100 Stephen Rothwell w= rote: >=20 > On Mon, 30 Oct 2023 12:53:02 +1100 Stephen Rothwell wrote: > > > > Today's linux-next merge of the kvm-riscv tree got a conflict in: > >=20 > > arch/riscv/include/asm/csr.h > >=20 > > between commit: > >=20 > > 43c16d51a19b ("RISC-V: Enable cbo.zero in usermode") > >=20 > > from the risc-v tree and commits: > >=20 > > db3c01c7a308 ("RISCV: KVM: Add senvcfg context save/restore") > > 81f0f314fec9 ("RISCV: KVM: Add sstateen0 context save/restore") > >=20 > > from the kvm-riscv tree. > >=20 > > I fixed it up (I just used the latter version of this file) 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 >=20 > This is now a conflict between the kvm tree and the risc-v tree. This is now a conflict between the risc-v tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_//TXYKlFMg=EiXnsRQp=JYCH Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVIF90ACgkQAVBC80lX 0GwIcAf/WTnE+DOhWu4iFbTOUUOLad3BTVjC12KaGL9sHEsZA8qV8gHKesWG7Pv/ 4cXqq5AANe8tkRv7Sbg7dMZWE7jb+ttSI6N2yGcCkHGwyn82Q12ULD+NT2+WJx8+ m887BN1WJmdUbojC+xzMPwkVZRemc4jIZi9ZozcYjvrSW0kqu7CqUViDSmu878LB ooVSExihnYHPULAfvUUowWz8YkAquSAkvVsgRIoMgYtiyEc2E2eIXraUrIZQImNJ dOJ0Djs3eWF/oe12SrcvuwBu3XtZl9A4JJ9VHAjlVyt1oND+l3YJ3g9blL8JAypY Am6Wy7Orn7IhLqcuIQxXjMLOIOaakg== =GOX2 -----END PGP SIGNATURE----- --Sig_//TXYKlFMg=EiXnsRQp=JYCH--