linux-next: manual merge of the arm-soc tree with the usb tree
From: bigeasy@linutronix.de (Sebastian Andrzej Siewior)
Date: 2013-08-27 14:13:33
Also in:
linux-next, lkml
From: bigeasy@linutronix.de (Sebastian Andrzej Siewior)
Date: 2013-08-27 14:13:33
Also in:
linux-next, lkml
On 08/27/2013 04:05 PM, Benoit Cousson wrote:
On 27/08/2013 16:02, Sebastian Andrzej Siewior wrote:quoted
On 08/27/2013 03:57 PM, Benoit Cousson wrote:quoted
+ Kevin, On 27/08/2013 15:53, Sebastian Andrzej Siewior wrote:quoted
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 [off-list ref] AuthorDate: Thu Jun 20 12:13:04 2013 +0200 Commit: Felipe Balbi [off-list ref] CommitDate: Fri Aug 9 17:40:16 2013 +0300 usb: musb dma: add cppi41 dma driverMmm, 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?
Please be aware that I have no response so far regarding [0] from Greg. [0] http://www.spinics.net/lists/linux-usb/msg92595.html
Regards, Benoit
Sebastian