linux-next: manual merge of the akpm-current tree with the modulestree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
kernel/params.c between commit 79ac6834c255 ("module: fix sprintf format
specifier in param_get_byte()") from the modules tree and commit
55bba1b7fcce ("kernel: replace strict_strto*() with kstrto*()") from the
akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc kernel/params.c
index e5f8f17,1f228a3..0000000
--- a/kernel/params.c
+++ b/kernel/params.c
@@@ -253,13 -252,13 +253,13 @@@ int parse_args(const char *doing
  	EXPORT_SYMBOL(param_ops_##name)
  
  
- STANDARD_PARAM_DEF(byte, unsigned char, "%hhu", unsigned long, strict_strtoul);
- STANDARD_PARAM_DEF(short, short, "%hi", long, strict_strtol);
- STANDARD_PARAM_DEF(ushort, unsigned short, "%hu", unsigned long, strict_strtoul);
- STANDARD_PARAM_DEF(int, int, "%i", long, strict_strtol);
- STANDARD_PARAM_DEF(uint, unsigned int, "%u", unsigned long, strict_strtoul);
- STANDARD_PARAM_DEF(long, long, "%li", long, strict_strtol);
- STANDARD_PARAM_DEF(ulong, unsigned long, "%lu", unsigned long, strict_strtoul);
 -STANDARD_PARAM_DEF(byte, unsigned char, "%c", unsigned long, kstrtoul);
++STANDARD_PARAM_DEF(byte, unsigned char, "%hhu", unsigned long, kstrtoul);
+ STANDARD_PARAM_DEF(short, short, "%hi", long, kstrtol);
+ STANDARD_PARAM_DEF(ushort, unsigned short, "%hu", unsigned long, kstrtoul);
+ STANDARD_PARAM_DEF(int, int, "%i", long, kstrtol);
+ STANDARD_PARAM_DEF(uint, unsigned int, "%u", unsigned long, kstrtoul);
+ STANDARD_PARAM_DEF(long, long, "%li", long, kstrtol);
+ STANDARD_PARAM_DEF(ulong, unsigned long, "%lu", unsigned long, kstrtoul);
  
  int param_set_charp(const char *val, const struct kernel_param *kp)
  {

Attachment: pgp00000.pgp
Description: PGP signature