Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754203AbcCHAkK (ORCPT ); Mon, 7 Mar 2016 19:40:10 -0500 Received: from mx2.suse.de ([195.135.220.15]:38425 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753979AbcCGWwf (ORCPT ); Mon, 7 Mar 2016 17:52:35 -0500 Date: Mon, 7 Mar 2016 23:52:31 +0100 (CET) From: Jiri Kosina X-X-Sender: jkosina@pobox.suse.cz To: Michael Ellerman 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 Subject: Re: How to merge? (was Re: [PATCH][v4] livepatch/ppc: Enable livepatching on powerpc) In-Reply-To: <1457345161.18915.3.camel@ellerman.id.au> Message-ID: References: <1457023921-2051-1-git-send-email-pmladek@suse.com> <1457078800.20076.4.camel@ellerman.id.au> <1457345161.18915.3.camel@ellerman.id.au> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1489 Lines: 46 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 :) 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). Thanks! -- Jiri Kosina SUSE Labs