| commit | 82845079160817cc6ac64e5321bbd935e0a47b3a | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Tue Feb 06 21:12:31 2018 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Tue Feb 06 21:12:31 2018 +0100 |
| tree | 0886d1d52428e9db14536cae4b37db896e7c360a | |
| parent | 32e839dda3ba576943365f0f5817ce5c843137dc [diff] | |
| parent | 68c5735eaa5e680e701c9a2d1e3c7880bdf5ab66 [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>