From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752652AbdGGN4t (ORCPT ); Fri, 7 Jul 2017 09:56:49 -0400 Received: from ozlabs.org ([103.22.144.67]:57143 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750892AbdGGNzo (ORCPT ); Fri, 7 Jul 2017 09:55:44 -0400 Date: Fri, 7 Jul 2017 23:55:39 +1000 From: Stephen Rothwell To: Vitaly Kuzmichev Cc: , , , , , Subject: Re: [PATCH v2 0/2] Additions to default DMA coherent pool Message-ID: <20170707235539.073718ed@canb.auug.org.au> In-Reply-To: <1499433759-16397-1-git-send-email-vitaly_kuzmichev@mentor.com> References: <1499093475-29859-1-git-send-email-vitaly_kuzmichev@mentor.com> <1499433759-16397-1-git-send-email-vitaly_kuzmichev@mentor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Vitaly, On Fri, 7 Jul 2017 16:22:39 +0300 Vitaly Kuzmichev wrote: > > v2: > Since linux-next now includes Vladimir Murzin's version of default DMA > coherent pool [1] 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. > > [1] 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. -- Cheers, Stephen Rothwell