Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus
Showing
- Documentation/ABI/testing/sysfs-kernel-livepatch 8 additions, 0 deletionsDocumentation/ABI/testing/sysfs-kernel-livepatch
- Documentation/filesystems/proc.txt 18 additions, 0 deletionsDocumentation/filesystems/proc.txt
- Documentation/livepatch/livepatch.txt 172 additions, 42 deletionsDocumentation/livepatch/livepatch.txt
- arch/Kconfig 6 additions, 0 deletionsarch/Kconfig
- arch/powerpc/include/asm/thread_info.h 3 additions, 1 deletionarch/powerpc/include/asm/thread_info.h
- arch/powerpc/kernel/signal.c 4 additions, 0 deletionsarch/powerpc/kernel/signal.c
- arch/s390/include/asm/thread_info.h 16 additions, 8 deletionsarch/s390/include/asm/thread_info.h
- arch/s390/kernel/entry.S 30 additions, 1 deletionarch/s390/kernel/entry.S
- arch/x86/Kconfig 1 addition, 0 deletionsarch/x86/Kconfig
- arch/x86/entry/common.c 6 additions, 3 deletionsarch/x86/entry/common.c
- arch/x86/include/asm/thread_info.h 7 additions, 6 deletionsarch/x86/include/asm/thread_info.h
- arch/x86/include/asm/unwind.h 6 additions, 0 deletionsarch/x86/include/asm/unwind.h
- arch/x86/kernel/stacktrace.c 95 additions, 1 deletionarch/x86/kernel/stacktrace.c
- arch/x86/kernel/unwind_frame.c 2 additions, 0 deletionsarch/x86/kernel/unwind_frame.c
- fs/proc/base.c 15 additions, 0 deletionsfs/proc/base.c
- include/linux/init_task.h 9 additions, 0 deletionsinclude/linux/init_task.h
- include/linux/livepatch.h 56 additions, 12 deletionsinclude/linux/livepatch.h
- include/linux/sched.h 3 additions, 0 deletionsinclude/linux/sched.h
- include/linux/stacktrace.h 6 additions, 3 deletionsinclude/linux/stacktrace.h
- kernel/fork.c 3 additions, 0 deletionskernel/fork.c
Loading
Please register or sign in to comment