* linux-next: mmc/driver-core merge conflict
@ 2008-06-06 5:56 Stephen Rothwell
2008-06-09 7:14 ` Pierre Ossman
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-06-06 5:56 UTC (permalink / raw)
To: Pierre Ossman; +Cc: Greg KH, linux-next, Kay Sievers, Anton Vorontsov
[-- Attachment #1: Type: text/plain, Size: 649 bytes --]
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 ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: mmc/driver-core merge conflict
2008-06-06 5:56 linux-next: mmc/driver-core merge conflict Stephen Rothwell
@ 2008-06-09 7:14 ` Pierre Ossman
2008-06-17 3:15 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Pierre Ossman @ 2008-06-09 7:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Greg KH, linux-next, Kay Sievers, Anton Vorontsov
On Fri, 6 Jun 2008 15:56:55 +1000
Stephen Rothwell <sfr@canb•auug.org.au> 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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: mmc/driver-core merge conflict
2008-06-09 7:14 ` Pierre Ossman
@ 2008-06-17 3:15 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2008-06-17 3:15 UTC (permalink / raw)
To: Pierre Ossman; +Cc: Stephen Rothwell, linux-next, Kay Sievers, Anton Vorontsov
On Mon, Jun 09, 2008 at 09:14:52AM +0200, Pierre Ossman wrote:
> On Fri, 6 Jun 2008 15:56:55 +1000
> Stephen Rothwell <sfr@canb•auug.org.au> 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?
Yes, we will be doing this. Right now that patch is dropped from the
linux-next tree.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-06-17 3:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-06 5:56 linux-next: mmc/driver-core merge conflict Stephen Rothwell
2008-06-09 7:14 ` Pierre Ossman
2008-06-17 3:15 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox