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

[Christoph Hellwig]

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 far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks, the trivial fix look good.