projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b9cd18d 69bbd9c)
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jul 2014 01:33:22 +0000 (18:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jul 2014 01:33:22 +0000 (18:33 -0700)
commit0fba687f9b7ebf5fb028fb8b0a4733b891986bd3
tree127de5692e6de6dc25894deeaecaea099636dd53tree | snapshot
parentb9cd18de4db3c9ffa7e17b0dc0ca99ed5aa4d43acommit | diff
parent69bbd9c7b99974f3a701d4de6ef7010c37182a47commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.