From: Ingo Molnar Date: Tue, 11 Apr 2017 06:56:05 +0000 (+0200) Subject: Merge branch 'x86/boot' into x86/mm, to avoid conflict X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e5185a76a23b2d56fb2327ad8bd58fb1bcaa52b1;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'x86/boot' into x86/mm, to avoid conflict There's a conflict between ongoing level-5 paging support and the E820 rewrite. Since the E820 rewrite is essentially ready, merge it into x86/mm to reduce tree conflicts. Signed-off-by: Ingo Molnar --- e5185a76a23b2d56fb2327ad8bd58fb1bcaa52b1