Merge branch 'akpm' (patches from Andrew)
Merge final set of updates from Andrew Morton: - a series to make IMA play better across kexec - a handful of random fixes * emailed patches from Andrew Morton <akpm@linux-foundation.org>: printk: fix typo in CONSOLE_LOGLEVEL_DEFAULT help text ratelimit: fix WARN_ON_RATELIMIT return value kcov: make kcov work properly with KASLR enabled arm64: setup: introduce kaslr_offset() mm: fadvise: avoid expensive remote LRU cache draining after FADV_DONTNEED ima: platform-independent hash value ima: define a canonical binary_runtime_measurements list format ima: support restoring multiple template formats ima: store the builtin/custom template definitions in a list ima: on soft reboot, save the measurement list powerpc: ima: send the kexec buffer to the next kernel ima: maintain memory size needed for serializing the measurement list ima: permit duplicate measurement list entries ima: on soft reboot, restore the measurement list powerpc: ima: get the kexec buffer passed by the previous kernel
No related branches found
No related tags found
Showing
- Documentation/admin-guide/kernel-parameters.txt 4 additions, 0 deletionsDocumentation/admin-guide/kernel-parameters.txt
- arch/Kconfig 3 additions, 0 deletionsarch/Kconfig
- arch/arm64/include/asm/memory.h 5 additions, 0 deletionsarch/arm64/include/asm/memory.h
- arch/arm64/kernel/setup.c 4 additions, 4 deletionsarch/arm64/kernel/setup.c
- arch/powerpc/Kconfig 1 addition, 0 deletionsarch/powerpc/Kconfig
- arch/powerpc/include/asm/ima.h 29 additions, 0 deletionsarch/powerpc/include/asm/ima.h
- arch/powerpc/include/asm/kexec.h 13 additions, 2 deletionsarch/powerpc/include/asm/kexec.h
- arch/powerpc/kernel/Makefile 4 additions, 0 deletionsarch/powerpc/kernel/Makefile
- arch/powerpc/kernel/ima_kexec.c 223 additions, 0 deletionsarch/powerpc/kernel/ima_kexec.c
- arch/powerpc/kernel/kexec_elf_64.c 1 addition, 1 deletionarch/powerpc/kernel/kexec_elf_64.c
- arch/powerpc/kernel/machine_kexec_file_64.c 12 additions, 3 deletionsarch/powerpc/kernel/machine_kexec_file_64.c
- include/linux/ima.h 12 additions, 0 deletionsinclude/linux/ima.h
- include/linux/ratelimit.h 5 additions, 2 deletionsinclude/linux/ratelimit.h
- kernel/kcov.c 7 additions, 1 deletionkernel/kcov.c
- kernel/kexec_file.c 4 additions, 0 deletionskernel/kexec_file.c
- lib/Kconfig.debug 1 addition, 1 deletionlib/Kconfig.debug
- mm/fadvise.c 14 additions, 1 deletionmm/fadvise.c
- security/integrity/ima/Kconfig 12 additions, 0 deletionssecurity/integrity/ima/Kconfig
- security/integrity/ima/Makefile 1 addition, 0 deletionssecurity/integrity/ima/Makefile
- security/integrity/ima/ima.h 31 additions, 0 deletionssecurity/integrity/ima/ima.h
Loading
Please register or sign in to comment