diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-04 13:36:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-04 13:36:19 -0700 |
| commit | c35bcfd8e4e11bdff2ffab823a13a59968426b15 (patch) | |
| tree | fa3df11bfa937a8e5c456b445ccff085e70e78ed /fs/bad_inode.c | |
| parent | ce866e2d182b9e00e29e7a2eed4db908257d7f79 (diff) | |
| parent | d67fd44f697dff293d7cdc29af929241b669affe (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
Diffstat (limited to 'fs/bad_inode.c')
0 files changed, 0 insertions, 0 deletions