Conflicts: kernel/Makefile There are conflicts in kernel/Makefile due to file moving in the scheduler tree - resolve them. Signed-off-by: Ingo Molnar <mingo@kernel.org> |
||
---|---|---|
.. | ||
events | ||
define_trace.h | ||
ftrace.h | ||
syscall.h |
Conflicts: kernel/Makefile There are conflicts in kernel/Makefile due to file moving in the scheduler tree - resolve them. Signed-off-by: Ingo Molnar <mingo@kernel.org> |
||
---|---|---|
.. | ||
events | ||
define_trace.h | ||
ftrace.h | ||
syscall.h |