Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
Documentation/kernel-parameters.txt
between commit:
9daacf51b428 ("Documentation/kernel-parameters: update KMG units")
from the jc_docs tree and commit:
f0a906868be1 ("mm/page_alloc.c: introduce kernelcore=mirror option")
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@xxxxxxxxxxxxxxxx
diff --cc Documentation/kernel-parameters.txt
index adf540032a9d,2cfb638d138b..000000000000
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1710,7 -1696,8 +1714,8 @@@ Such letter suffixes can also be entire
keepinitrd [HW,ARM]
- kernelcore=nn[KMGTPE] [KNL,X86,IA-64,PPC] This parameter
- kernelcore= Format: nn[KMG] | "mirror"
++ kernelcore= Format: nn[KMGTPE] | "mirror"
+ [KNL,X86,IA-64,PPC] This parameter
specifies the amount of memory usable by the kernel
for non-movable allocations. The requested amount is
spread evenly throughout all nodes in the system. The
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
