linux-kernel - linux-next: manual merge of the rr 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20091217130758.edfe0da6.sfr@canb.auug.org.au>
Date:	Thu, 17 Dec 2009 13:07:58 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paul Mackerras <paulus@...ba.org>
Subject: linux-next: manual merge of the rr tree with Linus' tree

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
kernel/perf_event.c between commit
0f624e7e5625f4c30c836b7a5decfe2553582391 ("perf_event: Fix incorrect
range check on cpu number") from Linus' tree and commit
40b7c6b7eefc950d625945f773b4c57dcc95b8a4
("cpumask:kernel_perf_event-deprecated-function") from the rr tree.

Overlapping changes.  I used the version from Linus' tree (since it was a
bug fix).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped