Re: Pull request: merge-x86-12-16

[Ingo Molnar]

* Mike Travis <travis@xxxxxxx> wrote:

> Hi Ingo,
> 
> Would you pull the following?
> 
> Thanks!
> Mike
> --- 
> The following changes since commit b77f911294aa099e53af754b9277b34783f629b4:
>   Rusty Russell (1):
>         x86: Introduce topology_core_cpumask()/topology_thread_cpumask()
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo.git merge-x86-12-16
> 
> Mike Travis (2):
>       x86: fix cpu_mask_to_apicid_and to include cpu_online_mask
>       x86: use possible_cpus=NUM to extend the possible cpus allowed
> 
>  Documentation/cpu-hotplug.txt                 |   17 +++++-----
>  arch/x86/include/asm/bigsmp/apic.h            |    4 ++-
>  arch/x86/include/asm/es7000/apic.h            |   40 +++++++++++-------------
>  arch/x86/include/asm/mach-default/mach_apic.h |    3 +-
>  arch/x86/include/asm/summit/apic.h            |   30 ++++++++++--------
>  arch/x86/kernel/apic.c                        |   16 ++++++----
>  arch/x86/kernel/genapic_flat_64.c             |    4 ++-
>  arch/x86/kernel/genx2apic_cluster.c           |    4 ++-
>  arch/x86/kernel/genx2apic_phys.c              |    4 ++-
>  arch/x86/kernel/genx2apic_uv_x.c              |    4 ++-
>  arch/x86/kernel/smpboot.c                     |   25 +++++++++++++--
>  11 files changed, 92 insertions(+), 59 deletions(-)

pulled, thanks Travis!

Note, your patches from yesterday worked fine in -tip testing. There was 
one trivial build issue that needed to be addressed, see it below. (your 
change crossed with another change from the sparseirq tree - that is what 
caused this complication)

	Ingo

----------------->