Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755383Ab3CLMJg (ORCPT ); Tue, 12 Mar 2013 08:09:36 -0400 Received: from mail-bk0-f51.google.com ([209.85.214.51]:44478 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752285Ab3CLMJf (ORCPT ); Tue, 12 Mar 2013 08:09:35 -0400 Date: Tue, 12 Mar 2013 13:09:30 +0100 From: Ingo Molnar To: Masami Hiramatsu Cc: Ingo Molnar , linux-kernel@vger.kernel.org, Timo Juhani Lindfors , Ananth N Mavinakayanahalli , Pavel Emelyanov , Jiri Kosina , Nadia Yvette Chambers , yrl.pp-manager.tt@hitachi.com, "David S. Miller" , Andrew Morton , Linus Torvalds Subject: Re: [PATCH -tip ] [BUGFIX] kprobes: Move hash_64() into .text.kprobe section Message-ID: <20130312120930.GA20711@gmail.com> References: <20130311142233.19885.10567.stgit@mhiramat-M0-7522> <20130312082112.GB30665@gmail.com> <513F0C74.4030101@hitachi.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <513F0C74.4030101@hitachi.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 803 Lines: 22 * Masami Hiramatsu wrote: > > The only complication is that __kprobes is now present in 600+ places, > > which will create merge conflicts. If you remind me during the next > > merge window I can generate the rename on the spot and send it to > > Linus without anyone having to carry the patch for too long. > > Let me confirm that I just move __kprobes definition into compiler.h > this time, and ping you when the next merge window opens, is that > correct? Yeah, two stages - that would be cool. Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/