linux-kernel - Re: [PATCH v2 5/5] spi/ep93xx: add DMA support

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: <BANLkTikKOcc2Vg1p3kG4ZSLjJ0RTZWS=2A@mail.gmail.com>
Date:	Tue, 7 Jun 2011 12:45:26 -0600
From:	Grant Likely <grant.likely@...retlab.ca>
To:	Mika Westerberg <mika.westerberg@....fi>
Cc:	linux-arm-kernel@...ts.infradead.org, hsweeten@...ionengravers.com,
	rmallon@...il.com, vinod.koul@...el.com, dan.j.williams@...el.com,
	lrg@...com, broonie@...nsource.wolfsonmicro.com,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 5/5] spi/ep93xx: add DMA support

On Tue, Jun 7, 2011 at 11:14 AM, Mika Westerberg <mika.westerberg@....fi> wrote:
> On Fri, Jun 03, 2011 at 02:44:00PM -0600, Grant Likely wrote:
>> On Sun, May 29, 2011 at 01:10:06PM +0300, Mika Westerberg wrote:
>> > This patch adds DMA support for the EP93xx SPI driver. By default the DMA is
>> > not enabled but it can be enabled by setting ep93xx_spi_info.use_dma to true
>> > in board configuration file.
>> >
>> > Note that the SPI driver still uses PIO for small transfers (<= 8 bytes) for
>> > performance reasons.
>> >
>> > Signed-off-by: Mika Westerberg <mika.westerberg@....fi>
>> > Acked-by: H Hartley Sweeten <hsweeten@...ionengravers.com>
>> > Cc: Grant Likely <grant.likely@...retlab.ca>
>>
>> Acked-by: Grant Likely <grant.likely@...retlab.ca>
>>
>> Since this depends on the DMA patches, it can go in via the same tree.
>
> I just realized that once the SPI driver renaming patch (spi: reorganize
> drivers) enters linux-next, this patch (which sits on Vinod's tree) will cause
> a merge conflict. Any ideas how to avoid it beforehand?

Yes, put the whole series into a separate branch all by itself.  Merge
that branch into Vinod's tree and I'll also merge it into spi/next,
and I'll fix up the merge conflict when I do.

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
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/