linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shawn Guo <shawn.guo@linaro.org>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
	Olof Johansson <olof@lixom.net>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the imx-mxs tree
Date: Wed, 9 Oct 2013 09:25:56 +0800	[thread overview]
Message-ID: <20131009012554.GB8946@S2101-09.ap.freescale.net> (raw)
In-Reply-To: <1381239855-16314-2-git-send-email-treding@nvidia.com>

On Tue, Oct 08, 2013 at 03:44:12PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the imx-mxs tree got conflicts in
> 
> 	arch/arm/mach-imx/mach-imx6q.c
> 
> caused by commits 4d9d18a (ARM: imx: remove custom .init_time hook),
> e709f38 (ARM: imx6: report soc info via soc device) and 3087d32 (ARM:
> imx6q: use common soc revision helpers).
> 
> I fixed it up (see below). Please verify that the resolution looks
> correct.

Thanks, Thierry.  The resolution is correct.

Shawn

  reply	other threads:[~2013-10-09  1:25 UTC|newest]

Thread overview: 11+ 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 [this message]
2013-10-08 13:44 ` manual merge of the mvebu tree Thierry Reding
2013-10-08 14:08   ` Jason Cooper
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
2013-10-09 14:14 linux-next: Tree for Oct 9 Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-09 16:56   ` Fabio Estevam
2013-10-24 16:31 linux-next: Tree for Oct 24 Thierry Reding
2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding
2013-10-25 13:03   ` linux-next: manual merge of the imx-mxs tree Thierry Reding

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=20131009012554.GB8946@S2101-09.ap.freescale.net \
    --to=shawn.guo@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sebastian.hesselbarth@gmail.com \
    --cc=thierry.reding@gmail.com \
    /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).