From: "Sören Brinkmann" <soren.brinkmann@xilinx.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chris Ball <chris@printf.net>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Michal Simek <michal.simek@xilinx.com>
Subject: Re: linux-next: manual merge of the mmc tree with Linus' tree
Date: Mon, 13 Jan 2014 09:11:41 -0800 [thread overview]
Message-ID: <31979761-213c-4b65-b14a-b6ef3b2ca60d@AM1EHSMHS002.ehs.local> (raw)
In-Reply-To: <20140113131700.840c214536826d7e9a92ef8b@canb.auug.org.au>
On Mon, Jan 13, 2014 at 01:17:00PM +1100, Stephen Rothwell wrote:
> Hi Chris,
>
> Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS
> between commit c2fd4e380322 ("MAINTAINERS: set up proper record for
> Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan: Add
> driver for Arasan SDHCI") from the mmc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
The fix is correct, AFAICT.
Thanks,
Sören
next prev parent reply other threads:[~2014-01-13 17:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-13 2:17 Stephen Rothwell
2014-01-13 17:11 ` Sören Brinkmann [this message]
-- strict thread matches above, loose matches on Subject: below --
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
2011-08-11 3:55 Stephen Rothwell
2011-08-11 21:13 ` Chris Ball
2011-08-03 3:16 Stephen Rothwell
2011-06-01 1:13 Stephen Rothwell
2011-06-01 3:35 ` Shawn Guo
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=31979761-213c-4b65-b14a-b6ef3b2ca60d@AM1EHSMHS002.ehs.local \
--to=soren.brinkmann@xilinx.com \
--cc=chris@printf.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=sfr@canb.auug.org.au \
/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®