From: Shawn Guo <shawn.guo@freescale•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Daniel Lezcano <daniel.lezcano@linaro•org>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org,
Cosmin Stoica <cosminstefan.stoica@freescale•com>,
Xiubo Li <Li.Xiubo@freescale•com>
Subject: Re: linux-next: manual merge of the clockevents tree with the arm-soc tree
Date: Mon, 26 May 2014 15:49:15 +0800 [thread overview]
Message-ID: <20140526074913.GD2650@dragon> (raw)
In-Reply-To: <20140526154331.7fc6b30c@canb.auug.org.au>
Hi Daniel,
On Mon, May 26, 2014 at 03:43:31PM +1000, Stephen Rothwell wrote:
> Hi Daniel,
>
> Today's linux-next merge of the clockevents tree got a conflict in
> arch/arm/boot/dts/vf610.dtsi between commit 0517fe6aa880 ("ARM: dts:
> vf610-twr: Add support for sdhc1") from the arm-soc tree and commit
> 07513e1330a9 ("ARM: dts: vf610: Add Freescale FlexTimer Module timer
> node") from the clockevents tree.
Next time, please leave the dts patches to go via arch tree, so that we
can save such conflicts.
Shawn
next prev parent reply other threads:[~2014-05-26 7:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-26 5:43 linux-next: manual merge of the clockevents tree with the arm-soc tree Stephen Rothwell
2014-05-26 6:03 ` Li.Xiubo
2014-05-26 7:49 ` Shawn Guo [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-06-07 2:56 Stephen Rothwell
2016-07-07 4:12 Stephen Rothwell
2016-07-11 5:28 ` Stephen Rothwell
2016-07-15 17:06 ` Daniel Lezcano
2016-07-26 22:08 ` Stephen Rothwell
2016-08-01 23:24 ` Stephen Rothwell
2016-08-02 1:26 ` Linus Torvalds
2016-08-02 1:28 ` Linus Torvalds
2017-04-10 3:18 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=20140526074913.GD2650@dragon \
--to=shawn.guo@freescale$(echo .)com \
--cc=Li.Xiubo@freescale$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=cosminstefan.stoica@freescale$(echo .)com \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/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