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/errata_list.h

between commit:

  e83031564137 ("riscv: Fix ALT_THEAD_PMA's asm parameters")

from Linus' tree and commit:

  9c2ea4a36364 ("riscv: convert the t-head pbmt errata to use the __nops macro")

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/errata_list.h
index 416ead0f9a65,e4ee53551343..000000000000
--- a/arch/riscv/include/asm/errata_list.h
+++ b/arch/riscv/include/asm/errata_list.h
@@@ -68,19 -68,13 +68,13 @@@ asm(ALTERNATIVE_2("li %0, 0\t\nnop"
   */
  #define ALT_THEAD_PMA(_val)						\
  asm volatile(ALTERNATIVE(						\
- 	"nop\n\t"							\
- 	"nop\n\t"							\
- 	"nop\n\t"							\
- 	"nop\n\t"							\
- 	"nop\n\t"							\
- 	"nop\n\t"							\
- 	"nop",								\
+ 	__nops(7),							\
 -	"li      t3, %2\n\t"						\
 -	"slli    t3, t3, %4\n\t"					\
 +	"li      t3, %1\n\t"						\
 +	"slli    t3, t3, %3\n\t"					\
  	"and     t3, %0, t3\n\t"					\
  	"bne     t3, zero, 2f\n\t"					\
 -	"li      t3, %3\n\t"						\
 -	"slli    t3, t3, %4\n\t"					\
 +	"li      t3, %2\n\t"						\
 +	"slli    t3, t3, %3\n\t"					\
  	"or      %0, %0, t3\n\t"					\
  	"2:",  THEAD_VENDOR_ID,						\
  		ERRATA_THEAD_PBMT, CONFIG_ERRATA_THEAD_PBMT)		\

Attachment: pgpyBOgoxjwH7.pgp
Description: OpenPGP digital signature