All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Olof Johansson <olof@lixom.net>
Cc: Arnd Bergmann <arnd@arndb.de>,
	LKML <linux-kernel@vger.kernel.org>,
	Magnus Damm <magnus.damm@gmail.com>,
	Linux-sh list <linux-sh@vger.kernel.org>,
	"arm@kernel.org" <arm@kernel.org>,
	Paul Mundt <lethal@linux-sh.org>
Subject: Re: [GIT PULL] Renesas SoC updates for v3.4, take 2
Date: Wed, 14 Mar 2012 09:03:22 +0000	[thread overview]
Message-ID: <201203141003.22901.rjw@sisk.pl> (raw)
In-Reply-To: <CAOesGMgsRDgiyfNTdC9KCPd4BJ-EsPK6=noVp=EVx-TMT7Hv7A@mail.gmail.com>

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

WARNING: multiple messages have this Message-ID (diff)
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Olof Johansson <olof@lixom.net>
Cc: Arnd Bergmann <arnd@arndb.de>,
	LKML <linux-kernel@vger.kernel.org>,
	Magnus Damm <magnus.damm@gmail.com>,
	"Linux-sh list" <linux-sh@vger.kernel.org>,
	"arm@kernel.org" <arm@kernel.org>,
	Paul Mundt <lethal@linux-sh.org>
Subject: Re: [GIT PULL] Renesas SoC updates for v3.4, take 2
Date: Wed, 14 Mar 2012 10:03:22 +0100	[thread overview]
Message-ID: <201203141003.22901.rjw@sisk.pl> (raw)
In-Reply-To: <CAOesGMgsRDgiyfNTdC9KCPd4BJ-EsPK6=noVp=EVx-TMT7Hv7A@mail.gmail.com>

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

  reply	other threads:[~2012-03-14  9:03 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-09 20:55 [GIT PULL] Renesas SoC updates for v3.4 Rafael J. Wysocki
2012-03-09 20:55 ` Rafael J. Wysocki
2012-03-09 21:34 ` Arnd Bergmann
2012-03-09 21:34   ` Arnd Bergmann
2012-03-09 21:48   ` Rob Herring
2012-03-09 21:48     ` Rob Herring
2012-03-09 21:52   ` Rafael J. Wysocki
2012-03-09 21:52     ` Rafael J. Wysocki
2012-03-09 22:03     ` Arnd Bergmann
2012-03-09 22:03       ` Arnd Bergmann
2012-03-09 22:27       ` Rafael J. Wysocki
2012-03-09 22:27         ` Rafael J. Wysocki
2012-03-10 10:53         ` Arnd Bergmann
2012-03-10 21:26           ` Rafael J. Wysocki
2012-03-10 21:26             ` Rafael J. Wysocki
2012-03-10 22:06             ` Geert Uytterhoeven
2012-03-10 22:06               ` Geert Uytterhoeven
2012-03-12  1:13     ` Paul Mundt
2012-03-12  1:13       ` Paul Mundt
2012-03-12 21:30       ` Rafael J. Wysocki
2012-03-12 21:30         ` Rafael J. Wysocki
2012-03-12 22:53 ` [GIT PULL] Renesas SoC updates for v3.4, take 2 Rafael J. Wysocki
2012-03-12 22:53   ` Rafael J. Wysocki
2012-03-13 10:26   ` Arnd Bergmann
2012-03-13 19:36     ` Rafael J. Wysocki
2012-03-13 19:36       ` Rafael J. Wysocki
2012-03-13 19:39       ` Arnd Bergmann
2012-03-13 20:17         ` Rafael J. Wysocki
2012-03-13 20:17           ` Rafael J. Wysocki
2012-03-13 21:42           ` Rafael J. Wysocki
2012-03-13 21:42             ` Rafael J. Wysocki
2012-03-14  0:02             ` Olof Johansson
2012-03-14  0:02               ` Olof Johansson
2012-03-14  0:16               ` Rafael J. Wysocki
2012-03-14  0:16                 ` Rafael J. Wysocki
2012-03-14  0:40                 ` Olof Johansson
2012-03-14  0:40                   ` Olof Johansson
2012-03-14  9:03                   ` Rafael J. Wysocki [this message]
2012-03-14  9:03                     ` Rafael J. Wysocki

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=201203141003.22901.rjw@sisk.pl \
    --to=rjw@sisk.pl \
    --cc=arm@kernel.org \
    --cc=arnd@arndb.de \
    --cc=lethal@linux-sh.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    --cc=olof@lixom.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.