diff options

author	Linus Torvalds <torvalds@linux-foundation.org>	2016-12-20 15:24:32 -0800
committer	Linus Torvalds <torvalds@linux-foundation.org>	2016-12-20 15:24:32 -0800
commit	3eb86259eca6a363ed7bb13ecea5cda809f7b97d (patch)
tree	39ad92d0c5496d4eab67741e6d5b61f3b9b0a370 /net/nfc/Makefile
parent	f95adbc1f7cef521d1d6b9146691d5971a660614 (diff)
parent	50f4d9bda9f8510db1392b4e832fca95c56295a1 (diff)

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

Diffstat (limited to 'net/nfc/Makefile')


context:
space:
mode: