linux-kernel - Re: [PATCH v2 1/2] ARM : DMA : remove useless information about DMA

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LFD.2.11.1404131240150.980@knanqh.ubzr>
Date:	Sun, 13 Apr 2014 12:42:55 -0400 (EDT)
From:	Nicolas Pitre <nicolas.pitre@...aro.org>
To:	Liu hua <sdu.liu@...wei.com>
cc:	linux@....linux.org.uk, will.deacon@....com,
	linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
	wangnan0@...wei.com, peifeiyue@...wei.com, liusdu@....com,
	m.szyprowski@...sung.com
Subject: Re: [PATCH v2 1/2] ARM : DMA : remove useless information about
 DMA

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/