projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ce866e2 d67fd44)
Merge tag 'locks-v4.9-1' of git://git.samba.org/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2016 20:36:19 +0000 (13:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2016 20:36:19 +0000 (13:36 -0700)
commitc35bcfd8e4e11bdff2ffab823a13a59968426b15
treefa3df11bfa937a8e5c456b445ccff085e70e78edtree | snapshot
parentce866e2d182b9e00e29e7a2eed4db908257d7f79commit | diff
parentd67fd44f697dff293d7cdc29af929241b669affecommit | diff
Merge tag 'locks-v4.9-1' of git://git.samba.org/jlayton/linux

Pull file locking updates from Jeff Layton:
 "Only a single patch from Nikolay this cycle, with a small change to
  better handle /proc/locks in a containerized host"

* tag 'locks-v4.9-1' of git://git.samba.org/jlayton/linux:
  locks: Filter /proc/locks output on proc pid ns
fs/locks.c diff1 | diff2 | blob | history
John Crispins staging tree