diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-06 00:26:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-06 00:26:43 +0100 |
| commit | 3460b01b12aaf0011cb30f6f502edd05752f70eb (patch) | |
| tree | 4be9163f2d9e21f96875f25f550952671ff425bc /security/keys/user_defined.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi... (diff) | |
| parent | audit: make audit_log_common_recv_msg() a void function (diff) | |
| download | linux-3460b01b12aaf0011cb30f6f502edd05752f70eb.tar.xz linux-3460b01b12aaf0011cb30f6f502edd05752f70eb.zip | |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
Pull audit updates from Paul Moore:
"Seven audit patches for 4.4, but really only one of any significant
value, the remainder are trivial cleanups that are described well
enough in the patch descriptions.
The one significant patch is an attempt to make communication between
the kernel's audit subsystem and the userspace audit daemon a bit more
robust by retrying on certain transient error conditions. All in all,
it's a pretty small set of patches this time around with just fixes
and cleanups"
* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
audit: make audit_log_common_recv_msg() a void function
audit: removing unused variable
audit: fix comment block whitespace
audit: audit_tree_match can be boolean
audit: audit_string_contains_control can be boolean
audit: audit_dummy_context can be boolean
audit: try harder to send to auditd upon netlink failure
Diffstat (limited to 'security/keys/user_defined.c')
0 files changed, 0 insertions, 0 deletions