Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git
# Conflicts: # MAINTAINERS
Showing
- Documentation/scheduler/index.rst 1 addition, 0 deletionsDocumentation/scheduler/index.rst
- Documentation/scheduler/sched-ext.rst 316 additions, 0 deletionsDocumentation/scheduler/sched-ext.rst
- MAINTAINERS 13 additions, 0 deletionsMAINTAINERS
- drivers/tty/sysrq.c 1 addition, 0 deletionsdrivers/tty/sysrq.c
- include/asm-generic/vmlinux.lds.h 1 addition, 0 deletionsinclude/asm-generic/vmlinux.lds.h
- include/linux/cgroup.h 2 additions, 2 deletionsinclude/linux/cgroup.h
- include/linux/sched.h 5 additions, 0 deletionsinclude/linux/sched.h
- include/linux/sched/ext.h 206 additions, 0 deletionsinclude/linux/sched/ext.h
- include/linux/sched/task.h 2 additions, 1 deletioninclude/linux/sched/task.h
- include/trace/events/sched_ext.h 32 additions, 0 deletionsinclude/trace/events/sched_ext.h
- include/uapi/linux/sched.h 1 addition, 0 deletionsinclude/uapi/linux/sched.h
- init/init_task.c 12 additions, 0 deletionsinit/init_task.c
- kernel/Kconfig.preempt 25 additions, 1 deletionkernel/Kconfig.preempt
- kernel/fork.c 12 additions, 5 deletionskernel/fork.c
- kernel/sched/build_policy.c 11 additions, 0 deletionskernel/sched/build_policy.c
- kernel/sched/core.c 157 additions, 35 deletionskernel/sched/core.c
- kernel/sched/cpufreq_schedutil.c 29 additions, 21 deletionskernel/sched/cpufreq_schedutil.c
- kernel/sched/debug.c 3 additions, 0 deletionskernel/sched/debug.c
- kernel/sched/ext.c 6537 additions, 0 deletionskernel/sched/ext.c
- kernel/sched/ext.h 69 additions, 0 deletionskernel/sched/ext.h
Loading
Please register or sign in to comment