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 s...@canb.auug.org.au
pgpGM4ACIUdpF.pgp
Description: PGP signature