Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
Date:   Wed, 1 Nov 2023 13:37:43 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com>
Cc:     Anup Patel <anup@brainfault.org>,
        Andrew Jones <ajones@ventanamicro.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mayuresh Chitale <mchitale@ventanamicro.com>,
        Palmer Dabbelt <palmer@rivosinc.com>,
        Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kvm-riscv tree with the risc-v
 tree
Message-ID: <20231101133743.70454594@canb.auug.org.au>
In-Reply-To: <20231030125302.250fc7e8@canb.auug.org.au>
References: <20231030125302.250fc7e8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/4y4=U+6yjH0ay7I=XYwtotI";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/4y4=U+6yjH0ay7I=XYwtotI
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 30 Oct 2023 12:53:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
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.

This is now a conflict between the kvm tree and the risc-v tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/4y4=U+6yjH0ay7I=XYwtotI
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVBufcACgkQAVBC80lX
0GwhQgf/VhKxVFTnb9O4m7ZXuCCW66Xp3NHf1tADuOxPYlg5mUMKlwBHXlXVleNn
QiBg+Rujt/1FBmiXPJjiYwDGXaQcu9zkKoi3fe7vbX2zzLGfdDLm3SKdje8q10uS
lnsIKiUc4bz498tkzDPwJ345s1zsji4YHiEPWw+nG3PuPkmHSF5bnj5AjErLj5qy
Per14S5UBvUE6BGHOae81DNeaLJ8ve6Yep97icATgpxZ/V+Wh5/qYXTrfWHvWqX1
oyi/jebBRMzLMt8LNO2DCzOy+zHIT3S+Xr7vNen/qWB9VwZPCxtH2971xZOS+svI
OLukwv9Cv+hF74UTcpv2SUIEfLWi7Q==
=fGHd
-----END PGP SIGNATURE-----

--Sig_/4y4=U+6yjH0ay7I=XYwtotI--