From: Jason Cooper <jason@lakedaemon•net>
To: Thierry Reding <thierry.reding@gmail•com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: manual merge of the mvebu tree
Date: Tue, 8 Oct 2013 10:08:07 -0400 [thread overview]
Message-ID: <20131008140807.GG5402@titan.lakedaemon.net> (raw)
In-Reply-To: <1381239855-16314-3-git-send-email-treding@nvidia.com>
On Tue, Oct 08, 2013 at 03:44:13PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the mvebu tree got conflicts in:
>
> arch/arm/mach-dove/board-dt.c
>
> caused by commits ffe195c (ARM: dove: remove legacy pcie and clock init),
> e3730b4 (ARM: dove: switch to DT probed mbus address windows), and 51e40f5
> (ARM: dove: remove custom .init_time hook).
>
> I fixed them up (see below). Please verify that the resolution looks
> correct.
Looks good to me, thanks!
thx,
Jason.
next prev parent reply other threads:[~2013-10-08 14:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-08 13:44 linux-next: Tree for Oct 8 Thierry Reding
2013-10-08 13:44 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-09 1:25 ` Shawn Guo
2013-10-08 13:44 ` manual merge of the mvebu tree Thierry Reding
2013-10-08 14:08 ` Jason Cooper [this message]
2013-10-08 13:44 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-08 13:44 ` linux-next: manual merge of the tty-next tree Thierry Reding
2013-10-09 6:19 ` Greg Kroah-Hartman
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=20131008140807.GG5402@titan.lakedaemon.net \
--to=jason@lakedaemon$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sebastian.hesselbarth@gmail$(echo .)com \
--cc=thierry.reding@gmail$(echo .)com \
/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