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

  arch/powerpc/kernel/module_64.c

between commit:

  06aeb9e3f2bc ("powerpc/kbuild: move -mprofile-kernel check to Kconfig")

from the kbuild tree and commit:

  250122baed29 ("powerpc64/module: Tighten detection of mcount call sites with -mprofile-kernel")

from the powerpc 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/powerpc/kernel/module_64.c
index 55bccc315e1a,f7667e2ebfcb..000000000000

--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c

@@@ -462,9 -466,12 +466,12 @@@ static unsigned long stub_for_addr(cons
  	return (unsigned long)&stubs[i];
  }
  
 -#ifdef CC_USING_MPROFILE_KERNEL
 +#ifdef CONFIG_MPROFILE_KERNEL
- static bool is_early_mcount_callsite(u32 *instruction)
+ static bool is_mprofile_mcount_callsite(const char *name, u32 *instruction)
  {
+ 	if (strcmp("_mcount", name))
+ 		return false;
+ 
  	/*
  	 * Check if this is one of the -mprofile-kernel sequences.
  	 */