From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Andrzej Siewior Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree Date: Tue, 27 Aug 2013 16:02:51 +0200 Message-ID: <521CB18B.4080000@linutronix.de> References: <20130827181353.319c150858829df1bb68d60b@canb.auug.org.au> <521C6961.9020103@linutronix.de> <521CA888.1080909@baylibre.com> <521CAF59.1090203@linutronix.de> <521CB046.9070408@baylibre.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-path: Received: from www.linutronix.de ([62.245.132.108]:37244 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752028Ab3H0OC6 (ORCPT ); Tue, 27 Aug 2013 10:02:58 -0400 In-Reply-To: <521CB046.9070408@baylibre.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Benoit Cousson Cc: Javier Martinez Canillas , Stephen Rothwell , Greg KH , Arnd Bergmann , linux-kernel@vger.kernel.org, Felipe Balbi , linux-next@vger.kernel.org, Olof Johansson , linux-arm-kernel@lists.infradead.org, "khilman@linaro.org" 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 > Regards > Benoit Sebastian From mboxrd@z Thu Jan 1 00:00:00 1970 From: bigeasy@linutronix.de (Sebastian Andrzej Siewior) Date: Tue, 27 Aug 2013 16:02:51 +0200 Subject: linux-next: manual merge of the arm-soc tree with the usb tree In-Reply-To: <521CB046.9070408@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> Message-ID: <521CB18B.4080000@linutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > Regards > Benoit Sebastian