Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752632AbcCGKGM (ORCPT ); Mon, 7 Mar 2016 05:06:12 -0500 Received: from ozlabs.org ([103.22.144.67]:33384 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752082AbcCGKGF (ORCPT ); Mon, 7 Mar 2016 05:06:05 -0500 Message-ID: <1457345161.18915.3.camel@ellerman.id.au> Subject: Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc) From: Michael Ellerman To: Jiri Kosina Cc: Petr Mladek , 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 , vojtech@suse.com, jpoimboe@redhat.com, sjenning@redhat.com Date: Mon, 07 Mar 2016 21:06:01 +1100 In-Reply-To: References: <1457023921-2051-1-git-send-email-pmladek@suse.com> <1457078800.20076.4.camel@ellerman.id.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.16.5-1ubuntu3.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1428 Lines: 39 On Fri, 2016-03-04 at 09:56 +0100, Jiri Kosina wrote: > 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? 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 I haven't merged it into my next yet, but I will tomorrow unless you tell me there's something wrong with it. cheers