From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chris Ball <cjb@laptop.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Shawn Guo <shawn.guo@linaro.org>,
Anton Vorontsov <cbouatmailru@gmail.com>,
Grant Likely <grant.likely@secretlab.ca>
Subject: linux-next: manual merge of the mmc tree with Linus' tree
Date: Wed, 1 Jun 2011 11:13:20 +1000 [thread overview]
Message-ID: <20110601111320.07b07b7f.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 565 bytes --]
Hi Chris,
Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/sdhci-of-core.c between commit b1608d69cb80
("drivercore: revert addition of of_match to struct device") from Linus'
tree and commit e2d0d7dc5542 ("mmc: sdhci: make sdhci-of device drivers
self registered") from the mmc tree.
The latter removes the file, so I did that (I *think* that the change
from the former is no longer needed, but someone should check).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-06-01 1:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-01 1:13 Stephen Rothwell [this message]
2011-06-01 3:35 ` Shawn Guo
2011-08-03 3:16 Stephen Rothwell
2011-08-11 3:55 Stephen Rothwell
2011-08-11 21:13 ` Chris Ball
2014-01-13 2:17 Stephen Rothwell
2014-01-13 17:11 ` Sören Brinkmann
2014-05-09 3:44 Stephen Rothwell
2014-05-09 7:14 ` Lee Jones
2014-05-09 7:41 ` Ulf Hansson
2014-05-12 0:11 ` Stephen Rothwell
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=20110601111320.07b07b7f.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cbouatmailru@gmail.com \
--cc=cjb@laptop.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=shawn.guo@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
all inboxes | Powered by JetHome®