linux-kernel - 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 for Android: free password hash cracker in your pocket

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

Date:	Wed, 21 Mar 2012 16:31:51 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Robert Richter <robert.richter@....com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Lin Ming <ming.m.lin@...el.com>, Jiri Olsa <jolsa@...hat.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Arnaldo Carvalho de Melo <acme@...hat.com>
Subject: linux-next: manual merge of the oprofile tree with the tip tree

Hi Robert,

Today's linux-next merge of the oprofile tree got a conflict in
tools/perf/util/parse-events.c between commit 89812fc81f8d ("perf tools:
Add parser generator for events parsing") from the tip tree and commit
1e48600d2388 ("perf tool: Parse general/raw events from sysfs") from the
oprofile tree.

I have no idea how to fix this up, so I effectively dropped this patch
from the oprofile tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped