On Tue, 28 Oct 2014 15:24:44 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Today's linux-next merge of the akpm-current tree got a conflict in > mm/cma.c between commit 16195ddd4ebc ("mm: cma: Ensure that > reservations never cross the low/high mem boundary") from the > dma-mapping tree and commit 2a70e5a78672 ("mm/cma: ake kmemleak ignore > CMA regions") from the akpm-current tree. hm, we have multiple trees altering mm/cma.c? I'm a bit surprised that this series was merged, given that Laurent said he would be sending out a v2... -- 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