Merge branch 'linus' into sched/core, to resolve conflict

Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/sparc/include/asm/topology_64.h
index 9a928fcb7a9b4b09203f3657eee9b4d0c99e7353,d1761df5cca6fe2814c19a343274d2884a3cf0c4..01d17046225a8aa084b2a8f9d70a235bcab681f8
--- 1/arch/sparc/include/asm/topology_64.h
--- 2/arch/sparc/include/asm/topology_64.h
+++ b/arch/sparc/include/asm/topology_64.h
@@@ -40,8 -40,8 +40,8 @@@ static inline int pcibus_to_node(struc
  #ifdef CONFIG_SMP
  #define topology_physical_package_id(cpu)     (cpu_data(cpu).proc_id)
  #define topology_core_id(cpu)                 (cpu_data(cpu).core_id)
- #define topology_core_cpumask(cpu)            (&cpu_core_map[cpu])
+ #define topology_core_cpumask(cpu)            (&cpu_core_sib_map[cpu])
 -#define topology_thread_cpumask(cpu)          (&per_cpu(cpu_sibling_map, cpu))
 +#define topology_sibling_cpumask(cpu)         (&per_cpu(cpu_sibling_map, cpu))
  #endif /* CONFIG_SMP */
  
  extern cpumask_t cpu_core_map[NR_CPUS];

diff --cc arch/sparc/mm/init_64.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge