OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b9cd18d
69bbd9c
)
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 4 Jul 2014 01:33:22 +0000
(18:33 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 4 Jul 2014 01:33:22 +0000
(18:33 -0700)
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
Trivial merge