]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v4.16-rc7' into x86/mm, to fix up conflict
authorIngo Molnar <mingo@kernel.org>
Tue, 27 Mar 2018 06:43:39 +0000 (08:43 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 27 Mar 2018 06:43:39 +0000 (08:43 +0200)
commitdad8ccac279dc036c9d1b3789f798dd17134c73e
tree949c1acf27b106184d8842586740fbbcc9c9ea62
parentede897cc894f4b9f2f28873f662dfa19cf3e4cf3
parent102167605056ada9d6f77cb9d0ba7c87e3da60ab
Merge tag 'v4.16-rc7' into x86/mm, to fix up conflict

 Conflicts:
arch/x86/mm/init_64.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/boot/compressed/misc.c
arch/x86/entry/entry_64.S
arch/x86/kernel/cpu/intel.c
arch/x86/mm/init_64.c
arch/x86/platform/efi/efi_64.c