From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <jhovold@gmail.com>,
Ulf Hansson <ulf.hansson@linaro.org>, Chris Ball <cjb@laptop.org>
Subject: linux-next: manual merge of the driver-core tree with the mmc tree
Date: Mon, 28 Oct 2013 22:20:07 +1100 [thread overview]
Message-ID: <20131028222007.30619a9f7d18f5acd9b1ae60@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1031 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/mmc/host/mvsdio.c between commit 50596285e0be ("mmc: mvsdio:
Remove redundant suspend and resume callbacks") from the mmc tree and
commit 1867adee6ed7 ("mmc: mvsdio: fix deferred probe from __init") from
the driver-core tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/mmc/host/mvsdio.c
index 22ba4d33e95b,deecee08c288..000000000000
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@@ -845,7 -872,10 +845,8 @@@ static const struct of_device_id mvsdio
MODULE_DEVICE_TABLE(of, mvsdio_dt_ids);
static struct platform_driver mvsd_driver = {
- .remove = __exit_p(mvsd_remove),
+ .probe = mvsd_probe,
+ .remove = mvsd_remove,
- .suspend = mvsd_suspend,
- .resume = mvsd_resume,
.driver = {
.name = DRIVER_NAME,
.of_match_table = mvsdio_dt_ids,
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-10-28 11:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-28 11:20 Stephen Rothwell [this message]
2013-10-31 22:16 ` linux-next: manual merge of the driver-core tree with the mmc tree 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=20131028222007.30619a9f7d18f5acd9b1ae60@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cjb@laptop.org \
--cc=greg@kroah.com \
--cc=jhovold@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).