• Tejun Heo's avatar
    Merge branch 'master' into x86/memblock · d4bbf7e7
    Tejun Heo authored
    Conflicts & resolutions:
    * arch/x86/xen/setup.c
    	dc91c728 "xen: allow extra memory to be in multiple regions"
    	24aa0788 "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
    	166e9278 "x86/ia64: intel-iommu: move to drivers/iommu/"
    	5dfe8660 "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
    * mm/Kconfig
    	66616720 "memblock: add NO_BOOTMEM config symbol"
    	c378ddd5 "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
    	d1f0ece6 "mm/memblock.c: small function definition fixes"
    	ed7b56a7 "memblock: Remove memblock_memory_can_coalesce()"
    	confliected.  The former updates function removed by the
    	latter.  Resolution is trivial.
    Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Kconfig 12.4 KB