Date: Sat, 1 May 2021 13:46:08 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 23a3c3d97d72 - stable/12 - Fix mismerge in 00f85e3f264d665b30f0ce2a. Message-ID: <202105011346.141Dk8mu093934@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=23a3c3d97d72e9d3daa76ff263148bd6a68eb65e commit 23a3c3d97d72e9d3daa76ff263148bd6a68eb65e Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2021-05-01 13:42:27 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2021-05-01 13:42:27 +0000 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 --- sys/fs/nfsclient/nfs_clvfsops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 754f370a04de..1a1e1b122994 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -151,6 +151,7 @@ MODULE_VERSION(nfs, 1); MODULE_DEPEND(nfs, nfscommon, 1, 1, 1); MODULE_DEPEND(nfs, krpc, 1, 1, 1); MODULE_DEPEND(nfs, nfssvc, 1, 1, 1); +MODULE_DEPEND(nfs, nfslock, 1, 1, 1); MODULE_DEPEND(nfs, xdr, 1, 1, 1); /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105011346.141Dk8mu093934>