* linux-next: manual merge of the akpm-current tree with the modules tree
@ 2013-08-21 8:01 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2013-08-21 8:01 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Jingoo Han, Christoph Jaeger, Rusty Russell
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the akpm-current tree with the modules tree
@ 2015-02-12 5:08 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2015-02-12 5:08 UTC (permalink / raw)
To: Andrew Morton, Rusty Russell
Cc: linux-next, linux-kernel, Rabin Vincent, Andrey Ryabinin
[-- Attachment #1: Type: text/plain, Size: 1966 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
scripts/module-common.lds between commit 5d8591bc0fba ("module: set
ksymtab/kcrctab* section addresses to 0x0") from the modules tree and
commit c84e031a79f9 ("kernel: add support for .init_array.*
constructors") from the akpm-current tree.
I fixed it up (I think - please check - see below) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc scripts/module-common.lds
index bec15f908fc6,01c5849fe44a..000000000000
--- a/scripts/module-common.lds
+++ b/scripts/module-common.lds
@@@ -6,14 -6,17 +6,17 @@@
SECTIONS {
/DISCARD/ : { *(.discard) }
- __ksymtab : { *(SORT(___ksymtab+*)) }
- __ksymtab_gpl : { *(SORT(___ksymtab_gpl+*)) }
- __ksymtab_unused : { *(SORT(___ksymtab_unused+*)) }
- __ksymtab_unused_gpl : { *(SORT(___ksymtab_unused_gpl+*)) }
- __ksymtab_gpl_future : { *(SORT(___ksymtab_gpl_future+*)) }
- __kcrctab : { *(SORT(___kcrctab+*)) }
- __kcrctab_gpl : { *(SORT(___kcrctab_gpl+*)) }
- __kcrctab_unused : { *(SORT(___kcrctab_unused+*)) }
- __kcrctab_unused_gpl : { *(SORT(___kcrctab_unused_gpl+*)) }
- __kcrctab_gpl_future : { *(SORT(___kcrctab_gpl_future+*)) }
+ __ksymtab 0 : { *(SORT(___ksymtab+*)) }
+ __ksymtab_gpl 0 : { *(SORT(___ksymtab_gpl+*)) }
+ __ksymtab_unused 0 : { *(SORT(___ksymtab_unused+*)) }
+ __ksymtab_unused_gpl 0 : { *(SORT(___ksymtab_unused_gpl+*)) }
+ __ksymtab_gpl_future 0 : { *(SORT(___ksymtab_gpl_future+*)) }
+ __kcrctab 0 : { *(SORT(___kcrctab+*)) }
+ __kcrctab_gpl 0 : { *(SORT(___kcrctab_gpl+*)) }
+ __kcrctab_unused 0 : { *(SORT(___kcrctab_unused+*)) }
+ __kcrctab_unused_gpl 0 : { *(SORT(___kcrctab_unused_gpl+*)) }
+ __kcrctab_gpl_future 0 : { *(SORT(___kcrctab_gpl_future+*)) }
+
+ . = ALIGN(8);
+ .init_array : { *(SORT(.init_array.*)) *(.init_array) }
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the akpm-current tree with the modules tree
@ 2013-12-05 1:56 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2013-12-05 1:56 UTC (permalink / raw)
To: Andrew Morton, Rusty Russell; +Cc: linux-next, linux-kernel, Felipe Contreras
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
kernel/params.c between commit 88a88b320a90 ("params: improve standard
definitions") from the modules tree and commit b23eb499ed40
("kernel-paramsc-improve-standard-definitions-checkpatch-fixes") from the
akpm-current tree.
I fixed it up (using the akpm tree patch that just fixed the whitespace)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-12 5:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-21 8:01 linux-next: manual merge of the akpm-current tree with the modules tree Stephen Rothwell
2013-12-05 1:56 Stephen Rothwell
2015-02-12 5:08 Stephen Rothwell
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).