linux-next: manual merge of the akpm tree with the tip tree
From: Stephen Rothwell <hidden>
Date: 2016-03-10 05:29:00
Also in:
lkml
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/gpu/drm/omapdrm/omap_gem.c
between commit:
f6e45661f9be ("dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()")
from the tip tree and patch:
"dma-mapping: rename dma_*_writecombine() to dma_*_wc()"
from the akpm tree.
These a basically the same patch, so I dropped the one from the akpm tree.
--
Cheers,
Stephen Rothwell