diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-03 18:33:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-03 18:33:22 -0700 |
commit | 0fba687f9b7ebf5fb028fb8b0a4733b891986bd3 (patch) | |
tree | 127de5692e6de6dc25894deeaecaea099636dd53 /Makefile | |
parent | b9cd18de4db3c9ffa7e17b0dc0ca99ed5aa4d43a (diff) | |
parent | 69bbd9c7b99974f3a701d4de6ef7010c37182a47 (diff) | |
download | op-kernel-dev-0fba687f9b7ebf5fb028fb8b0a4733b891986bd3.zip op-kernel-dev-0fba687f9b7ebf5fb028fb8b0a4733b891986bd3.tar.gz |
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields:
"By coincidence, two NFSv4 symlink bugs, one introduced in the 3.16 xdr
encoding rewrite, the other a decoding bug that I think we've had
since the start but that just doesn't trigger very often"
* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
nfs: fix nfs4d readlink truncated packet
nfsd: fix rare symlink decoding bug
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions