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

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LNX.2.00.1603040952330.3656@cbobk.fhfr.pm>
Date:	Fri, 4 Mar 2016 09:56:42 +0100 (CET)
From:	Jiri Kosina <jikos@...nel.org>
To:	Michael Ellerman <mpe@...erman.id.au>
cc:	Petr Mladek <pmladek@...e.com>, linuxppc-dev@...abs.org,
	jeyu@...hat.com, linux-kernel@...r.kernel.org, rostedt@...dmis.org,
	kamalesh@...ux.vnet.ibm.com, duwe@....de,
	live-patching@...r.kernel.org, mbenes@...e.cz,
	Torsten Duwe <duwe@...e.de>, vojtech@...e.com,
	jpoimboe@...hat.com, sjenning@...hat.com
Subject: Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable
 livepatching on powerpc)

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