linux-kernel - linux-next: manual merge of the edac-amd tree with the rr 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-next>] [day] [month] [year] [list]

Message-Id: <20090730154150.d4c326b5.sfr@canb.auug.org.au>
Date:	Thu, 30 Jul 2009 15:41:50 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Borislav Petkov <borislav.petkov@....com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rusty Russell <rusty@...tcorp.com.au>,
	Andreas Herrmann <andreas.herrmann3@....com>
Subject: linux-next: manual merge of the edac-amd tree with the rr tree

Hi Borislav,

Today's linux-next merge of the edac-amd tree got a conflict in
include/linux/topology.h between commit
11c0109a8c24b27fd6eff8c2c0ddca598675212d
("cpumask:remove-topology_core_siblings-and-topology_thread_siblings-core")
from the rr tree and commit 86aebc88b40884510c914ad71e81c8536a15052e
("topology: introduce cpu_node information for multi-node processors")
from the edac-amd tree.

The latter adds topology_cpu_node_siblings() which is not needed (the
former makes it clear that the _cpumask versions of these should be used
instead).  I fixed it up and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped