linux-next: manual merge of the modules tree with the net-next tree

[Stephen Rothwell]

Hi all,

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

  kernel/trace/ftrace.c

between commit:

  3640bf8584f4 ("ftrace: Add support to resolve module symbols in ftrace_lookup_symbols")

from the net-next tree and commit:

  477f7e48d4f4 ("kallsyms: Delete an unused parameter related to kallsyms_on_each_symbol()")

from the modules 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 kernel/trace/ftrace.c
index 705b990d264d,7a06991624d4..000000000000
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@@ -8257,12 -8257,7 +8257,11 @@@ struct kallsyms_data 
  	size_t found;
  };
  
 +/* This function gets called for all kernel and module symbols
 + * and returns 1 in case we resolved all the requested symbols,
 + * 0 otherwise.
 + */
- static int kallsyms_callback(void *data, const char *name,
- 			     struct module *mod, unsigned long addr)
+ static int kallsyms_callback(void *data, const char *name, unsigned long addr)
  {
  	struct kallsyms_data *args = data;
  	const char **sym;

Attachment: pgp6JCcxkAVYb.pgp
Description: OpenPGP digital signature