linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jingoo Han <jg1.han@samsung.com>,
	Christoph Jaeger <christophjaeger@linux.com>,
	Rusty Russell <rusty@rustcorp.com.au>
Subject: linux-next: manual merge of the akpm-current tree with the modules tree
Date: Wed, 21 Aug 2013 18:01:37 +1000	[thread overview]
Message-ID: <20130821180137.c3b4d9240ce859e9e8f8ede9@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1849 bytes --]

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@canb.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)
  {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-08-21  8:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-21  8:01 Stephen Rothwell [this message]
2013-12-05  1:56 linux-next: manual merge of the akpm-current tree with the modules tree Stephen Rothwell
2015-02-12  5:08 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130821180137.c3b4d9240ce859e9e8f8ede9@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=christophjaeger@linux.com \
    --cc=jg1.han@samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rusty@rustcorp.com.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).