]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a87faa2 850bed8)
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)
commit9f4cec74b5f948e14dd93cf954ff4979f46a0dc0
treefa3df11bfa937a8e5c456b445ccff085e70e78edtree | snapshot
parenta87faa246157118ceca14b90ad11b39ba4b9d8a9commit | diff
parent850bed8dcebf1d25d960b92643e670676053dbcacommit | 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
Linux Kernel Source Tree.