From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL V2] ARM: mvebu: dt changes for v3.15 (incr. pull #3)
Date: Tue, 18 Mar 2014 13:55:16 +0100 [thread overview]
Message-ID: <201403181355.16350.arnd@arndb.de> (raw)
In-Reply-To: <20140317142330.GG15608@titan.lakedaemon.net>
On Monday 17 March 2014, Jason Cooper wrote:
> On Mon, Mar 17, 2014 at 11:11:30AM +0100, Arnd Bergmann wrote:
> > On Tuesday 04 March 2014, Jason Cooper wrote:
> > Pulled into next/dt now, along with the #4 and #5. I got a trivial
> > merge conflict against the dts Makefile change from mach-qcom and
> > noticed that splitting up the dtb section into per-soc breaks
> > alphabetical ordering, which I changed in the merge by moving
> > it down to the end of the list.
>
> Ok, I was trying to reduce conflicts by leaving things in place, then
> do a fixes-non-critical patch to put things back in alphabetical order
> after the dust had settled.
Ah, that was clearly a better plan than what I did. I actually mismerged
things at first and then spent some time cleaning it all up again.
Arnd
next prev parent reply other threads:[~2014-03-18 12:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-01 5:25 [GIT PULL] ARM: mvebu: dt changes for v3.15 (incr. pull #3) Jason Cooper
2014-03-03 22:26 ` Jason Cooper
2014-03-04 2:55 ` [GIT PULL V2] " Jason Cooper
2014-03-17 10:11 ` Arnd Bergmann
2014-03-17 14:23 ` Jason Cooper
2014-03-18 12:55 ` Arnd Bergmann [this message]
2014-03-18 13:01 ` Jason Cooper
2014-03-17 19:35 ` Jason Cooper
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=201403181355.16350.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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