linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shawn Guo <shawnguo@kernel.org>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Shawn Guo <shawn.guo@linaro.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Yangbo Lu <yangbo.lu@nxp.com>, Hongtao Jia <hongtao.jia@nxp.com>
Subject: Re: linux-next: manual merge of the mmc tree with the imx-mxs tree
Date: Thu, 10 Nov 2016 09:35:36 +0800	[thread overview]
Message-ID: <20161110013535.GD14622@dragon> (raw)
In-Reply-To: <20161110115004.431c171e@canb.auug.org.au>

Hi Ulf,

On Thu, Nov 10, 2016 at 11:50:04AM +1100, Stephen Rothwell wrote:
> Hi Ulf,
> 
> Today's linux-next merge of the mmc tree got a conflict in:
> 
>   arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
> 
> between commit:
> 
>   784e94eeb377 ("arm64: dts: ls2080a: Add TMU device tree support for LS2080A")
> 
> from the imx-mxs tree and commit:
> 
>   61ab9ffac1b9 ("ARM64: dts: ls2080a: add device configuration node")

Is there a reason why this dts patch has to go through mmc tree?  We
normally have them go via arm-soc tree.

Shawn

> 
> from the mmc tree.

      reply	other threads:[~2016-11-10  1:36 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-10  0:50 linux-next: manual merge of the mmc tree with the imx-mxs tree Stephen Rothwell
2016-11-10  1:35 ` Shawn Guo [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=20161110013535.GD14622@dragon \
    --to=shawnguo@kernel.org \
    --cc=hongtao.jia@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=shawn.guo@linaro.org \
    --cc=ulf.hansson@linaro.org \
    --cc=yangbo.lu@nxp.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).