[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <1326917034.1540.185.camel@vkoul-udesk3>
Date: Thu, 19 Jan 2012 01:33:54 +0530
From: Vinod Koul <vinod.koul@...el.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: linux-kernel <linux-kernel@...r.kernel.org>,
Dan <dan.j.williams@...el.com>, Arnd Bergmann <arnd@...db.de>
Subject: Re: [GIT PULL] slave-dmaengine updates
On Tue, 2012-01-17 at 18:41 -0800, Linus Torvalds wrote:
> On Mon, Jan 16, 2012 at 7:06 AM, Vinod Koul <vinod.koul@...el.com> wrote:
> >
> > Here is the slave-dmaengine updates which include a new DMA engine API
> > for 2D interleaved transfers along with fixes for slave dma_tranfer
> > direction along with usual fixes and updates on bunch of the slave dma
> > drivers.
>
> Ok, please verify my conflict resolution. It all looked pretty
> trivial, but affected code that I don't know nor can I even
> test-compile.
The resolution look fine to me. I have built and didn't find any issues.
Thanks
--
~Vinod
--
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/
Powered by blists - more mailing lists