diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-27 12:04:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-27 12:04:52 -0800 |
| commit | 3f03bf93947fa2a2b84fac56e93c65d4fffed7f1 (patch) | |
| tree | 57c8b97e28aa835a97a46edee817e7c07ec2a63f /net/ipv4/tcp_input.c | |
| parent | fb2a624d5fe8b9206d14bff52da7a368a3a8374c (diff) | |
| parent | b49d564344f773d8afee982153c8493e5f2eaf38 (diff) | |
| download | blackbird-obmc-linux-3f03bf93947fa2a2b84fac56e93c65d4fffed7f1.tar.gz blackbird-obmc-linux-3f03bf93947fa2a2b84fac56e93c65d4fffed7f1.zip | |
Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull general security subsystem updates from James Morris:
"The main changes here are Paul Gortmaker's removal of unneccesary
module.h infrastructure"
* 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
security: integrity: partial revert of make ima_main explicitly non-modular
security: fs: make inode explicitly non-modular
security: audit and remove any unnecessary uses of module.h
security: integrity: make evm_main explicitly non-modular
keys: remove needless modular infrastructure from ecryptfs_format
security: integrity: make ima_main explicitly non-modular
tomoyo: fix small typo
Diffstat (limited to 'net/ipv4/tcp_input.c')
0 files changed, 0 insertions, 0 deletions
