From: Dan Williams <dan.j.williams@intel.com>
To: linux-sh@vger.kernel.org
Subject: Re: [PATCH 2/3 v3] sh: fix Transfer Size calculation in both DMA
Date: Thu, 04 Feb 2010 01:47:16 +0000 [thread overview]
Message-ID: <4B6A2724.5080104@intel.com> (raw)
In-Reply-To: <Pine.LNX.4.64.1002011958290.4617@axis700.grange>
Paul Mundt wrote:
> On Wed, Feb 03, 2010 at 10:58:45AM -0700, Dan Williams wrote:
>> Dan Williams wrote:
>>>> arch/sh/drivers/dma/dma-sh.c | 5 +-
>>> This bit collides with 9d56dd3b "sh: Mass ctrl_in/outX to
>>> __raw_read/writeX conversion." in Paul's tree. I'm fine with these
>>> going through the sh tree with my acked-by modulo that minor nit with
>>> the dma_list_mutex comment in 3/3.
>> The other option would be for me to base async_tx.git/next on top of
>> sh.git/master since my tree appears later in the linux-next merge order
>> (I would then make sure I merge after Paul during the .34 window).
>> The only problem is that this removes the luxury of Paul rebasing the sh
>> tree at his leisure (I would need to rebase as well before the result is
>> seen by linux-next). So I'll remain in ack-only mode on this set unless
>> Paul signals that sh.git does not rebase.
>>
> The SH tree doesn't rebase, so this shouldn't be a problem either way.
> However, unless there are any dependencies on the bits in your current
> tree, simply having you Ack the patches and rolling them in to the SH
> tree seems like the less painful option.
Ok, I don't have any conflicting dmaengine api updates this cycle so
merging the dma bits w/acks through sh.git sounds good to me.
Thanks,
Dan
next prev parent reply other threads:[~2010-02-04 1:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-01 19:03 [PATCH 2/3 v3] sh: fix Transfer Size calculation in both DMA drivers Guennadi Liakhovetski
2010-02-02 23:59 ` [PATCH 2/3 v3] sh: fix Transfer Size calculation in both DMA Dan Williams
2010-02-03 0:16 ` Guennadi Liakhovetski
2010-02-03 7:05 ` Dan Williams
2010-02-03 17:58 ` Dan Williams
2010-02-03 22:26 ` [PATCH 2/3 v3] sh: fix Transfer Size calculation in both DMA drivers Paul Mundt
2010-02-04 1:47 ` Dan Williams [this message]
2010-02-04 5:26 ` Paul Mundt
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=4B6A2724.5080104@intel.com \
--to=dan.j.williams@intel.com \
--cc=linux-sh@vger.kernel.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).