Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc)

On Mon, Mar 07, 2016 at 11:52:31PM +0100, Jiri Kosina wrote:

On Mon, 7 Mar 2016, Michael Ellerman wrote:

quoted

quoted

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.

quoted

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 :)

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.

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).

It's been a few years but I'll try to dust off my powerpc chops and give
it a proper review.

-- 
Josh