• Linus Torvalds's avatar
    Merge branch 'stable-4.6' of git://git.infradead.org/users/pcmoore/audit · 51b3eae8
    Linus Torvalds authored
    Pull audit updates from Paul Moore:
     "A small set of patches for audit this time; just three in total and
      one is a spelling fix.
    
      The two patches with actual content are designed to help prevent new
      instances of auditd from displacing an existing, functioning auditd
      and to generate a log of the attempt.  Not to worry, dead/stuck auditd
      instances can still be replaced by a new instance without problem.
    
      Nothing controversial, and everything passes our regression suite"
    
    * 'stable-4.6' of git://git.infradead.org/users/pcmoore/audit:
      audit: Fix typo in comment
      audit: log failed attempts to change audit_pid configuration
      audit: stop an old auditd being starved out by a new auditd
    51b3eae8
audit_watch.c 14.4 KB