From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Mar 2016 00:52:49 +0000 (-0700)
Subject: Merge branch 'stable-4.6' of git://git.infradead.org/users/pcmoore/audit
X-Git-Tag: v4.14-rc1~3604
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51b3eae8dbe5e6fa9657b21388ad6642d6934952;p=platform%2Fkernel%2Flinux-rpi.git

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

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
---

51b3eae8dbe5e6fa9657b21388ad6642d6934952