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 -- 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