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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 21 Aug 2013 18:01:37 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jingoo Han <jg1.han@...sung.com>,
	Christoph Jaeger <christophjaeger@...ux.com>,
	Rusty Russell <rusty@...tcorp.com.au>
Subject: linux-next: manual merge of the akpm-current tree with the modules
 tree

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@...b.auug.org.au

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)
  {

Content of type "application/pgp-signature" skipped