* linux-next: manual merge of the scsi-post-merge tree with the driver-core tree
@ 2012-05-10 8:57 Stephen Rothwell
2012-05-10 9:09 ` Stephen Rothwell
2012-05-10 17:31 ` Greg KH
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-05-10 8:57 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Kay Sievers, Greg KH, Bjorn Helgaas
[-- Attachment #1: Type: text/plain, Size: 1376 bytes --]
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 */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the scsi-post-merge tree with the driver-core tree
2012-05-10 8:57 linux-next: manual merge of the scsi-post-merge tree with the driver-core tree Stephen Rothwell
@ 2012-05-10 9:09 ` Stephen Rothwell
2012-05-10 17:31 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-05-10 9:09 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Kay Sievers, Greg KH, Bjorn Helgaas
[-- Attachment #1: Type: text/plain, Size: 125 bytes --]
This should have said "akpm tree" in the subject.
--
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
* Re: linux-next: manual merge of the scsi-post-merge tree with the driver-core tree
2012-05-10 8:57 linux-next: manual merge of the scsi-post-merge tree with the driver-core tree Stephen Rothwell
2012-05-10 9:09 ` Stephen Rothwell
@ 2012-05-10 17:31 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2012-05-10 17:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Kay Sievers,
Bjorn Helgaas
On Thu, May 10, 2012 at 06:57:46PM +1000, Stephen Rothwell wrote:
> 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.
Looks good to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-10 17:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-10 8:57 linux-next: manual merge of the scsi-post-merge tree with the driver-core tree Stephen Rothwell
2012-05-10 9:09 ` Stephen Rothwell
2012-05-10 17:31 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox