linux-kernel - Re: linux-next: manual merge of the oprofile tree with Linus' 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-prev] [day] [month] [year] [list]

Message-ID: <1267436041.1579.12.camel@laptop>
Date:	Mon, 01 Mar 2010 10:34:01 +0100
From:	Peter Zijlstra <peterz@...radead.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Robert Richter <robert.richter@....com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the oprofile tree with Linus' tree

On Mon, 2010-03-01 at 18:20 +1100, Stephen Rothwell wrote:
> Hi Robert,
> 
> Today's linux-next merge of the oprofile tree got a conflict in
> arch/x86/kernel/cpu/perf_event.c between commit
> 8c48e444191de0ff84e85d41180d7bc3e74f14ef ("perf_events, x86: Implement
> intel core solo/duo support") from Linus' tree and commit
> 27d4a358bf5ef730aacf50696b9b5dfc5e2a87a5 ("perf, x86: rename macro in
> ARCH_PERFMON_EVENTSEL_ENABLE") from the oprofile tree.
> 
> I fixed it up (by using the version from Linus' tree and substituting
> ARCH_PERFMON_EVENTSEL_ENABLE for ARCH_PERFMON_EVENTSEL0_ENABLE) and can
> carry the fix for a while.  I also did the same substitution in
> arch/x86/kernel/cpu/perf_event_p6.c .

The oprofile tree should _not_ carry perf patches.

--
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/