From: Vinod Koul <vinod.koul@intel.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
Dan <dan.j.williams@intel.com>, Arnd Bergmann <arnd@arndb.de>
Subject: Re: [GIT PULL] slave-dmaengine updates
Date: Thu, 19 Jan 2012 01:33:54 +0530 [thread overview]
Message-ID: <1326917034.1540.185.camel@vkoul-udesk3> (raw)
In-Reply-To: <CA+55aFyR7hKoeffHY6VYw-29pii+NVgsH2aFKU3YfW1-kFUtMg@mail.gmail.com>
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@intel.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
next prev parent reply other threads:[~2012-01-18 20:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-16 15:06 [GIT PULL] slave-dmaengine updates Vinod Koul
2012-01-18 2:41 ` Linus Torvalds
2012-01-18 20:03 ` Vinod Koul [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-09 16:12 Vinod Koul
2013-11-20 3:46 Vinod Koul
2013-07-07 4:17 Vinod Koul
2013-07-07 21:39 ` Linus Torvalds
2013-07-08 2:02 ` Vinod Koul
2013-05-08 2:47 Vinod Koul
2013-02-22 4:32 Vinod Koul
2011-10-31 4:40 Vinod Koul
2011-08-01 10:43 Koul, Vinod
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1326917034.1540.185.camel@vkoul-udesk3 \
--to=vinod.koul@intel.com \
--cc=arnd@arndb.de \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).