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: <521CB239.6050409@baylibre.com>
Date:	Tue, 27 Aug 2013 16:05:45 +0200
From:	Benoit Cousson <bcousson@...libre.com>
To:	Sebastian Andrzej Siewior <bigeasy@...utronix.de>
CC:	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,
	"khilman@...aro.org" <khilman@...aro.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree

On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:
> On 08/27/2013 03:57 PM, Benoit Cousson wrote:
>> + Kevin,
>>
>> On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:
>>> What do we do now?
>>
>> Cannot you just merge the stable arm-soc/dt branch into your branch
>> before applying your patches?
>
> That is up to Greg. This changes sat in his usb-next tree for a while
> now. And before they hit Greg they were in Felipe's tree for a while.
>
> To be exact, last .dts change via USB was:
>
> Author:     Sebastian Andrzej Siewior <bigeasy@...utronix.de>
> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
> Commit:     Felipe Balbi <balbi@...com>
> CommitDate: Fri Aug 9 17:40:16 2013 +0300
>
> 	usb: musb dma: add cppi41 dma driver

Mmm, if that branch is supposed to be stable, I'm not sure it will be 
doable...

Maybe we should do the other way around? And merge usb-next into arm-soc/dt.

Kevin, Olof?

Regards,
Benoit

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