Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752224AbdCIGhp (ORCPT ); Thu, 9 Mar 2017 01:37:45 -0500 Received: from ozlabs.org ([103.22.144.67]:43361 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751013AbdCIGho (ORCPT ); Thu, 9 Mar 2017 01:37:44 -0500 From: Michael Ellerman To: "Naveen N. Rao" , Arnaldo Carvalho de Melo Cc: Masami Hiramatsu , Steven Rostedt , Ingo Molnar , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Ananth N Mavinakayanahalli Subject: Re: [PATCH v5 2/5] powerpc: kretprobes: override default function entry offset In-Reply-To: <20170308164644.GK11046@naverao1-tp.localdomain> References: <53bcae5a711eab803c9c3210110e8a464df34202.1488961018.git.naveen.n.rao@linux.vnet.ibm.com> <87o9xcujzi.fsf@concordia.ellerman.id.au> <20170308142412.GI11046@naverao1-tp.localdomain> <20170308142916.GA3035@kernel.org> <20170308164644.GK11046@naverao1-tp.localdomain> User-Agent: Notmuch/0.21 (https://notmuchmail.org) Date: Thu, 09 Mar 2017 17:37:38 +1100 Message-ID: <87a88vuf9p.fsf@concordia.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 944 Lines: 23 "Naveen N. Rao" writes: > On 2017/03/08 11:29AM, Arnaldo Carvalho de Melo wrote: >> > I wasn't sure if you were planning on picking up KPROBES_ON_FTRACE for >> > v4.11. If so, it would be good to take this patch through the powerpc >> > tree. Otherwise, this can go via Ingo's tree. >> >> If you guys convince Ingo that this should go _now_, then just cherry >> pick what was merged into tip/perf/core that is needed for the arch >> specific stuff and go from there. > > Ok, in hindsight, I think Michael's concern was actually for v4.12 Yes I was talking about 4.12, sorry I thought that was implied :) > itself, in which case this particular patch can go via powerpc tree, > while the rest of the patches in this series can go via your tree. > > Michael? Yeah I think that's the easiest option. The function will be temporarily unused until the two trees are merged, but I think that's fine. cheers