linux-kernel - Re: linux-next: manual merge of the oprofile tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20120313083134.GB1888@elte.hu>
Date:	Tue, 13 Mar 2012 09:31:34 +0100
From:	Ingo Molnar <mingo@...e.hu>
To:	Robert Richter <robert.richter@....com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Stephane Eranian <eranian@...gle.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: linux-next: manual merge of the oprofile tree with the tip tree


* Stephen Rothwell <sfr@...b.auug.org.au> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/