Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754034Ab3H0T2L (ORCPT ); Tue, 27 Aug 2013 15:28:11 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:33739 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751521Ab3H0T2I (ORCPT ); Tue, 27 Aug 2013 15:28:08 -0400 X-Sasl-enc: k4yZzrksi4JjUh6BTXl7OguUcfPHWYe9pRTAKETm7NS8 1377631683 Date: Tue, 27 Aug 2013 12:30:21 -0700 From: Greg KH To: Felipe Balbi Cc: Sebastian Andrzej Siewior , Benoit Cousson , Javier Martinez Canillas , Stephen Rothwell , Arnd Bergmann , linux-kernel@vger.kernel.org, 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 Message-ID: <20130827193021.GA30113@kroah.com> References: <521C6961.9020103@linutronix.de> <521CA888.1080909@baylibre.com> <521CAF59.1090203@linutronix.de> <521CB046.9070408@baylibre.com> <521CB18B.4080000@linutronix.de> <521CB239.6050409@baylibre.com> <521CB403.8010307@linutronix.de> <20130827173732.GC21564@kroah.com> <20130827183732.GP3005@radagast> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130827183732.GP3005@radagast> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2419 Lines: 60 On Tue, Aug 27, 2013 at 01:37:32PM -0500, Felipe Balbi wrote: > Hi, > > On Tue, Aug 27, 2013 at 10:37:32AM -0700, Greg KH wrote: > > On Tue, Aug 27, 2013 at 04:13:23PM +0200, Sebastian Andrzej Siewior wrote: > > > 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 > > > > Nor will you, given that I am not the one to take these patches, Felipe > > is. I noticed now that you said "please route around Felipe", but > > sorry, no, I'm not going to do that unless there's a really good reason. > > Felipe seems to be around at the moment, please work with him on this. > > If you will still take a 'part2' pull request from me, I can send you > urgent bugfixes by friday. If I have some time left, I can even try to > get that sorted out by tomorrow. For 3.12 stuff, like "fixes", sure, I can take them this week, that should give us a week or so for linux-next testing, right? thanks, greg k-h -- 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/