linux-next: manual merge of the risc-v tree with Linus' tree

[Stephen Rothwell]

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 implementation")

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.

-- 
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 @@@
  
  static __always_inline unsigned long variable__ffs(unsigned long word)
  {
- 	int num;
- 
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);
  
@@@ -93,9 -76,7 +76,7 @@@ legacy
  
  static __always_inline unsigned long variable__fls(unsigned long word)
  {
- 	int num;
- 
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);
  
@@@ -149,12 -105,7 +105,7 @@@ legacy
  
  static __always_inline int variable_ffs(int x)
  {
- 	int r;
- 
- 	if (!x)
- 		return 0;
- 
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);
  
@@@ -204,12 -137,7 +137,7 @@@ legacy
  
  static __always_inline int variable_fls(unsigned int x)
  {
- 	int r;
- 
- 	if (!x)
- 		return 0;
- 
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);

Attachment: pgpCGdOBOaofN.pgp
Description: OpenPGP digital signature