From: Rob Herring <robherring2@gmail.com>
To: Shawn Guo <shawn.guo@linaro.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Rostislav Lisovy <lisovy@gmail.com>,
Silvio F <silvio.fricke@gmail.com>
Subject: Re: linux-next: manual merge of the dt-rh tree with the imx-mxs tree
Date: Mon, 04 Nov 2013 08:15:50 -0600 [thread overview]
Message-ID: <5277AC16.3060000@gmail.com> (raw)
In-Reply-To: <20131104131739.GC24970@S2101-09.ap.freescale.net>
On 11/04/2013 07:17 AM, Shawn Guo wrote:
> On Mon, Nov 04, 2013 at 03:27:39PM +1100, Stephen Rothwell wrote:
>> Hi Rob,
>>
>> Today's linux-next merge of the dt-rh tree got a conflict in
>> Documentation/devicetree/bindings/vendor-prefixes.txt between commit
>> 064d7f6c985a ("ARM: dts: Add vendor prefix for Voipac Technologies
>> s.r.o") from the imx-mxs tree and commit d6c3073e7fb5 ("DT: sort
>> vendor-prefixes.txt") from the dt-rh tree.
>
> Hi Rob,
>
> Would you like to apply the patch "ARM: dts: Add vendor prefix for
> Voipac Technologies s.r.o" on your tree, so that we can save this
> conflict? If so, I will drop the patch from my tree. Just let me know.
Unless it is the top commit, it is best to not rebase your tree.
Rob
next prev parent reply other threads:[~2013-11-04 14:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-04 4:27 linux-next: manual merge of the dt-rh tree with the imx-mxs tree Stephen Rothwell
2013-11-04 13:17 ` Shawn Guo
2013-11-04 14:15 ` Rob Herring [this message]
2013-11-04 14:36 ` Shawn Guo
2013-11-04 14:47 ` Rob Herring
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=5277AC16.3060000@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lisovy@gmail.com \
--cc=sfr@canb.auug.org.au \
--cc=shawn.guo@linaro.org \
--cc=silvio.fricke@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).