Received-SPF: pass (google.com: domain of linux-kernel+bounces-60976-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Mon, 12 Feb 2024 09:55:23 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>, Linux Kernel Mailing
 List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Palmer Dabbelt <palmer@rivosinc.com>, Xiao
 Wang <xiao.w.wang@intel.com>
Subject: linux-next: manual merge of the risc-v tree with Linus' tree
Message-ID: <20240212095523.21f0579b@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/c16UwBLhyXrpFWjYjtE6z2o";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/c16UwBLhyXrpFWjYjtE6z2o
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/include/asm/bitops.h

between commit:

  4356e9f841f7 ("work around gcc bugs with 'asm goto' with outputs")

from Linus' tree and commit:

  cb4ede926134 ("riscv: Avoid code duplication with generic bitops implemen=
tation")

from the risc-v 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/bitops.h
index 329d8244a9b3,c4c2173dfe99..000000000000
--- a/arch/riscv/include/asm/bitops.h
+++ b/arch/riscv/include/asm/bitops.h
@@@ -37,9 -47,7 +47,7 @@@
 =20
  static __always_inline unsigned long variable__ffs(unsigned long word)
  {
- 	int num;
-=20
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);
 =20
@@@ -93,9 -76,7 +76,7 @@@ legacy
 =20
  static __always_inline unsigned long variable__fls(unsigned long word)
  {
- 	int num;
-=20
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);
 =20
@@@ -149,12 -105,7 +105,7 @@@ legacy
 =20
  static __always_inline int variable_ffs(int x)
  {
- 	int r;
-=20
- 	if (!x)
- 		return 0;
-=20
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);
 =20
@@@ -204,12 -137,7 +137,7 @@@ legacy
 =20
  static __always_inline int variable_fls(unsigned int x)
  {
- 	int r;
-=20
- 	if (!x)
- 		return 0;
-=20
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);
 =20

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXJUFsACgkQAVBC80lX
0GyZpQf/Yfg7Yx830HhqCBnPuJAHLCaTOH8r+WQe4Hpo0e79ifm+WlPAyilTTJAV
yAXw432SMICT5lrQSQHe/rghgeDtzi6dm+ywQI3niz7n6lwRs6AhUI1c8370HBg4
8R9kMCd/Ee3kkE5cqrBPhpA4lqqC6E874j2AeYfsmIBmePbbRLVj93NrEDtEqFWW
BeQbb0n94V+1MV4EhCQK6shoVLfNLfOKbHU1u4uuSJPxVPkWRtsocXwWa/9kL7L2
0FVPW0NYGWSG5GIwVxyX+QEWvSAYa9X9omMX5vqr2ffuOX9D7CB6WPKyquIfGCZP
8bGR0rHyn5pZmYQsh6TAvd93hwjN2g==
=YZtF
-----END PGP SIGNATURE-----

--Sig_/c16UwBLhyXrpFWjYjtE6z2o--