From: Greg KH <greg@kroah•com>
To: Sebastian Andrzej Siewior <bigeasy@linutronix•de>
Cc: Benoit Cousson <bcousson@baylibre•com>,
Javier Martinez Canillas <javier@dowhile0•org>,
Stephen Rothwell <sfr@canb•auug.org.au>,
Arnd Bergmann <arnd@arndb•de>,
linux-kernel@vger•kernel.org, Felipe Balbi <balbi@ti•com>,
linux-next@vger•kernel.org, Olof Johansson <olof@lixom•net>,
linux-arm-kernel@lists•infradead.org,
"khilman@linaro•org" <khilman@linaro•org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree
Date: Tue, 27 Aug 2013 10:37:32 -0700 [thread overview]
Message-ID: <20130827173732.GC21564@kroah.com> (raw)
In-Reply-To: <521CB403.8010307@linutronix.de>
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@linutronix•de>
> >> AuthorDate: Thu Jun 20 12:13:04 2013 +0200
> >> Commit: Felipe Balbi <balbi@ti•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
next prev parent reply other threads:[~2013-08-27 17:37 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 8:13 linux-next: manual merge of the arm-soc tree with the usb tree Stephen Rothwell
2013-08-27 8:54 ` Sebastian Andrzej Siewior
2013-08-27 13:02 ` Javier Martinez Canillas
2013-08-27 13:24 ` Benoit Cousson
2013-08-27 13:53 ` Sebastian Andrzej Siewior
2013-08-27 13:57 ` Benoit Cousson
2013-08-27 14:02 ` Sebastian Andrzej Siewior
2013-08-27 14:05 ` Benoit Cousson
2013-08-27 14:13 ` Sebastian Andrzej Siewior
2013-08-27 17:37 ` Greg KH [this message]
2013-08-27 18:37 ` Felipe Balbi
2013-08-27 19:30 ` Greg KH
2013-08-27 19:56 ` Felipe Balbi
2013-08-29 10:06 ` Benoit Cousson
2013-08-29 13:44 ` Javier Martinez Canillas
2013-08-29 14:23 ` Felipe Balbi
2013-08-29 14:47 ` Benoit Cousson
2013-08-27 19:23 ` Sebastian Andrzej Siewior
2013-08-27 15:01 ` Kevin Hilman
2013-08-27 15:25 ` Sebastian Andrzej Siewior
2013-08-27 16:12 ` Olof Johansson
2013-08-27 16:30 ` Sebastian Andrzej Siewior
2013-08-28 13:01 ` Benoit Cousson
2013-08-27 16:20 ` Kevin Hilman
-- strict thread matches above, loose matches on Subject: below --
2013-08-28 6:45 Stephen Rothwell
2013-08-28 17:26 ` Greg KH
2013-08-27 8:24 Stephen Rothwell
2013-08-27 8:21 Stephen Rothwell
2013-08-27 8:18 Stephen Rothwell
2013-06-18 6:12 Stephen Rothwell
2013-06-18 12:56 ` Sergei Shtylyov
2013-06-18 16:03 ` Greg KH
2013-02-12 3:59 Stephen Rothwell
2013-02-11 6:06 Stephen Rothwell
2013-02-11 6:05 Stephen Rothwell
2012-11-27 4:57 Stephen Rothwell
2012-11-27 8:37 ` Arnd Bergmann
2012-11-13 4:20 Stephen Rothwell
2012-11-13 8:48 ` Nicolas Ferre
2012-11-13 4:06 Stephen Rothwell
2012-11-13 8:47 ` Nicolas Ferre
2012-09-25 6:56 Stephen Rothwell
2012-09-25 7:22 ` Tony Prisk
2012-09-06 5:42 Stephen Rothwell
2012-09-06 9:32 ` Roland Stigge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130827173732.GC21564@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=balbi@ti$(echo .)com \
--cc=bcousson@baylibre$(echo .)com \
--cc=bigeasy@linutronix$(echo .)de \
--cc=javier@dowhile0$(echo .)org \
--cc=khilman@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox