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
| ||
|
Date: Thu, 30 Jul 2009 08:23:09 +0200 From: Borislav Petkov <petkovbb@...glemail.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Borislav Petkov <borislav.petkov@....com>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Rusty Russell <rusty@...tcorp.com.au>, Andreas Herrmann <andreas.herrmann3@....com> Subject: Re: linux-next: manual merge of the edac-amd tree with the rr tree On Thu, Jul 30, 2009 at 03:41:50PM +1000, Stephen Rothwell wrote: > 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. Hi Stephen, thanks for fixing that. Yep, the topology patches in the edac tree are not final yet, I've added them to the mix only because edac depends on the node_id functionality. I'll fix them up later against the rr stuff. -- Regards/Gruss, Boris. -- 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/
Powered by blists - more mailing lists