linux-kernel - Re: linux-next: manual merge of the dt-rh tree with the imx-mxs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <5277B399.8050809@gmail.com>
Date:	Mon, 04 Nov 2013 08:47:53 -0600
From:	Rob Herring <robherring2@...il.com>
To:	Shawn Guo <shawn.guo@...aro.org>
CC:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rostislav Lisovy <lisovy@...il.com>,
	Silvio F <silvio.fricke@...il.com>
Subject: Re: linux-next: manual merge of the dt-rh tree with the imx-mxs tree

On 11/04/2013 08:36 AM, Shawn Guo wrote:
> On Mon, Nov 04, 2013 at 08:15:50AM -0600, Rob Herring wrote:
>> 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.
> 
> I'm queuing the patch for 3.14, and my branch will be rebased to
> 3.13-rc anyway.
> 
> Are you queuing "DT: sort vendor-prefixes.txt" for 3.13 or 3.14?  If
> it's for 3.13, we will be fine, since the conflict will be solved on my
> side when my branch gets rebased to 3.13-rc.

It is for 3.13.

Rob

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/