diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 18:46:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 18:46:55 -0700 |
commit | 03e1aa1cbb65d8fb214d82a98933362d1c115a4f (patch) | |
tree | 764b58ab9fb9f597f3f5d097edbd7dc522229380 /net/atm/common.c | |
parent | 97f00905ec98472050d65c46629237b299f29035 (diff) | |
parent | 188e3c5cd2b672620291e64a21f1598fe91e40b6 (diff) | |
download | op-kernel-dev-03e1aa1cbb65d8fb214d82a98933362d1c115a4f.zip op-kernel-dev-03e1aa1cbb65d8fb214d82a98933362d1c115a4f.tar.gz |
Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit
Pull audit updates from Paul Moore:
"Four small audit patches for 4.7.
Two are simple cleanups around the audit thread management code, one
adds a tty field to AUDIT_LOGIN events, and the final patch makes
tty_name() usable regardless of CONFIG_TTY.
Nothing controversial, and it all passes our regression test"
* 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit:
tty: provide tty_name() even without CONFIG_TTY
audit: add tty field to LOGIN event
audit: we don't need to __set_current_state(TASK_RUNNING)
audit: cleanup prune_tree_thread
Diffstat (limited to 'net/atm/common.c')
0 files changed, 0 insertions, 0 deletions