projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 49def18 ce1ca7d)
Merge tag 'nfsd-4.10-1' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Jan 2017 17:34:37 +0000 (09:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Jan 2017 17:34:37 +0000 (09:34 -0800)
commit2eabb8b8d68bc9c7779ba8b04bec8d4f8baed0bc
tree4d8ea8e6ca52f1938269937834641205d8d888f0tree | snapshot
parent49def1853334396f948dcb4cedb9347abb318df5commit | diff
parentce1ca7d2d140a1f4aaffd297ac487f246963dd2fcommit | diff
Merge tag 'nfsd-4.10-1' of git://linux-nfs.org/~bfields/linux

Pull nfsd fixes from Bruce Fields:
 "Miscellaneous nfsd bugfixes, one for a 4.10 regression, three for
  older bugs"

* tag 'nfsd-4.10-1' of git://linux-nfs.org/~bfields/linux:
  svcrdma: avoid duplicate dma unmapping during error recovery
  sunrpc: don't call sleeping functions from the notifier block callbacks
  svcrpc: don't leak contexts on PROC_DESTROY
  nfsd: fix supported attributes for acl & labels
John Crispins staging tree