linux-next: manual merge of the ftrace tree with the parisc-hd tree

linux-next: manual merge of the ftrace tree with the parisc-hd tree

[Stephen Rothwell]

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

Hi all,

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

  arch/parisc/kernel/ftrace.c

between commit:

  e1e134bf1eb6 ("parisc/ftrace: set function trace function")

from the parisc-hd tree and commit:

  6644c654ea70 ("ftrace: Cleanup ftrace_dyn_arch_init()")

from the ftrace 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/parisc/kernel/ftrace.c
index 8b9b8ce95d8d,01581f715737..000000000000
--- a/arch/parisc/kernel/ftrace.c
+++ b/arch/parisc/kernel/ftrace.c
@@@ -92,15 -94,8 +92,9 @@@ int ftrace_disable_ftrace_graph_caller(
  #endif
  
  #ifdef CONFIG_DYNAMIC_FTRACE
- 
- int __init ftrace_dyn_arch_init(void)
- {
- 	return 0;
- }
- 
  int ftrace_update_ftrace_func(ftrace_func_t func)
  {
 +	ftrace_func = func;
  	return 0;
  }
  

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