Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 17 Jan 2022 08:54:31 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com>
Cc:     Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
        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: Re: linux-next: manual merge of the kvm tree with the risc-v tree
Message-ID: <20220117085431.7bef9ebc@canb.auug.org.au>
In-Reply-To: <20220112114024.7be8aac6@canb.auug.org.au>
References: <20220112114024.7be8aac6@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ls2tCAonIwnKX_AJBeqqKur";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Wed, 12 Jan 2022 11:40:24 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the kvm tree got a conflict in:
>=20
>   arch/riscv/include/asm/sbi.h
>=20
> between commit:
>=20
>   b579dfe71a6a ("RISC-V: Use SBI SRST extension when available")
>=20
> from the risc-v tree and commit:
>=20
>   c62a76859723 ("RISC-V: KVM: Add SBI v0.2 base extension")
>=20
> from the kvm tree.
>=20
> 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
>=20
> 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 {

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

--=20
Cheers,
Stephen Rothwell

--Sig_/ls2tCAonIwnKX_AJBeqqKur
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmHklBcACgkQAVBC80lX
0Gx0Kgf8DwWsTWCg2uDT5qR3wwkFtCKSuP0wF5QIgkhrkYZpRAudXaqXQyjsiXO5
+sELtoAlDRix1bMM+A470UU5PFX0nol4w3iP+YqQM0blt2K8B8ghCeq4bww4U+RP
f2tE7YVt88/vqoz689CO5XkBSx3FHThW9iyGpZbSdc6ZLALypOB/NSIqQqaMKEfu
qRCNILhu8gVRVsBMXvZeKDEb+w4YdKggW8vifasj+Wldrk+C0r61jc+wycpUvbSS
WBPm5NjAj4Dz1VxUxc/x/TkRJZVzxFI3Z2bj7Zz/1XftvUBrS0MaW7BRoU0gTeUY
iJX/XQCADUMTvHa94AVweB0pauBgqA==
=N0Ig
-----END PGP SIGNATURE-----

--Sig_/ls2tCAonIwnKX_AJBeqqKur--