lkml.org 
[lkml]   [2012]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [GIT PULL] Renesas SoC updates for v3.4, take 2
Date
On Wednesday, March 14, 2012, Olof Johansson wrote:
> On Tue, Mar 13, 2012 at 5:16 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> > On Wednesday, March 14, 2012, Olof Johansson wrote:
> >> On Tue, Mar 13, 2012 at 2:42 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> >> > On Tuesday, March 13, 2012, Rafael J. Wysocki wrote:
> >> >> On Tuesday, March 13, 2012, Arnd Bergmann wrote:
> >> >> > On Tuesday 13 March 2012, Rafael J. Wysocki wrote:
> >> >> > > > Note that the __io() issue has turned out to be more urgent than I first
> >> >> > > > thought when we discussed it, so it would be good to apply the patch below
> >> >> > > > on top of your series.
> >> >> > >
> >> >> > > Do you want me to apply it now or will you do that in your tree?
> >> >> >
> >> >> > Doesn't matter to me, as long as one of you applies it ;-)
> >> >>
> >> >> OK, so I will add it to the soc branch in the Renesas tree.
> >> >
> >> > Applied and pushed back the updated tree.
> >>
> >> Seems like you applied the patch but without the subject line,
> >
> > I didn't notice that, sorry.
> >
> >> so now git thinks the whole first paragraph is the patch subject. That's a
> >> bit messy and I'd prefer if you could fix it up.
> >
> > I've just replaced the broken commit with a new fixed one.
> >
> >> Do you have downstream users of your tree that you'll mess up if you
> >> rebase the last commit though? Alternatively I can take everything on
> >> the branch but the last patch and apply it myself, but that will still
> >> cause trouble for your downstream developers once things go upstream
> >> and come down.
> >
> > Hopefully, no one has pulled from the tree yet. :-)
>
> Cool. Pulled into next/soc. Thanks!!

Great, thanks a lot!

Rafael


\
 
 \ /
  Last update: 2012-03-14 10:01    [W:0.053 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site