summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-05 15:26:43 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-05 15:26:43 -0800
commit3460b01b12aaf0011cb30f6f502edd05752f70eb (patch)
tree4be9163f2d9e21f96875f25f550952671ff425bc /Makefile
parent6de29ccb50f2caef07cdd888efc8cb933497b6a4 (diff)
parent233a68667cf4c134d07ef7e22bdd77786b5c7360 (diff)
downloadlinux-sh-3460b01b12aaf0011cb30f6f502edd05752f70eb.tar.gz
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 'Makefile')
0 files changed, 0 insertions, 0 deletions