]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2017 07:06:06 +0000 (23:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2017 07:06:06 +0000 (23:06 -0800)
Pull audit fixes from Paul Moore:
 "Two small fixes relating to audit's use of fsnotify.

  The first patch plugs a leak and the second fixes some lock
  shenanigans. The patches are small and I banged on this for an
  afternoon with our testsuite and didn't see anything odd"

* 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit:
  audit: Fix sleep in atomic
  fsnotify: Remove fsnotify_duplicate_mark()

1  2 
include/linux/fsnotify_backend.h
kernel/audit_tree.c

Simple merge
Simple merge