[GIT PULL tip/x86/memblock] updated x86/memblock branch

[Tejun Heo]

Hello, Ingo, hpa,

For some reason (probably the korg issue played a role), x86/memblock
got dropped from tip and missed the merge window and I didn't notice
it either until benh poke me about testing pending patches (thanks a
lot).  I resurrected the branch and there are some conflicts as
expected but nothing major.

I pulled in the current linux/master 401d0069cb "Merge branch
'fbdev-for-linus' of git://github.com/schandinat/linux-2.6" into
x86/memblock and resolve all the conflicts.  List of conflicts and
resolutions follow (also included in the commit message).

    * arch/x86/xen/setup.c

	dc91c728fd "xen: allow extra memory to be in multiple regions"
	24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..."
    
        conflicted on xen_add_extra_mem() updates.  The resolution is
        trivial as the latter just want to replace
        memblock_x86_reserve_range() with memblock_reserve().

    * drivers/pci/intel-iommu.c

        166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/"
        5dfe8660a3d "bootmem: Replace work_with_active_regions() with..."

        conflicted as the former moved the file under drivers/iommu/.
        Resolved by applying the chnages from the latter on the moved
        file.

    * mm/Kconfig

        6661672053a "memblock: add NO_BOOTMEM config symbol"
        c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option"

        conflicted trivially.  Both added config options.  Just
        letting both add their own options resolves the conflict.

    * mm/memblock.c

        d1f0ece6cdc "mm/memblock.c: small function definition fixes"
        ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()"

        confliected.  The former updates function removed by the
        latter.  Resolution is trivial.

Please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git x86-memblock

to receive the merged branch.  I'll soon post the pending patches on
top of the merged branch.

Thank you.

-- 
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/