From: Linus Torvalds Date: Thu, 19 May 2016 01:46:55 +0000 (-0700) Subject: Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit X-Git-Tag: v5.15~13603 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03e1aa1cbb65d8fb214d82a98933362d1c115a4f;p=platform%2Fkernel%2Flinux-starfive.git 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 --- 03e1aa1cbb65d8fb214d82a98933362d1c115a4f