K 10
svn:author
V 7
git2svn
K 8
svn:date
V 27
2021-05-01T13:47:42.221568Z
K 7
svn:log
V 270
Fix mismerge in 00f85e3f264d665b30f0ce2a.

nfslock is still needed on stable/12.
This is the direct commit to the stable/12 branch.

Noted by:	rmacklem
Sponsored by:	The FreeBSD Foundation

Git Hash:   23a3c3d97d72e9d3daa76ff263148bd6a68eb65e
Git Author: kib@FreeBSD.org
END