From mboxrd@z Thu Jan 1 00:00:00 1970 From: bigeasy@linutronix.de (Sebastian Andrzej Siewior) Date: Tue, 27 Aug 2013 16:13:23 +0200 Subject: linux-next: manual merge of the arm-soc tree with the usb tree In-Reply-To: <521CB239.6050409@baylibre.com> References: <20130827181353.319c150858829df1bb68d60b@canb.auug.org.au> <521C6961.9020103@linutronix.de> <521CA888.1080909@baylibre.com> <521CAF59.1090203@linutronix.de> <521CB046.9070408@baylibre.com> <521CB18B.4080000@linutronix.de> <521CB239.6050409@baylibre.com> Message-ID: <521CB403.8010307@linutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 08/27/2013 04:05 PM, Benoit Cousson wrote: > 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 >> AuthorDate: Thu Jun 20 12:13:04 2013 +0200 >> Commit: Felipe Balbi >> 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? 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