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

[Stephen Rothwell]

Hi all,

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

  include/linux/moduleparam.h

between commit:

  7934a8dd8692 ("module: remove meaningless 'name' parameter from __MODULE_INFO()")

from the kbuild tree and commit:

  40a826bd6c82 ("module: Rename MAX_PARAM_PREFIX_LEN to __MODULE_NAME_LEN")

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/moduleparam.h
index 00166f747e27,a04a2bc4f51e..000000000000
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@@ -17,12 -24,8 +24,9 @@@
  #define __MODULE_INFO_PREFIX KBUILD_MODNAME "."
  #endif
  
- /* Chosen so that structs with an unsigned long line up. */
- #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
- 
 -#define __MODULE_INFO(tag, name, info)					  \
 -	static const char __UNIQUE_ID(name)[]				  \
 +/* Generic info of form tag = "info" */
 +#define MODULE_INFO(tag, info)					  \
 +	static const char __UNIQUE_ID(modinfo)[]			  \
  		__used __section(".modinfo") __aligned(1)		  \
  		= __MODULE_INFO_PREFIX __stringify(tag) "=" info

Attachment: pgpf2qOHLyaLL.pgp
Description: OpenPGP digital signature