From: Chris Ball <cjb@laptop.org>
To: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: linux-sh@vger.kernel.org, linux-mmc@vger.kernel.org,
Ian Molton <ian@mnementh.co.uk>,
Magnus Damm <magnus.damm@gmail.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Paul Mundt <lethal@linux-sh.org>,
Linus Walleij <linus.walleij@linaro.org>
Subject: Re: outstanding tmio patches
Date: Fri, 25 Mar 2011 09:09:14 -0400 [thread overview]
Message-ID: <m37hbnmjnp.fsf@pullcord.laptop.org> (raw)
In-Reply-To: <Pine.LNX.4.64.1103250858400.22824@axis700.grange> (Guennadi Liakhovetski's message of "Fri, 25 Mar 2011 09:04:02 +0100 (CET)")
Hi,
On Fri, Mar 25 2011, Guennadi Liakhovetski wrote:
>> > [1/2] mmc: tmio: Improve DMA stability on sh-mobile
>>
>> Some serious merge conflicts with Linus W's dmaengine cleanup here.
>
> Sorry, I must be missing something. I'm basing my patches on the current
> (of yesterday) next tree, which already contains Linus' patches:
I agree that linux-next contains these patches, but I don't agree that
"mmc: tmio: Improve DMA stability on sh-mobile" (which was written back
on March 7th before they were merged) avoids merge conflicts with them.
Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
WARNING: multiple messages have this Message-ID (diff)
From: Chris Ball <cjb@laptop.org>
To: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: linux-sh@vger.kernel.org, linux-mmc@vger.kernel.org,
Ian Molton <ian@mnementh.co.uk>,
Magnus Damm <magnus.damm@gmail.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Paul Mundt <lethal@linux-sh.org>,
Linus Walleij <linus.walleij@linaro.org>
Subject: Re: outstanding tmio patches
Date: Fri, 25 Mar 2011 13:09:14 +0000 [thread overview]
Message-ID: <m37hbnmjnp.fsf@pullcord.laptop.org> (raw)
In-Reply-To: <Pine.LNX.4.64.1103250858400.22824@axis700.grange> (Guennadi Liakhovetski's message of "Fri, 25 Mar 2011 09:04:02 +0100 (CET)")
Hi,
On Fri, Mar 25 2011, Guennadi Liakhovetski wrote:
>> > [1/2] mmc: tmio: Improve DMA stability on sh-mobile
>>
>> Some serious merge conflicts with Linus W's dmaengine cleanup here.
>
> Sorry, I must be missing something. I'm basing my patches on the current
> (of yesterday) next tree, which already contains Linus' patches:
I agree that linux-next contains these patches, but I don't agree that
"mmc: tmio: Improve DMA stability on sh-mobile" (which was written back
on March 7th before they were merged) avoids merge conflicts with them.
Thanks,
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
next prev parent reply other threads:[~2011-03-25 13:09 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-23 14:15 outstanding tmio patches Guennadi Liakhovetski
2011-03-23 14:15 ` Guennadi Liakhovetski
2011-03-24 7:38 ` Guennadi Liakhovetski
2011-03-24 7:38 ` Guennadi Liakhovetski
2011-03-25 2:05 ` Chris Ball
2011-03-25 2:05 ` Chris Ball
2011-03-25 8:04 ` Guennadi Liakhovetski
2011-03-25 8:04 ` Guennadi Liakhovetski
2011-03-25 13:09 ` Chris Ball [this message]
2011-03-25 13:09 ` Chris Ball
2011-03-25 13:35 ` Guennadi Liakhovetski
2011-03-25 13:35 ` Guennadi Liakhovetski
2011-03-25 14:01 ` Chris Ball
2011-03-25 14:01 ` Chris Ball
2011-03-25 14:19 ` Guennadi Liakhovetski
2011-03-25 14:19 ` Guennadi Liakhovetski
2011-03-25 14:54 ` Chris Ball
2011-03-25 14:54 ` Chris Ball
2011-03-27 0:20 ` Simon Horman
2011-03-27 0:20 ` Simon Horman
2011-03-29 22:18 ` Chris Ball
2011-03-29 22:18 ` Chris Ball
2011-03-29 22:33 ` Guennadi Liakhovetski
2011-03-29 22:33 ` Guennadi Liakhovetski
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=m37hbnmjnp.fsf@pullcord.laptop.org \
--to=cjb@laptop.org \
--cc=g.liakhovetski@gmx.de \
--cc=ian@mnementh.co.uk \
--cc=lethal@linux-sh.org \
--cc=linus.walleij@linaro.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=sameo@linux.intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.