mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Shawn Guo <shawn.guo@linaro.org>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	<linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the imx-mxs tree with the arm tree
Date: Wed, 29 Jan 2014 09:18:06 +0800	[thread overview]
Message-ID: <20140129011803.GA13518@S2101-09.ap.freescale.net> (raw)
In-Reply-To: <20140129011310.GT15937@n2100.arm.linux.org.uk>

On Wed, Jan 29, 2014 at 01:13:10AM +0000, Russell King - ARM Linux wrote:
> On Wed, Jan 29, 2014 at 11:35:14AM +1100, Stephen Rothwell wrote:
> > Hi Shawn,
> > 
> > Today's linux-next merge of the imx-mxs tree got a conflict in
> > arch/arm/boot/dts/Makefile between commits 208d7baf8085 ("ARM: imx:
> > initial SolidRun HummingBoard support") and 971488f1149f ("ARM: imx:
> > initial SolidRun Cubox-i support") from the arm tree and various commits
> > from the imx-mxs tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> 
> Nice easy add/add which Linus won't complain about.  Thanks Stephen.
> 
> This should move to between Linus' and Shawn's tree over the next
> couple of days since I've now sent my final pull request for this
> window.

I will rebase my branch on v3.14-rc1 once it's out.

Shawn


  reply	other threads:[~2014-01-29  1:18 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-29  0:35 Stephen Rothwell
2014-01-29  1:13 ` Russell King - ARM Linux
2014-01-29  1:18   ` Shawn Guo [this message]
2014-01-29  2:25     ` Stephen Rothwell
2014-01-29  3:58       ` Shawn Guo
  -- strict thread matches above, loose matches on Subject: below --
2014-01-20 23:58 Stephen Rothwell
2013-07-23  3:07 Stephen Rothwell

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=20140129011803.GA13518@S2101-09.ap.freescale.net \
    --to=shawn.guo@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --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®