linux-next: manual merge of the mmc tree

linux-next: manual merge of the mmc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1091 bytes --]

Hi Pierre,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/sdhci.c between commits
e08c1694d9e2138204f2b79b73f0f159074ce2f5 ("olpc: sdhci: add quirk for the
Marvell CaFe's vdd/powerup issue") and
603ded16a308d0a7a17738c973e3c8cbcd5db7dd ("olpc: sdhci: add quirk for the
Marvell CaFe's interrupt timeout") from Linus' tree and various similar
commits from the mmc tree including one that moves the code into separate
files.

I have reverted all the commits that affect that file from the mmc tree
for today in the hope that you will merge with Linus' tree and fix up the
conflicts for tomorrow.

The commits I reverted are:

sdhci: don't check block count for progress
sdhci: move pci stuff to separate module
sdhci: handle hot-remove
sdhci: add quirk for the Marvell CaFe's vdd/powerup issue
sdhci: add quirk for the Marvell CaFe's interrupt timeout
sdhci: scatter-gather (ADMA) support
sdhci: graceful handling of bad addresses

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the mmc tree

[Pierre Ossman]

[-- Attachment #1: Type: text/plain, Size: 978 bytes --]

On Tue, 8 Jul 2008 01:02:17 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Pierre,
> 
> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/sdhci.c between commits
> e08c1694d9e2138204f2b79b73f0f159074ce2f5 ("olpc: sdhci: add quirk for the
> Marvell CaFe's vdd/powerup issue") and
> 603ded16a308d0a7a17738c973e3c8cbcd5db7dd ("olpc: sdhci: add quirk for the
> Marvell CaFe's interrupt timeout") from Linus' tree and various similar
> commits from the mmc tree including one that moves the code into separate
> files.

I've done a new update that should sort out the mess.

Rgds
-- 
     -- Pierre Ossman

  Linux kernel, MMC maintainer        http://www.kernel.org
  rdesktop, core developer          http://www.rdesktop.org

  WARNING: This correspondence is being monitored by the
  Swedish government. Make sure your server uses encryption
  for SMTP traffic and consider using PGP for end-to-end
  encryption.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the mmc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

Hi Pierre,

On Mon, 7 Jul 2008 22:23:13 +0200 Pierre Ossman <drzeus-list@drzeus.cx> wrote:
>
> I've done a new update that should sort out the mess.

Great, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]