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

From: Sebastian Andrzej Siewior
Date: Tue Aug 27 2013 - 10:03:06 EST


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@xxxxxxxxxxxxx>
AuthorDate: Thu Jun 20 12:13:04 2013 +0200
Commit: Felipe Balbi <balbi@xxxxxx>
CommitDate: Fri Aug 9 17:40:16 2013 +0300

usb: musb dma: add cppi41 dma driver

> Regards
> Benoit

Sebastian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/