Re: linux-next: manual merge of the scsi-post-merge tree with thedriver-core tree
From: Greg KH
Date: Thu May 10 2012 - 13:31:06 EST
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
> I fixed it up (see below) and can carry the fix as necessary.
Looks good to me, thanks.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/