tree 6b15cd0593332fbbc8d6e4f4b0bf2b91156880f5
parent e22619a29fcdb513b7bc020e84225bb3b5914259
parent 0b08c5e59441d08ab4b5e72afefd5cd98a4d83df
author Linus Torvalds <torvalds@linux-foundation.org> 1435438396 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1435438396 -0700

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

Pull audit updates from Paul Moore:
 "Four small audit patches for v4.2, all bug fixes.  Only 10 lines of
  change this time so very unremarkable, the patch subject lines pretty
  much tell the whole story"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: Fix check of return value of strnlen_user()
  audit: obsolete audit_context check is removed in audit_filter_rules()
  audit: fix for typo in comment to function audit_log_link_denied()
  lsm: rename duplicate labels in LSM_AUDIT_DATA_TASK audit message type