linux-next: manual merge of the mm-nonmm-stable tree with the risc-v-fixes tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the mm-nonmm-stable tree got a conflict in:

  arch/riscv/include/asm/ftrace.h

between commit:

  680341382da5 ("riscv: add CALLER_ADDRx support")

from the risc-v-fixes tree and commit:

  de5f3984664e ("riscv: remove MCOUNT_NAME workaround")

from the mm-nonmm-stable 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/ftrace.h
index 15055f9df4da,cf5b63e789fa..000000000000
--- a/arch/riscv/include/asm/ftrace.h
+++ b/arch/riscv/include/asm/ftrace.h
@@@ -13,24 -13,9 +13,14 @@@
  #endif
  #define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR
  
- /*
-  * Clang prior to 13 had "mcount" instead of "_mcount":
-  * https://reviews.llvm.org/D98881
-  */
- #if defined(CONFIG_CC_IS_GCC) || CONFIG_CLANG_VERSION >= 130000
- #define MCOUNT_NAME _mcount
- #else
- #define MCOUNT_NAME mcount
- #endif
- 
  #define ARCH_SUPPORTS_FTRACE_OPS 1
  #ifndef __ASSEMBLY__
 +
 +extern void *return_address(unsigned int level);
 +
 +#define ftrace_return_address(n) return_address(n)
 +
- void MCOUNT_NAME(void);
+ void _mcount(void);
  static inline unsigned long ftrace_call_adjust(unsigned long addr)
  {
  	return addr;

Attachment: pgpADU0_PGz95.pgp
Description: OpenPGP digital signature