linux-kernel - Re: [GIT PULL] Renesas SoC updates for v3.4, take 2

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <201203141003.22901.rjw@sisk.pl>
Date:	Wed, 14 Mar 2012 10:03:22 +0100
From:	"Rafael J. Wysocki" <rjw@...k.pl>
To:	Olof Johansson <olof@...om.net>
Cc:	Arnd Bergmann <arnd@...db.de>, LKML <linux-kernel@...r.kernel.org>,
	Magnus Damm <magnus.damm@...il.com>,
	"Linux-sh list" <linux-sh@...r.kernel.org>,
	"arm@...nel.org" <arm@...nel.org>, Paul Mundt <lethal@...ux-sh.org>
Subject: Re: [GIT PULL] Renesas SoC updates for v3.4, take 2

On Wednesday, March 14, 2012, Olof Johansson wrote:
> On Tue, Mar 13, 2012 at 5:16 PM, Rafael J. Wysocki <rjw@...k.pl> wrote:
> > On Wednesday, March 14, 2012, Olof Johansson wrote:
> >> On Tue, Mar 13, 2012 at 2:42 PM, Rafael J. Wysocki <rjw@...k.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
--
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/