linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the usb 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <87mwo3umut.fsf@linaro.org>
Date:	Tue, 27 Aug 2013 09:20:26 -0700
From:	Kevin Hilman <khilman@...aro.org>
To:	Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Cc:	Benoit Cousson <bcousson@...libre.com>,
	Javier Martinez Canillas <javier@...hile0.org>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>,
	linux-kernel@...r.kernel.org, Felipe Balbi <balbi@...com>,
	linux-next@...r.kernel.org, Olof Johansson <olof@...om.net>,
	linux-arm-kernel@...ts.infradead.org
Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree

Sebastian Andrzej Siewior <bigeasy@...utronix.de> writes:

> On 08/27/2013 05:01 PM, Kevin Hilman wrote:
>>>> What do we do now?
>>>
>>> Cannot you just merge the stable arm-soc/dt branch into your branch
>>> before applying your patches?
>> 
>> Unfortunately, the next/dt branch of arm-soc is not necessarily stable
>> so should *not* be merged.  In fact none of the arm-soc branches should
>> be considered stable.
>> 
>> As was already mentioned, this should be split up into driver changes
>> and DTS changes through arm-soc.  They'll both merge for v3.12.
>
> But splitting will break the driver until .dts & code is in sync again.

I wouldn't lose any sleep about breaking the driver since this was not
merged properly for various reasons (as Olof has pointed out.)

Unfortunately, since it's already in Greg's stable tree, we're now left
to clean up the mess in arm-soc land [grmbl]

Kevin




--
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/