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

2015-02-11 Thread Stephen Rothwell
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

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

2015-02-11 Thread Stephen Rothwell
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

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

2013-12-04 Thread Stephen Rothwell
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

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

2013-12-04 Thread Stephen Rothwell
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

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

2013-08-21 Thread 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

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

2013-08-21 Thread 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