linux-next: manual merge of the sparc tree with the mm-nonmm-unstable tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]

Hi all,

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

  arch/sparc/include/asm/asm-prototypes.h

between commit:

  4fc4802c9d563 ("sparc: add _mcount() prototype")

from the mm-nonmm-unstable tree and commits:

  1919c0e50000e ("sparc: add _mcount() prototype")
  2416b30ec23fd ("sparc: Export mcount for Clang-built modules")

from the sparc 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.

diff --combined arch/sparc/include/asm/asm-prototypes.h
index 270c51017212a,a39a24c53216b..0000000000000
--- a/arch/sparc/include/asm/asm-prototypes.h
+++ b/arch/sparc/include/asm/asm-prototypes.h
@@@ -26,6 -26,7 +26,7 @@@ void *memset(void *s, int c, size_t n)
  typedef int TItype __attribute__((mode(TI)));
  TItype __multi3(TItype a, TItype b);
  void _mcount(void);
+ void mcount(void);
  
  s64 __ashldi3(s64, int);
  s64 __lshrdi3(s64, int);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]