Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 May 2016 01:46:55 +0000 (18:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 May 2016 01:46:55 +0000 (18:46 -0700)
commit03e1aa1cbb65d8fb214d82a98933362d1c115a4f
tree764b58ab9fb9f597f3f5d097edbd7dc522229380
parent97f00905ec98472050d65c46629237b299f29035
parent188e3c5cd2b672620291e64a21f1598fe91e40b6
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
include/linux/audit.h
include/linux/tty.h
kernel/audit.c
kernel/auditsc.c