diff options
| author | Linus Torvalds <[email protected]> | 2014-05-25 17:08:48 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-05-25 17:08:48 +0000 |
| commit | 80a1de29a5a67abac02cb10c32545eb231e0e778 (patch) | |
| tree | e66ae4c98b1c4b09df1bed1c91661d8017c3f9e5 /tools/perf/scripts/python/check-perf-trace.py | |
| parent | Merge tag 'dmaengine-fixes-3.15-rc5' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | nfsd4: warn on finding lockowner without stateid's (diff) | |
| download | kernel-80a1de29a5a67abac02cb10c32545eb231e0e778.tar.gz kernel-80a1de29a5a67abac02cb10c32545eb231e0e778.zip | |
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
Pull two nfsd bugfixes from Bruce Fields:
"Just two bugfixes, one for a merge-window-introduced ACL regression,
the other for a longer-standing v4 state bug"
* 'for-3.15' of git://linux-nfs.org/~bfields/linux:
nfsd4: warn on finding lockowner without stateid's
nfsd4: remove lockowner when removing lock stateid
nfsd4: fix corruption on setting an ACL.
Diffstat (limited to 'tools/perf/scripts/python/check-perf-trace.py')
0 files changed, 0 insertions, 0 deletions