]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit58c0addd9d19d87df9fcb14eb960ab841468e391
treefa3df11bfa937a8e5c456b445ccff085e70e78ed
parent914dc687977677ff9e5888d29822527a1b348cfc
parent97d46ab2df2a309498c0792656c9dfd0e95b990f
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