Date: Sun, 13 Apr 2014 12:42:55 -0400 (EDT)
From: Nicolas Pitre <nicolas.pitre@linaro.org>
To: Liu hua <sdu.liu@huawei.com>
cc: linux@arm.linux.org.uk, will.deacon@arm.com,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        wangnan0@huawei.com, peifeiyue@huawei.com, liusdu@126.com,
        m.szyprowski@samsung.com
Subject: Re: [PATCH v2 1/2] ARM : DMA : remove useless information about
 DMA
In-Reply-To: <534A7EA7.5090900@huawei.com>
Message-ID: <alpine.LFD.2.11.1404131240150.980@knanqh.ubzr>
References: <1397203252-22977-1-git-send-email-sdu.liu@huawei.com> <1397203252-22977-2-git-send-email-sdu.liu@huawei.com> <alpine.LFD.2.11.1404112252050.980@knanqh.ubzr> <5348C040.1060305@huawei.com> <alpine.LFD.2.11.1404121031170.980@knanqh.ubzr>
 <534A7EA7.5090900@huawei.com>
User-Agent: Alpine 2.11 (LFD 23 2013-08-11)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org

On Sun, 13 Apr 2014, Liu hua wrote:

> On 2014/4/12 22:32, Nicolas Pitre write:
> > On Sat, 12 Apr 2014, Liu hua wrote:
> > 
> >> Hi Nicolas,
> >>
> >> Your version is better. you tell me this in the former letters.
> >> So I am very sorry to forget to check that.
> >>
> >> May be I should remake this second patch to fit your change. What do
> >> you think about that patch?
> > 
> > You may simply drop your first patch and only keep the other two.
> > 
> Sure. But your patch and my second one both change Document/arm/memory.txt.
> I am afraid there will be conflicts when someone tests my patch before
> yours getting into the mainline.

That's still an easy conflict to fix.  And it is likely that git will 
fix it automatically.


Nicolas
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/