From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ulf Hansson <ulf.hansson@linaro.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"David Lanzendörfer" <david.lanzendoerfer@o2s.ch>
Subject: linux-next: manual merge of the mmc-uh tree with the sunxi tree
Date: Tue, 20 Jan 2015 14:17:50 +1100 [thread overview]
Message-ID: <20150120141750.3dcade27@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
Hi Ulf,
Today's linux-next merge of the mmc-uh tree got a conflict in
drivers/mmc/host/sunxi-mmc.c between commit 6c09bb851e57 ("mmc: sunxi:
Convert MMC driver to the standard clock phase API") from the sunxi
tree and commit 776e24c502da ("mmc: sunxi: Removing unused code") from
the mmc-uh tree.
I fixed it up (the former includes the latter change) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-01-20 3:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-20 3:17 Stephen Rothwell [this message]
2015-01-21 11:27 ` linux-next: manual merge of the mmc-uh tree with the sunxi tree Ulf Hansson
2015-01-21 12:07 ` Geert Uytterhoeven
2015-01-21 12:12 ` Maxime Ripard
2015-01-21 13:42 ` Ulf Hansson
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=20150120141750.3dcade27@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=david.lanzendoerfer@o2s.ch \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--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).