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: <521CC4E3.8030204@linutronix.de>
Date:	Tue, 27 Aug 2013 17:25:23 +0200
From:	Sebastian Andrzej Siewior <bigeasy@...utronix.de>
To:	Kevin Hilman <khilman@...aro.org>
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

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.

> BTW, how did this patch get merged without a signoff/ack from the OMAP
> DT maintainer in the first place?  Hmm, looks like Benoit was not copied
> nor was linux-omap or linux-arm-kernel copied in the original mails.

Hmm. I had Benoit's okay [0] to do the change "as long as Felipe is
fine with it". I indeed forgot to Cc Benoit on the dts changes.
For the phy-rename Felipe pinged you and we did the topic-branch, here
I forgot.

> 
> Kevin

[0] http://www.spinics.net/lists/linux-usb/msg88423.html

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