Received-SPF: pass (google.com: domain of linux-kernel+bounces-19011-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Mon, 8 Jan 2024 09:49:57 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: 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>, Palmer Dabbelt <palmer@rivosinc.com>
Subject: linux-next: manual merge of the risc-v tree with Linus' tree
Message-ID: <20240108094957.2cc727e0@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/qgD8engf.b9+KAHyIK2gWbO";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/qgD8engf.b9+KAHyIK2gWbO
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/riscv/kernel/sys_riscv.c

between commit:

  777c0d761be7 ("RISC-V: hwprobe: Always use u64 for extension bits")

from Linus' tree and commit:

  53b2b22850e1 ("RISC-V: Move the hwprobe syscall to its own file")

from the risc-v tree.

I fixed it up (I used the latter version of this file and applied the
following merge fix patch) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Jan 2024 09:46:10 +1100
Subject: [PATCH] fix up for "RISC-V: Move the hwprobe syscall to its own fi=
le"

interacting with commit

  777c0d761be7 ("RISC-V: hwprobe: Always use u64 for extension bits")

from Linus' tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/riscv/kernel/sys_hwprobe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/kernel/sys_hwprobe.c b/arch/riscv/kernel/sys_hwprob=
e.c
index ccf61b040536..41f45acb156b 100644
--- a/arch/riscv/kernel/sys_hwprobe.c
+++ b/arch/riscv/kernel/sys_hwprobe.c
@@ -136,7 +136,7 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,
 	pair->value &=3D ~missing;
 }
=20
-static bool hwprobe_ext0_has(const struct cpumask *cpus, unsigned long ext)
+static bool hwprobe_ext0_has(const struct cpumask *cpus, u64 ext)
 {
 	struct riscv_hwprobe pair;
=20
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/qgD8engf.b9+KAHyIK2gWbO
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWbKpUACgkQAVBC80lX
0GyuhAf/V3Iydy1RkyrNTOhogC/nFKraBax2Z1CK0wX9YtbZz0SkPbIbxPv63ogg
o9Uy+HuCt//TwoATGnnVZdCplDCdZkon9ZzYH68QgYlGJuXQjn7YZmDv6K+P6AV+
ySAXjSX41seCWlDcXf3OeNL2tQVWKEFQWd5+1dCanrJJb5sJc9le3dPSg5y4GD6w
DFC9nrd+6FFhyJfuvncA4A9EqIk4QiK05QV+cwqVRyUvRxBalJRvCsKRtcVyq8EL
XePLUsyB6062qGg1qm5IQjWRV2VB/9YAguoA0rzDXd1gqrBFNIrQcHpyU4E/FDaA
9QyLpP56OY4rrrXDia9o7qcv/jorcQ==
=P4Gb
-----END PGP SIGNATURE-----

--Sig_/qgD8engf.b9+KAHyIK2gWbO--