diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-01 13:22:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-01 13:22:00 -0700 |
| commit | a44f867247d58b378dba0059c915a65ca8f93ba5 (patch) | |
| tree | e1aaa82aa23a17f5a9eb5ccc87dd546acfc584bc /drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |
| parent | aad7fb916a10f1065ad23de0c80a4a04bcba8437 (diff) | |
| parent | 15b23ef5d348ea51c5e7573e2ef4116fbc7cb099 (diff) | |
Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfix from Bruce Fields:
"This fixes a data corruption bug introduced by the v3.16 xdr encoding
rewrite. I haven't managed to reproduce it myself yet, but it's
apparently not hard to hit given the right workload"
* 'for-3.17' of git://linux-nfs.org/~bfields/linux:
nfsd4: fix corruption of NFSv4 read data
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_main.c')
0 files changed, 0 insertions, 0 deletions