]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 72d51cb de27792)
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)
commitba349359d45c4d449a1f6b08212dd733125c026d
tree0886d1d52428e9db14536cae4b37db896e7c360atree | snapshot
parent72d51cbe756aa42ddfb54818ae27b08e283ef01acommit | diff
parentde277924b71160313d06c321c1f6d92f506eb232commit | diff
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 diff1 | diff2 | blob | history
arch/arm64/Kconfig diff1 | diff2 | blob | history
arch/arm64/kernel/entry.S diff1 | diff2 | blob | history
arch/powerpc/Kconfig diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/entry/entry_64.S diff1 | diff2 | blob | history
arch/x86/mm/tlb.c diff1 | diff2 | blob | history
include/linux/sched/mm.h diff1 | diff2 | blob | history
kernel/fork.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.