diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-19 17:52:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-19 17:52:49 -0700 |
| commit | 51b3eae8dbe5e6fa9657b21388ad6642d6934952 (patch) | |
| tree | abf011b095e0fe66ca9730c53e1054ae973ecdfe /fs/autofs4/root.c | |
| parent | Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm (diff) | |
| parent | audit: Fix typo in comment (diff) | |
| download | linux-dev-51b3eae8dbe5e6fa9657b21388ad6642d6934952.tar.xz linux-dev-51b3eae8dbe5e6fa9657b21388ad6642d6934952.zip | |
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
Diffstat (limited to 'fs/autofs4/root.c')
0 files changed, 0 insertions, 0 deletions