Re: linux-next: manual merge of the arm-soc tree with the usb tree

From: Kevin Hilman <khilman@linaro.org>
To: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Benoit Cousson <bcousson@baylibre.com>,
	Javier Martinez Canillas <javier@dowhile0.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-kernel@vger.kernel.org, Felipe Balbi <balbi@ti.com>,
	linux-next@vger.kernel.org, Olof Johansson <olof@lixom.net>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree
Date: Tue, 27 Aug 2013 09:20:26 -0700	[thread overview]
Message-ID: <87mwo3umut.fsf@linaro.org> (raw)
In-Reply-To: 521CC4E3.8030204@linutronix.de

Sebastian Andrzej Siewior <bigeasy@linutronix.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