From: Linus Torvalds Date: Tue, 22 Mar 2011 17:41:36 +0000 (-0700) Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=73d5a8675f32b8e22e11773b314324316f920192;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: xen: update mask_rw_pte after kernel page tables init changes xen: set max_pfn_mapped to the last pfn mapped x86: Cleanup highmap after brk is concluded Fix up trivial onflict (added header file includes) in arch/x86/mm/init_64.c --- 73d5a8675f32b8e22e11773b314324316f920192 diff --cc arch/x86/mm/init_64.c index 0aa34669ed3f,7026505a33ba..2362b646178e --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@@ -51,7 -51,7 +51,8 @@@ #include #include #include +#include + #include static int __init parse_direct_gbpages_off(char *arg) {