Re: linux-next: manual merge of the driver-core tree with the dma-mapping tree

On Fri, Jun 01, 2018 at 05:08:25PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in: > > include/linux/device.h > > between commit: > > 3d6ce86ee794 ("drivers: remove force dma flag from buses") > > from the dma-mapping tree a

linux-next: manual merge of the driver-core tree with the dma-mapping tree

Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in: include/linux/device.h between commit: 3d6ce86ee794 ("drivers: remove force dma flag from buses") from the dma-mapping tree and commit: 8c97a46af04b ("driver core: hold dev's parent lock when needed") from the