Re: [PATCH] dmaengine: Add privatecnt to revert DMA_PRIVATE propery

[Atsushi Nemoto]

On Wed, 25 Mar 2009 09:27:27 -0700, Dan Williams <dan.j.williams@xxxxxxxxx> wrote:
> >> > Currently dma_request_channel() set DMA_PRIVATE capability but never
> >> > clear it.  So if a public channel was once grabbed by
> >> > dma_request_channel(), the device stay PRIVATE forever.  Add
> >> > privatecnt member to dma_device to correctly revert it.
> >> >
> >> > Signed-off-by: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>
> >>
> >> This looks good to me.  Please rebase it on top of the 'next' branch
> >> of the async_tx tree[1] and I will queue it for -next.
> >>
> > Sorry, I have missed this mail.  I will rebase it, but while the
> > 'next' branch of async_tx tree lacks commit 287d85 ("atmel-mci: fix
> > initialization of dma slave data"), rebasing will cause another
> > conflict with mainline.  What should I do?
> 
> I have updated the 'next' branch to include this commit.

Thanks.  And now the patch can be applied using git-am as is.
Should I rebase and send again?

---
Atsushi Nemoto
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/