From: vinod.koul@linux.intel.com (Vinod Koul)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 00/13] dmaengine: imx-dma: merge dma arch code into dmaengine.
Date: Mon, 26 Mar 2012 11:33:53 +0530 [thread overview]
Message-ID: <1332741833.19804.17.camel@vkoul-udesk3> (raw)
In-Reply-To: <CACKLOr0JTgp+poXCNg8+8pXko3s2JWQhovMw8Z1j-q4aL4oaKQ@mail.gmail.com>
On Thu, 2012-03-22 at 15:11 +0100, javier Martin wrote:
> On 22 March 2012 10:39, javier Martin <javier.martin@vista-silicon.com> wrote:
> > On 21 March 2012 16:39, Vinod Koul <vinod.koul@linux.intel.com> wrote:
> >> This doesn't apply for me (starting with 6th) on current slave-dma.next
> >> due to obvious changes which have gone into imx.
> >>
> >> Can you quickly rebase the series and resend.
> >
> > Great,
> > now your 'next' branch is actually broken for imx-dma.
> >
> > I'm currently trying a bisect to find out what is the commit
> > responsible for that but I suspect it will be related to the cookie
> > changes submitted by Russell.
I had these in branch for quite some time for people to look and point
out any issues with merge.
>
> Here,
> take a look at this series:
>
> [PATCH v4 00/15] dmaengine: imx-dma: rebase of features for 3.4.
>
> I've included a new fix patch which solves the merge issue.
Thanks Applied all, now
>
> Regards.
--
~Vinod
prev parent reply other threads:[~2012-03-26 6:03 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-09 15:20 [PATCH v3 00/13] dmaengine: imx-dma: merge dma arch code into dmaengine Javier Martin
2012-03-09 15:20 ` [PATCH v3 01/13] dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c Javier Martin
2012-03-09 15:20 ` [PATCH v3 02/13] dmaengine: imx-dma: remove data member from internal structure Javier Martin
2012-03-09 15:20 ` [PATCH v3 03/13] dmaengine: imx-dma: remove dma_mode member of " Javier Martin
2012-03-09 15:20 ` [PATCH v3 04/13] dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function Javier Martin
2012-03-09 15:20 ` [PATCH v3 05/13] dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function Javier Martin
2012-03-09 15:20 ` [PATCH v3 06/13] dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function Javier Martin
2012-03-09 15:20 ` [PATCH v3 07/13] dmaengine: imx-dma: remove sg member from internal structure Javier Martin
2012-03-09 15:20 ` [PATCH v3 08/13] dmaengine: imx-dma: remove 'in_use' field of 'internal' structure Javier Martin
2012-03-09 15:20 ` [PATCH v3 09/13] dmaengine: imx-dma: remove 'resbytes' " Javier Martin
2012-03-09 15:20 ` [PATCH v3 10/13] dmaengine: imx-dma: remove internal structure Javier Martin
2012-03-09 15:20 ` [PATCH v3 11/13] dmaengine: imx-dma: remove unused arg of imxdma_sg_next Javier Martin
2012-03-09 15:20 ` [PATCH v3 12/13] dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk' Javier Martin
2012-03-09 15:20 ` [PATCH v3 13/13] dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages Javier Martin
2012-03-09 17:44 ` [PATCH v3 00/13] dmaengine: imx-dma: merge dma arch code into dmaengine Sascha Hauer
2012-03-14 7:43 ` javier Martin
2012-03-14 11:14 ` Vinod Koul
2012-03-21 7:49 ` javier Martin
2012-03-21 15:39 ` Vinod Koul
2012-03-22 9:39 ` javier Martin
2012-03-22 14:11 ` javier Martin
2012-03-26 6:03 ` Vinod Koul [this message]
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=1332741833.19804.17.camel@vkoul-udesk3 \
--to=vinod.koul@linux.intel.com \
--cc=linux-arm-kernel@lists.infradead.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