From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] dmaengine: at_hdmac fixes for next
Date: Fri, 19 Aug 2011 15:04:18 +0200 [thread overview]
Message-ID: <4E4E5F52.7070605@atmel.com> (raw)
In-Reply-To: <1313758426.2336.2.camel@vkoul-udesk3>
Le 19/08/2011 14:53, Koul, Vinod :
> On Tue, 2011-08-16 at 15:56 +0200, Nicolas Ferre wrote:
>> Vinod,
>>
>> Please pull from:
>>
>> git://github.com/at91linux/linux-2.6-at91.git nfe/sdma_at_hdmac
>>
>> to receive latest updates for the Atmel at_hdmac dmaengine driver. Those changes are made on top of current linus' git tree (v3.1-rc2-59-g5bad33c).
>> The patches below have been discussed on the linux-arm-kernel mailing-list.
>>
>> Thanks,
>>
>> Nicolas Ferre (4):
>> dmaengine: at_hdmac: replace spin_lock* with irqsave variants
>> dmaengine: at_hdmac: improve power management routines
>> dmaengine: at_hdmac: add wrappers for testing channel state
>> dmaengine: at_hdmac: fix way to specify cyclic capability
>>
>> drivers/dma/at_hdmac.c | 159 +++++++++++++++++++++++++++++++++---------
>> drivers/dma/at_hdmac_regs.h | 24 +++++++
>> 2 files changed, 149 insertions(+), 34 deletions(-)
>>
> Hi Nicolas,
>
> I tried to merge your branch, but I also get lot on unwanted commits :(
> Looks like this branch is based on current Linus's tree, I typically
> base my next on rc-X and not any random commit.
Yes, I am sorry for that and realize that it can be a mess for you... I
will take the habit to cling to a -rcX for my pull requests.
> Either you can rebase to latest rc-X and I will merge, or since I
> created a test branch I can extract your 4 patches and apply to my next.
If you have a test branch close at hand you can extract my patches.
Thanks for your help.
Best regards,
--
Nicolas Ferre
next prev parent reply other threads:[~2011-08-19 13:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-16 13:56 [GIT PULL] dmaengine: at_hdmac fixes for next Nicolas Ferre
2011-08-19 12:53 ` Koul, Vinod
2011-08-19 13:04 ` Nicolas Ferre [this message]
2011-08-19 13:15 ` 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=4E4E5F52.7070605@atmel.com \
--to=nicolas.ferre@atmel.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;
as well as URLs for NNTP newsgroup(s).