Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Date:   Mon, 30 Oct 2023 12:53:02 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Anup Patel <anup@brainfault.org>,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Paul Walmsley <paul@pwsan.com>
Cc:     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>
Subject: linux-next: manual merge of the kvm-riscv tree with the risc-v tree
Message-ID: <20231030125302.250fc7e8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Ev_P.ii7gIhH2ye4yyf81x8";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Ev_P.ii7gIhH2ye4yyf81x8
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the kvm-riscv tree got a conflict in:

  arch/riscv/include/asm/csr.h

between commit:

  43c16d51a19b ("RISC-V: Enable cbo.zero in usermode")

from the risc-v tree and commits:

  db3c01c7a308 ("RISCV: KVM: Add senvcfg context save/restore")
  81f0f314fec9 ("RISCV: KVM: Add sstateen0 context save/restore")

from the kvm-riscv tree.

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
Cheers,
Stephen Rothwell

--Sig_/Ev_P.ii7gIhH2ye4yyf81x8
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU/DH4ACgkQAVBC80lX
0GyRDgf9E9dcPDl6hTobFU7kCPXVeo1tdZ4WYCTQ0YrOs2ywVdWTzk6L3V88sI62
7b8W4LlG7Dgze4L7amOflXScckkJRHNermO1pIvZ4lYgP2/dQtRIygPGlnnWWmgv
d2lNAzBm0vKUATKLtFrA6NQS8yBG4Rc4HidUUs72kVXnFYwrvXXMoC8ESfgA/J9D
SBmYDpnTpZHoI6jbeDr22hH1v9TtNJH9Txrqh464mAw4y1yyGeUnxT73PtoHKd3R
CFMjR9hWfEReYfwLhBw3MpgKqm5/TDH+O9xAST0I2AYSKYaeP3hao8RzJRJFI4Yo
TSll0iW4CrlBaThO3PW6td7FMc2M/w==
=qbeN
-----END PGP SIGNATURE-----

--Sig_/Ev_P.ii7gIhH2ye4yyf81x8--