projects / profile / common / platform / kernel / linux-artik7.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c6ef814 133d558)
Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Mar 2015 17:41:15 +0000 (10:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Mar 2015 17:41:15 +0000 (10:41 -0700)
commit0d122f7430ed4c4298e33e0d70dc4065679720a2
tree3ca52bed36b724e2b66cbf4775dd4ea1cce75dd3tree | snapshot
parentc6ef814509fedb4ab4b5dc5bdca309d4e7181597commit | diff
parent133d558216d9db3617a9fdeebd1bce9afff5f973commit | diff
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
Domain: System / Kernel;