From: Chris Ball <cjb@laptop.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org,
Vinod Koul <vinod.koul@linux.intel.com>
Subject: Re: [GIT PULL] MMC updates for 3.7-rc1
Date: Mon, 08 Oct 2012 23:36:25 -0400 [thread overview]
Message-ID: <87pq4sco5i.fsf@octavius.laptop.org> (raw)
In-Reply-To: <87a9vxdsia.fsf@octavius.laptop.org> (Chris Ball's message of "Mon, 08 Oct 2012 09:04:45 -0400")
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
next prev parent reply other threads:[~2012-10-09 3:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-08 13:04 [GIT PULL] MMC updates for 3.7-rc1 Chris Ball
2012-10-09 3:36 ` Chris Ball [this message]
2012-10-09 3:42 ` Vinod Koul
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=87pq4sco5i.fsf@octavius.laptop.org \
--to=cjb@laptop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=vinod.koul@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.