| commit | dc9319f5a3e1f67d2a2fbf190e30f6d03f569fed | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 09 18:10:48 2015 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 09 18:10:48 2015 -0800 |
| tree | 4352a861a639e7d1738fbe30223ea2fbdb6bf26f | |
| parent | 20ebb345282d9d90603b021ced113b73e9cdb6a1 [diff] | |
| parent | 49a068f82a1d30eb585d7804b05948376be6cf9a [diff] |
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