diff options
author | 2016-10-04 13:36:19 -0700 | |
---|---|---|
committer | 2016-10-04 13:36:19 -0700 | |
commit | c35bcfd8e4e11bdff2ffab823a13a59968426b15 (patch) | |
tree | fa3df11bfa937a8e5c456b445ccff085e70e78ed /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma (diff) | |
parent | locks: Filter /proc/locks output on proc pid ns (diff) | |
download | wireguard-linux-c35bcfd8e4e11bdff2ffab823a13a59968426b15.tar.xz wireguard-linux-c35bcfd8e4e11bdff2ffab823a13a59968426b15.zip |
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 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions