lkml.org 
[lkml]   [2012]   [Oct]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [GIT PULL] MMC updates for 3.7-rc1
Date
Hi Linus,

On Mon, Oct 08 2012, Chris Ball wrote:
> Please pull from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git tags/mmc-merge-for-3.7-rc1
>
> to receive the MMC merge for 3.7. There are currently two conflicts
> due to header renames for the ARM single zImage work; they should be
> resolved by taking the changes already in your tree. Thanks.

Sorry, the merge isn't so one-sided -- here's my resolution for you to
compare with:

git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git tags/mmc-merge-for-3.7-rc1-merged

davinci_mmc.c now uses <linux/edma.h> which is provided by a commit
in the slave-dmaengine tree, which hasn't sent in a pull request yet.
Vinod, please can you do that soon?

Let me know if I should do anything else. Thanks,

- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child


\
 
 \ /
  Last update: 2012-10-09 06:21    [W:1.009 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site