]> 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)
commit23e1694a53af7f851ae678fab2598f48ce4557ea
tree949c1acf27b106184d8842586740fbbcc9c9ea62
parent21abb780c01a169f7f61d25ac65f6439570d6181
parente05fd6bfc428a5168ab1176dd8a88eb8301fc2a1
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