Subject: Re: linux-next: mmc/driver-core merge conflict

From: Pierre Ossman <[email-masked]>
Date: Mon, 9 Jun 2008 09:14:52 +0200

On Fri, 6 Jun 2008 15:56:55 +1000
Stephen Rothwell <[email-masked]> wrote:

> Hi Pierre, Greg,
> 
> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/mmc_spi.c between commit
> b16fa5e051064488f241647a080271f1cd41d077 ("driver-core: prepare for
> removal of 20 char limit from struct device") from the driver-core tree
> and commit cd3c93fe826def37abc474e7a91bbf56444d7cd0 ("mmc_spi: add
> support for card-detection polling") from the mmc tree.
> 
> I fixed it up in the obvious manner.  Could be fixed by moving the
> drivers/mmc/host/mmc_spi.c part of the driver-core change to the mmc
> tree ...
> 

Sounds good to me. Greg, can you separate out that portion?

-- 
     -- Pierre Ossman

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