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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20130827173732.GC21564@kroah.com>
Date:	Tue, 27 Aug 2013 10:37:32 -0700
From:	Greg KH <greg@...ah.com>
To:	Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Cc:	Benoit Cousson <bcousson@...libre.com>,
	Javier Martinez Canillas <javier@...hile0.org>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	Arnd Bergmann <arnd@...db.de>, linux-kernel@...r.kernel.org,
	Felipe Balbi <balbi@...com>, linux-next@...r.kernel.org,
	Olof Johansson <olof@...om.net>,
	linux-arm-kernel@...ts.infradead.org,
	"khilman@...aro.org" <khilman@...aro.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree

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 <bigeasy@...utronix.de>
> >> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
> >> Commit:     Felipe Balbi <balbi@...com>
> >> 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.

sorry,

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