projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68845a5 9affa43)
Merge tag 'nfsd-5.8-2' of git://linux-nfs.org/~bfields/linux into master
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jul 2020 23:27:54 +0000 (16:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jul 2020 23:27:54 +0000 (16:27 -0700)
Pull nfsd fix from Bruce Fields:
 "Just one fix for a NULL dereference if someone happens to read
  /proc/fs/nfsd/client/../state at the wrong moment"

* tag 'nfsd-5.8-2' of git://linux-nfs.org/~bfields/linux:
  nfsd4: fix NULL dereference in nfsd/clients display code


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git