projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ed40875 be29d20)
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)
commit6989606a7224a2d5a925df22a49e4f7a0bfed0d6
tree2fb686a4dea9a7f4beec97fde510f2840c8e06f9tree | snapshot
parented40875dd4b4c7b5c991db9e06c984180ab0b3cecommit | diff
parentbe29d20f3f5db1f0b4e49a4f6eeedf840e2bf9b1commit | diff
Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit

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()
include/linux/fsnotify_backend.h diff1 | diff2 | blob | history
kernel/audit_tree.c diff1 | diff2 | blob | history
John Crispins staging tree