From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758561Ab2CMIbw (ORCPT ); Tue, 13 Mar 2012 04:31:52 -0400 Received: from mx2.mail.elte.hu ([157.181.151.9]:45306 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752803Ab2CMIbu (ORCPT ); Tue, 13 Mar 2012 04:31:50 -0400 Date: Tue, 13 Mar 2012 09:31:34 +0100 From: Ingo Molnar To: Robert Richter Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Stephane Eranian , Thomas Gleixner , "H. Peter Anvin" , Peter Zijlstra , Stephen Rothwell Subject: Re: linux-next: manual merge of the oprofile tree with the tip tree Message-ID: <20120313083134.GB1888@elte.hu> References: <20120313173712.52ecb636a1e3d4330fe8baff@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120313173712.52ecb636a1e3d4330fe8baff@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-ELTE-SpamScore: -2.0 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=AWL,BAYES_00 autolearn=no SpamAssassin version=3.3.1 -2.0 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 AWL AWL: From: address is in the auto white-list Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Stephen Rothwell wrote: > Hi Robert, > > Today's linux-next merge of the oprofile tree got a conflict > in tools/perf/util/header.c tools/perf/util/header.h between > commit 330aa675b4f9 ("perf record: Add HEADER_BRANCH_STACK > tag") from the tip tree and commit c415f577eb32 ("perf tools: > Add pmu mappings to header information") from the oprofile > tree. Robert, Hm, that commit should obviously be processed via the regular perf channels, not via the oprofile tree ... Please resolve this. Thanks, Ingo