lkml.org 
[lkml]   [2012]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the scsi-post-merge tree with the driver-core tree
Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
mm/page_alloc.c between commit 155cbfc802e4 ("mm: use KERN_CONT in printk()
continuation lines") from the driver-core tree and commit "mm: print
physical addresses consistently with other parts of kernel" from the akpm
tree.

I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc mm/page_alloc.c
index d5a49b6,a98059a..0000000
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -4819,14 -4819,15 +4819,15 @@@ void __init free_area_init_nodes(unsign
for (i = 0; i < MAX_NR_ZONES; i++) {
if (i == ZONE_MOVABLE)
continue;
- printk(" %-8s ", zone_names[i]);
+ printk(KERN_CONT " %-8s ", zone_names[i]);
if (arch_zone_lowest_possible_pfn[i] ==
arch_zone_highest_possible_pfn[i])
- printk("empty\n");
+ printk(KERN_CONT "empty\n");
else
- printk(KERN_CONT "%0#10lx -> %0#10lx\n",
- arch_zone_lowest_possible_pfn[i],
- arch_zone_highest_possible_pfn[i]);
- printk("[mem %0#10lx-%0#10lx]\n",
++ printk(KERN_CONT "[mem %0#10lx-%0#10lx]\n",
+ arch_zone_lowest_possible_pfn[i] << PAGE_SHIFT,
+ (arch_zone_highest_possible_pfn[i]
+ << PAGE_SHIFT) - 1);
}
/* Print out the PFNs ZONE_MOVABLE begins at in each node */[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-05-10 11:41    [from the cache]
©2003-2011 Jasper Spaans