tree a67dd47040e6c73b9863cf3484cfd8c976901da4
parent 5a7a662cc6938cac34456aa7871929b40bc964fe
parent 799b601451b21ebe7af0e6e8f6e2ccd4683c5064
author Linus Torvalds <torvalds@linux-foundation.org> 1415900199 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1415900199 -0800

Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/audit

Pull audit fixes from Paul Moore:
 "After he sent the initial audit pull request for 3.18, Eric asked me
  to take over the management of the audit tree, hence this pull request
  to fix a couple of problems with audit.

  As you can see below, the changes are minimal: adding some whitespace
  to a string so userspace parses it correctly, and fixing a problem
  with audit's usage of fsnotify that was causing audit watch rules to
  be lost.  Neither of these patches were very controversial on the
  mailing lists and they fix real problems, getting them into 3.18 would
  be a good thing"

* 'stable-3.18' of git://git.infradead.org/users/pcmoore/audit:
  audit: keep inode pinned
  audit: AUDIT_FEATURE_CHANGE message format missing delimiting space