Date:   Wed, 12 Jan 2022 11:40:24 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Paul Walmsley <paul@pwsan.com>
Cc:     Anup Patel <anup.patel@wdc.com>, Anup Patel <anup@brainfault.org>,
        Atish Patra <atish.patra@wdc.com>,
        Atish Patra <atishp@atishpatra.org>,
        Atish Patra <atishp@rivosinc.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Palmer Dabbelt <palmer@rivosinc.com>
Subject: linux-next: manual merge of the kvm tree with the risc-v tree
Message-ID: <20220112114024.7be8aac6@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/K7Ubz=brIb1y3c3=TxKJ2aa";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/K7Ubz=brIb1y3c3=TxKJ2aa
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/riscv/include/asm/sbi.h

between commit:

  b579dfe71a6a ("RISC-V: Use SBI SRST extension when available")

from the risc-v tree and commit:

  c62a76859723 ("RISC-V: KVM: Add SBI v0.2 base extension")

from the kvm 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 arch/riscv/include/asm/sbi.h
index 289621da4a2a,9c46dd3ff4a2..000000000000
--- a/arch/riscv/include/asm/sbi.h
+++ b/arch/riscv/include/asm/sbi.h
@@@ -27,7 -27,14 +27,15 @@@ enum sbi_ext_id=20
  	SBI_EXT_IPI =3D 0x735049,
  	SBI_EXT_RFENCE =3D 0x52464E43,
  	SBI_EXT_HSM =3D 0x48534D,
 +	SBI_EXT_SRST =3D 0x53525354,
+=20
+ 	/* Experimentals extensions must lie within this range */
+ 	SBI_EXT_EXPERIMENTAL_START =3D 0x08000000,
+ 	SBI_EXT_EXPERIMENTAL_END =3D 0x08FFFFFF,
+=20
+ 	/* Vendor extensions must lie within this range */
+ 	SBI_EXT_VENDOR_START =3D 0x09000000,
+ 	SBI_EXT_VENDOR_END =3D 0x09FFFFFF,
  };
 =20
  enum sbi_ext_base_fid {

--Sig_/K7Ubz=brIb1y3c3=TxKJ2aa
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmHeI3gACgkQAVBC80lX
0GyRLwf/dZfNTizbKDGcGjR+EDWhOPre6wrMErgFDFsCmdSpqGtfgBlkE/8FFONf
Sp9JeRtbfJW9QuR3oMu9LjJ294pR0BxACew/jJicA+8PYbYIFZ/BCp/81Fj0TcYa
i5R+ibntAEFAqQCRwo1RNmdVWyB0qQITy3Wo3SmqDRG6hscQttxvmk6UPHnxolj7
P0BjIuN3rKxFqZz6F65dA8CWeQKlEUbcIsVIf/+CzL/hMcQSorxYORgWOrRar5+V
NKYwZNNtK/D5ZeBs4ldLo6WQ39QTtBCrWSPvkd4RNv6bVLu7f9Nr329j25HMmKOi
wX2CC1mDTBST8SsJAcSbAXWxd/WCBA==
=Gwix
-----END PGP SIGNATURE-----

--Sig_/K7Ubz=brIb1y3c3=TxKJ2aa--