diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-10 03:10:48 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-10 03:10:48 +0100 |
commit | dc9319f5a3e1f67d2a2fbf190e30f6d03f569fed (patch) | |
tree | 4352a861a639e7d1738fbe30223ea2fbdb6bf26f /lib | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff) | |
parent | rpc: fix xdr_truncate_encode to handle buffer ending on page boundary (diff) | |
download | linux-dc9319f5a3e1f67d2a2fbf190e30f6d03f569fed.tar.xz linux-dc9319f5a3e1f67d2a2fbf190e30f6d03f569fed.zip |
Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux
Pull two nfsd bugfixes from Bruce Fields.
* 'for-3.19' of git://linux-nfs.org/~bfields/linux:
rpc: fix xdr_truncate_encode to handle buffer ending on page boundary
nfsd: fix fi_delegees leak when fi_had_conflict returns true
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions