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

Hi all, Today's linux-next merge of the block tree got a conflict in: block/blk-settings.c include/linux/blkdev.h between commit: 45147fb522bb459e7 ("block: add a helper function to merge the segments") from the dma-mapping tree and commit: 68c43f133a754cbf5 ("block: Introduce elevato

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

On Wed, Jan 17, 2018 at 01:38:17PM +1100, Stephen Rothwell wrote: > from the dma-mapping tree and commit: > > e80a0af4759a ("lib/scatterlist: Introduce sgl_alloc() and sgl_free()") > > from the block tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as

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

Hi Jens, Today's linux-next merge of the block tree got a conflict in: lib/Kconfig between commit: 002e67454f61 ("dma-direct: rename dma_noop to dma_direct") from the dma-mapping tree and commit: e80a0af4759a ("lib/scatterlist: Introduce sgl_alloc() and sgl_free()") from the block tree