From mboxrd@z Thu Jan  1 00:00:00 1970
From: Josh Triplett <josh@joshtriplett.org>
Subject: Re: [PATCH v2 4/7] trace: Make UPROBES depend on PERF_EVENTS
Date: Mon, 10 Mar 2014 08:03:09 -0700
Message-ID: <20140310150308.GA9316@leaf>
References: <cover.1394418994.git.josh@joshtriplett.org>
	<32f5e0a3b421b615be3af24b0319afff1a385403.1394418994.git.josh@joshtriplett.org>
	<20140310142129.GA21735@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Cc: kvm@vger.kernel.org, Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	David Herrmann <dh.herrmann@gmail.com>,
	Stephane Eranian <eranian@google.com>,
	Paul Gortmaker <paul.gortmaker@windriver.com>,
	Paul Mackerras <paulus@samba.org>, "H. Peter Anvin" <hpa@zytor.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Andi Kleen <ak@linux.intel.com>, x86@kernel.org,
	Ingo Molnar <mingo@redhat.com>, oprofile-list@lists.sf.net,
	Mel Gorman <mgorman@suse.de>,
	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
	Borislav Petkov <bp@suse.de>, Dave Young <dyoung@redhat.com>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>, Gleb Natapov <gleb@kernel.org>,
	Steven Rostedt <rostedt@goodmis.org>, Bin Gao <bin.gao@intel.com>,
	Matt Fleming <matt.fleming@intel.com>,
	Jacob Shin <jacob.shin@amd.com>, linux-kernel@vger.kernel.org,
	Torsten Kaiser <just.for.lkml@goog
To: Oleg Nesterov <oleg@redhat.com>
Return-path: <oprofile-list-bounces@lists.sourceforge.net>
Content-Disposition: inline
In-Reply-To: <20140310142129.GA21735@redhat.com>
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/oprofile-list>,
	<mailto:oprofile-list-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=oprofile-list>
List-Post: <mailto:oprofile-list@lists.sourceforge.net>
List-Help: <mailto:oprofile-list-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/oprofile-list>,
	<mailto:oprofile-list-request@lists.sourceforge.net?subject=subscribe>
Errors-To: oprofile-list-bounces@lists.sourceforge.net
List-Id: kvm.vger.kernel.org

On Mon, Mar 10, 2014 at 03:21:29PM +0100, Oleg Nesterov wrote:
> On 03/09, Josh Triplett wrote:
> > diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
> > index 015f85a..8639819 100644
> > --- a/kernel/trace/Kconfig
> > +++ b/kernel/trace/Kconfig
> > @@ -424,6 +424,7 @@ config UPROBE_EVENT
> >  	bool "Enable uprobes-based dynamic events"
> >  	depends on ARCH_SUPPORTS_UPROBES
> >  	depends on MMU
> > +	depends on PERF_EVENTS
> 
> Can't we delay this change? This conflicts with
> 
> 	[PATCH v7 01/15] uprobes: Kconfig dependency fix
> 	http://marc.info/?l=linux-kernel&m=139422332915701

That doesn't conflict; they both make exactly the same change, and they
should trivially merge.

- Josh Triplett

------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech