commit | 7fe654dca20892f37226c31bdd2d5b932f8d843a | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 10 14:23:45 2017 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 10 14:23:45 2017 -0800 |
tree | 0a7d3c1e4eff0a0194fc265efae10ad1cbd2e0c5 | |
parent | 3ebc7033168d43d12e4941f48a6f257d3f1ea1b5 [diff] | |
parent | 0839ffb83e44e5ff1843e932592525fc2bff23ff [diff] |
Merge tag 'nfsd-4.10-3' of git://linux-nfs.org/~bfields/linux Pull nfsd revert from Bruce Fields: "This patch turned out to have a couple problems. The problems are fixable, but at least one of the fixes is a little ugly. The original bug has always been there, so we can wait another week or two to get this right" * tag 'nfsd-4.10-3' of git://linux-nfs.org/~bfields/linux: nfsd: Revert "nfsd: special case truncates some more"