From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Pierre Ossman <drzeus-list@drzeus•cx>
Cc: Greg KH <greg@kroah•com>,
linux-next@vger•kernel.org, Kay Sievers <kay.sievers@vrfy•org>,
Anton Vorontsov <avorontsov@ru•mvista.com>
Subject: linux-next: mmc/driver-core merge conflict
Date: Fri, 6 Jun 2008 15:56:55 +1000 [thread overview]
Message-ID: <20080606155655.b72cff0d.sfr@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2008-06-06 5:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-06 5:56 Stephen Rothwell [this message]
2008-06-09 7:14 ` linux-next: mmc/driver-core merge conflict Pierre Ossman
2008-06-17 3:15 ` Greg KH
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=20080606155655.b72cff0d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=avorontsov@ru$(echo .)mvista.com \
--cc=drzeus-list@drzeus$(echo .)cx \
--cc=greg@kroah$(echo .)com \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox