From mboxrd@z Thu Jan 1 00:00:00 1970 From: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Subject: Re: linux-next: manual merge of the tracing tree with the parisc tree Date: Wed, 1 Apr 2009 08:54:35 +0200 Message-ID: <20090401065435.GA9208@pengutronix.de> References: <20090401113740.7f425e02.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:44073 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757442AbZDAGzI (ORCPT ); Wed, 1 Apr 2009 02:55:08 -0400 Content-Disposition: inline In-Reply-To: <20090401113740.7f425e02.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , linux-next@vger.kernel.org, Helge Deller , Kyle McMartin , linux-parisc@vger.kernel.org, Steven Rostedt Hi Steven, On Wed, Apr 01, 2009 at 11:37:40AM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the tracing tree got a conflict in > arch/parisc/include/asm/ftrace.h between commit > d75f054a2cf0614ff63d534ff21ca8eaab41e713 ("parisc: add ftrace (functi= on > and graph tracer) functionality") from the parisc tree and commit > c79a61f55773d2519fd0525bf58385f7d20752d3 ("tracing: make CALLER_ADDRx > overwriteable") from the tracing tree. Whatever you have done---I didn't check---as long as arch/parisc/include/asm/ftrace.h exists, it's OK for c79a61f55773d2519fd0525bf58385f7d20752d3. Best regards and thanks Uwe --=20 Pengutronix e.K. | Uwe Kleine-K=F6nig = | Industrial Linux Solutions | http://www.pengutronix.= de/ |