diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2015-03-21 10:41:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2015-03-21 10:41:15 -0700 |
| commit | 0d122f7430ed4c4298e33e0d70dc4065679720a2 (patch) | |
| tree | 3ca52bed36b724e2b66cbf4775dd4ea1cce75dd3 /fs/btrfs | |
| parent | Merge tag 'upstream-4.0-rc5' of git://git.infradead.org/linux-ubifs (diff) | |
| parent | Subject: nfsd: don't recursively call nfsd4_cb_layout_fail (diff) | |
| download | linux-0d122f7430ed4c4298e33e0d70dc4065679720a2.tar.gz linux-0d122f7430ed4c4298e33e0d70dc4065679720a2.tar.bz2 linux-0d122f7430ed4c4298e33e0d70dc4065679720a2.zip | |
Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux
Pull nfsd bufix from Bruce Fields:
"This is a fix for a crash easily triggered by 4.1 activity to a server
built with CONFIG_NFSD_PNFS.
There are some more bugfixes queued up that I intend to pass along
next week, but this is the most critical"
* 'for-4.0' of git://linux-nfs.org/~bfields/linux:
Subject: nfsd: don't recursively call nfsd4_cb_layout_fail
Diffstat (limited to 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions