Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753410Ab3H0OFu (ORCPT ); Tue, 27 Aug 2013 10:05:50 -0400 Received: from mail-bk0-f47.google.com ([209.85.214.47]:48672 "EHLO mail-bk0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752881Ab3H0OFt (ORCPT ); Tue, 27 Aug 2013 10:05:49 -0400 Message-ID: <521CB239.6050409@baylibre.com> Date: Tue, 27 Aug 2013 16:05:45 +0200 From: Benoit Cousson Organization: BayLibre User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: Sebastian Andrzej Siewior 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" Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree 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> In-Reply-To: <521CB18B.4080000@linutronix.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1173 Lines: 37 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? Regards, Benoit -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/