Re: [PATCH v2 0/2] Additions to default DMA coherent pool
From: Stephen Rothwell
Date: Fri Jul 07 2017 - 09:58:31 EST
On Fri, 7 Jul 2017 16:22:39 +0300 Vitaly Kuzmichev <vitaly_kuzmichev@xxxxxxxxxx> wrote:
> Since linux-next now includes Vladimir Murzin's version of default DMA
> coherent pool  our version is not required now and even causes merge
> conflict. The difference between two versions is not really significant
> except one serious problem with CONFIG_DMA_CMA. Please see patch v2 1/2
> for details.
> So that I have rebased our work on linux-next/master branch, and sending
> this patchset with necessary additions for default DMA pool feature.
> Patch v2 2/2 adds 'dmainfo' to ProcFS to show available DMA regions.
>  https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=93228b44c33a572cb36cec2dbed42e9bdbc88d79
This is now also in Linus' tree. You should rebase your work on that
commit (or just Linus' tree), not linux-next.