Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1349960

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

Show all headers | View raw

On Fri, 4 Mar 2016, Michael Ellerman wrote:

> Obviously it depends heavily on the content of my series, which will go into
> powerpc#next, so it would make sense if this went there too.
> 
> I don't see any changes in linux-next for livepatch, so merging it via powerpc
> would probably work fine and not cause any conflicts, unless there's some
> livepatch changes pending for 4.6 that aren't in linux-next yet?
> 
> The other option is that I put my ftrace changes and this in a topic branch
> (based on v4.5-rc3), and then that can be merged into both powerpc#next and the
> livepatch tree.

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?

> Also regardless of who takes it an Ack from Steve for the ftrace changes 
> would be good.

Absolutely.

Thanks!

-- 
Jiri Kosina
SUSE Labs

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Petr Mladek <pmladek@suse.com> - 2016-03-03 18:00 +0100
  Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> - 2016-03-04 07:10 +0100
  Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Michael Ellerman <mpe@ellerman.id.au> - 2016-03-04 09:00 +0100
    Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Miroslav Benes <mbenes@suse.cz> - 2016-03-04 10:40 +0100
      Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Michael Ellerman <mpe@ellerman.id.au> - 2016-03-07 04:40 +0100
  How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable  livepatching on powerpc) Michael Ellerman <mpe@ellerman.id.au> - 2016-03-04 09:10 +0100
    Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable  livepatching on powerpc) Jiri Kosina <jikos@kernel.org> - 2016-03-04 10:00 +0100
      Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable  livepatching on powerpc) Michael Ellerman <mpe@ellerman.id.au> - 2016-03-07 11:10 +0100
        Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable  livepatching on powerpc) Michael Ellerman <mpe@ellerman.id.au> - 2016-03-08 00:30 +0100
          Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable  livepatching on powerpc) Steven Rostedt <rostedt@goodmis.org> - 2016-03-08 03:00 +0100
        Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable  livepatching on powerpc) Josh Poimboeuf <jpoimboe@redhat.com> - 2016-03-08 00:30 +0100
        Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable  livepatching on powerpc) Jiri Kosina <jikos@kernel.org> - 2016-03-08 01:50 +0100
  Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Torsten Duwe <duwe@lst.de> - 2016-03-04 13:50 +0100
    Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Petr Mladek <pmladek@suse.com> - 2016-03-04 14:10 +0100
      Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Torsten Duwe <duwe@lst.de> - 2016-03-04 19:20 +0100
        Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Torsten Duwe <duwe@lst.de> - 2016-03-04 20:30 +0100
          Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Torsten Duwe <duwe@lst.de> - 2016-03-08 12:20 +0100
    Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Balbir Singh <bsingharora@gmail.com> - 2016-03-07 01:00 +0100
  Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Josh Poimboeuf <jpoimboe@redhat.com> - 2016-03-04 23:00 +0100
  Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc Steven Rostedt <rostedt@goodmis.org> - 2016-03-08 22:50 +0100

csiph-web