From: Linus Torvalds Date: Mon, 18 Jan 2016 02:48:49 +0000 (-0800) Subject: Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2d663b55816e5c1d211a77fff90687053fe78aac;p=linux.git Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit Pull audit updates from Paul Moore: "Seven audit patches for 4.5, all very minor despite the diffstat. The diffstat churn for linux/audit.h can be attributed to needing to reshuffle the linux/audit.h header to fix the seccomp auditing issue (see the commit description for details). Besides the seccomp/audit fix, most of the fixes are around trying to improve the connection with the audit daemon and a Kconfig simplification. Nothing crazy, and everything passes our little audit-testsuite" * 'upstream' of git://git.infradead.org/users/pcmoore/audit: audit: always enable syscall auditing when supported and audit is enabled audit: force seccomp event logging to honor the audit_enabled flag audit: Delete unnecessary checks before two function calls audit: wake up threads if queue switched from limited to unlimited audit: include auditd's threads in audit_log_start() wait exception audit: remove audit_backlog_wait_overflow audit: don't needlessly reset valid wait time --- 2d663b55816e5c1d211a77fff90687053fe78aac