]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into sched/urgent, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 6 Feb 2018 20:12:31 +0000 (21:12 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 6 Feb 2018 20:12:31 +0000 (21:12 +0100)
commit258ccccf2be3b80b70b106f8994952947a6e993e
tree0886d1d52428e9db14536cae4b37db896e7c360a
parentb1982c75df1b20e7ec794a49c43e8d76100cb24d
parentfd45bf9cdb34de39ff1641138627ad8252f5de7e
Merge branch 'linus' into sched/urgent, to resolve conflicts

 Conflicts:
arch/arm64/kernel/entry.S
arch/x86/Kconfig
include/linux/sched/mm.h
kernel/fork.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
MAINTAINERS
arch/arm64/Kconfig
arch/arm64/kernel/entry.S
arch/powerpc/Kconfig
arch/x86/Kconfig
arch/x86/entry/entry_64.S
arch/x86/mm/tlb.c
include/linux/sched/mm.h
kernel/fork.c