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 conflicts in:

  include/linux/module.h
  kernel/module/kallsyms.c

between commit:

  73feb8d5fa3b ("kallsyms: Make module_kallsyms_on_each_symbol generally available")

from the net-next tree and commit:

  90de88426f3c ("livepatch: Improve the search performance of module_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 include/linux/module.h
index 35876e89eb93,3b312a1fcf59..000000000000
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@@ -879,17 -878,8 +878,17 @@@ static inline bool module_sig_ok(struc
  }
  #endif	/* CONFIG_MODULE_SIG */
  
 +#if defined(CONFIG_MODULES) && defined(CONFIG_KALLSYMS)
- int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *,
- 					     struct module *, unsigned long),
+ int module_kallsyms_on_each_symbol(const char *modname,
+ 				   int (*fn)(void *, const char *, unsigned long),
  				   void *data);
 +#else
- static inline int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *,
- 						 struct module *, unsigned long),
- 						 void *data)
++static inline int module_kallsyms_on_each_symbol(const char *modname,
++						 int (*fn)(void *, const char *, unsigned long),
++						 void *data);
 +{
 +	return -EOPNOTSUPP;
 +}
 +#endif  /* CONFIG_MODULES && CONFIG_KALLSYMS */
  
  #endif /* _LINUX_MODULE_H */
diff --cc kernel/module/kallsyms.c
index 4523f99b0358,329cef573675..000000000000
--- a/kernel/module/kallsyms.c
+++ b/kernel/module/kallsyms.c
@@@ -494,8 -494,9 +494,8 @@@ unsigned long module_kallsyms_lookup_na
  	return ret;
  }
  
- int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *,
- 					     struct module *, unsigned long),
 -#ifdef CONFIG_LIVEPATCH
+ int module_kallsyms_on_each_symbol(const char *modname,
+ 				   int (*fn)(void *, const char *, unsigned long),
  				   void *data)
  {
  	struct module *mod;

Attachment: pgpmZNkMdTObM.pgp
Description: OpenPGP digital signature