From: dinguyen@altera.com (Dinh Nguyen)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL v2] SOCFPGA updates for 3.15, version 2
Date: Mon, 17 Mar 2014 10:59:24 -0500 [thread overview]
Message-ID: <1395071964.16340.3.camel@linux-builds1> (raw)
In-Reply-To: <201403171431.05666.arnd@arndb.de>
On Mon, 2014-03-17 at 14:31 +0100, Arnd Bergmann wrote:
> On Monday 17 March 2014, Chris Ball wrote:
> > On Mon, Mar 17 2014, Arnd Bergmann wrote:
> > > Chris, it would be nice if you could revert d9c3f5df539a "dts: socfpga: Add
> > > support for SD/MMC on the SOCFPGA platform" in your mmc tree now. The
> > > commit is now also present in arm-soc where it belongs, and we will get
> > > a merge conflict if we both carry it, due to the screwup on the
> > > sysmgr node.
> >
> > I see, sorry about this. I've pushed the revert to mmc-next now.
> >
>
> Ok, thanks!
>
I apologize for causing the conflict, promise to be more aware this
these issues in the future.
Dinh
> Arnd
prev parent reply other threads:[~2014-03-17 15:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 4:55 [GIT PULL v2] SOCFPGA updates for 3.15, version 2 dinguyen at altera.com
2014-03-17 9:38 ` Arnd Bergmann
2014-03-17 13:07 ` Chris Ball
2014-03-17 13:31 ` Arnd Bergmann
2014-03-17 15:59 ` Dinh Nguyen [this message]
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=1395071964.16340.3.camel@linux-builds1 \
--to=dinguyen@altera.com \
--cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.