lkml.org 
[lkml]   [2011]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] dmaengine: at_hdmac fixes for next
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



\
 
 \ /
  Last update: 2011-08-19 15:07    [W:0.038 / U:0.268 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site