git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 32e839d 68c5735)
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)
commit82845079160817cc6ac64e5321bbd935e0a47b3a
tree0886d1d52428e9db14536cae4b37db896e7c360atree
parent32e839dda3ba576943365f0f5817ce5c843137dccommit | diff
parent68c5735eaa5e680e701c9a2d1e3c7880bdf5ab66commit | 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
Unnamed repository; edit this file 'description' to name the repository.