From: Michael Ellerman <mpe@ellerman•id.au>
To: Jiri Kosina <jikos@kernel•org>
Cc: Petr Mladek <pmladek@suse•com>,
linuxppc-dev@ozlabs•org, jeyu@redhat•com,
linux-kernel@vger•kernel.org, rostedt@goodmis•org,
kamalesh@linux•vnet.ibm.com, duwe@lst•de,
live-patching@vger•kernel.org, mbenes@suse•cz,
Torsten Duwe <duwe@suse•de>,
vojtech@suse•com, jpoimboe@redhat•com, sjenning@redhat•com
Subject: Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc)
Date: Tue, 08 Mar 2016 10:20:22 +1100 [thread overview]
Message-ID: <1457392822.25457.4.camel@ellerman.id.au> (raw)
In-Reply-To: <alpine.LNX.2.00.1603072348280.3656@cbobk.fhfr.pm>
On Mon, 2016-03-07 at 23:52 +0100, Jiri Kosina wrote:
> On Mon, 7 Mar 2016, Michael Ellerman wrote:
>
> > > This aligns with my usual workflow, so that'd be my preferred way of doing
> > > things; i.e. you put all the ftrace changes into a separate topic branch,
> > > and then
> > >
> > > - you pull that branch into powerpc#next
> > > - I pull that branch into livepatching tree
> > > - I apply the ppc livepatching support on top of that
> > > - I send a pull request to Linus only after powerpc#next gets merged to
> > > Linus' tree
> > >
> > > Sounds good?
> >
> > Yep, here it is:
> >
> > https://git.kernel.org/cgit/linux/kernel/git/powerpc/linux.git/log/?h=topic/mprofile-kernel
> >
> > aka:
> >
> > git fetch git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git topic/mprofile-kernel
>
> Excellent, thanks.
>
> > I haven't merged it into my next yet, but I will tomorrow unless you tell me
> > there's something wrong with it.
>
> There is one remaining issue which I think would be really nice to
> have(TM), and that's Steven's Ack for the whole thing :)
Yeah. He's been on CC the whole time, but he's probably getting a bit sick of
it all, as we're up to about version 15. So I figure if he really hated it he'd
have said so by now :) - but an Ack would still be good.
> For the livepatching part, I don't think we are quite there yet (so maybe
> it'll miss the upcoming merge window anyway).
>
> My primary worry there is what Torsten pointed out, i.e. functions with
> either varargs or more than 8 args needing special care.
Yeah true. My preference would be to merge it, but mark LIVEPATCH as
experimental on powerpc. I think having it in the tree would help it get more
testing, and probably find other bugs too. But it's up to you guys.
> Also, I'd like to have this positively reviewed by at least one more
> livepatching maintainer (I am currently looking into it myself, but my
> understanding of powerpc arch is rather low, so the more eyes, the
> better).
Sure. I can answer powerpc questions, though Torsten is probably the person who
has the best understanding of (livepatching && powerpc).
cheers
next prev parent reply other threads:[~2016-03-07 23:20 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-03 16:52 [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Petr Mladek
2016-03-03 20:43 ` Balbir Singh
2016-03-04 6:08 ` Kamalesh Babulal
2016-03-04 7:58 ` Michael Ellerman
2016-03-04 9:31 ` Miroslav Benes
2016-03-07 3:29 ` Michael Ellerman
2016-03-04 8:06 ` How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc) Michael Ellerman
2016-03-04 8:56 ` Jiri Kosina
2016-03-07 10:06 ` Michael Ellerman
2016-03-07 22:52 ` Jiri Kosina
2016-03-07 23:20 ` Michael Ellerman [this message]
2016-03-08 1:53 ` Steven Rostedt
2016-03-07 23:22 ` Josh Poimboeuf
2016-03-04 12:42 ` [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Torsten Duwe
2016-03-04 13:01 ` Petr Mladek
2016-03-04 18:16 ` Torsten Duwe
2016-03-04 19:22 ` Torsten Duwe
2016-03-08 11:14 ` Torsten Duwe
2016-03-06 23:55 ` Balbir Singh
2016-03-04 21:56 ` Josh Poimboeuf
2016-03-08 21:42 ` Steven Rostedt
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=1457392822.25457.4.camel@ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=duwe@lst$(echo .)de \
--cc=duwe@suse$(echo .)de \
--cc=jeyu@redhat$(echo .)com \
--cc=jikos@kernel$(echo .)org \
--cc=jpoimboe@redhat$(echo .)com \
--cc=kamalesh@linux$(echo .)vnet.ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=live-patching@vger$(echo .)kernel.org \
--cc=mbenes@suse$(echo .)cz \
--cc=pmladek@suse$(echo .)com \
--cc=rostedt@goodmis$(echo .)org \
--cc=sjenning@redhat$(echo .)com \
--cc=vojtech@suse$(echo .)com \
/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