diff options
author | 2016-07-01 15:18:49 -0700 | |
---|---|---|
committer | 2016-07-01 15:18:49 -0700 | |
commit | 2728c57fda2c10cb290f1516cab5b170ea2e3f22 (patch) | |
tree | 7bdfc18c062501d5fe3b56d35e2660028af4cc5e /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'mfd-fixes-4.7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd (diff) | |
parent | locks: use file_inode() (diff) | |
download | wireguard-linux-2728c57fda2c10cb290f1516cab5b170ea2e3f22.tar.xz wireguard-linux-2728c57fda2c10cb290f1516cab5b170ea2e3f22.zip |
Merge tag 'nfsd-4.7-3' of git://linux-nfs.org/~bfields/linux
Pull lockd/locks fixes from Bruce Fields:
"One fix for lockd soft lookups in an error path, and one fix for file
leases on overlayfs"
* tag 'nfsd-4.7-3' of git://linux-nfs.org/~bfields/linux:
locks: use file_inode()
lockd: unregister notifier blocks if the service fails to come up completely
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions