Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit

Browse source

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

...

This commit is contained in:

Linus Torvalds 2016-05-18 18:46:55 -07:00

parent 97f00905ec 188e3c5cd2

commit 03e1aa1cbb

5 changed files with 48 additions and 30 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

24

include/linux/audit.h

View file

4

include/linux/tty.h

View file