The branch stable/14 has been updated by des:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=2495f56913fb90d48f7f1bf3d2617f260c977844

commit 2495f56913fb90d48f7f1bf3d2617f260c977844
Author:     Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2024-07-30 19:04:16 +0000
Commit:     Dag-Erling Smørgrav <d...@freebsd.org>
CommitDate: 2024-08-01 16:15:58 +0000

    filemon: Document how to build into the kernel.
    
    MFC after:      3 days
    Reviewed by:    olce, imp
    Differential Revision:  https://reviews.freebsd.org/D46184
    
    (cherry picked from commit 057453ffdf57bdfcbadb5d1834d425812e01ff43)
    
    filemon: Not an option.
    
    MFC after:      3 days
    
    (cherry picked from commit b4e4512d4669267fb220b7c1a2844c506673a3ce)
---
 share/man/man4/filemon.4 | 4 +++-
 sys/conf/NOTES           | 3 +++
 sys/conf/options         | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/share/man/man4/filemon.4 b/share/man/man4/filemon.4
index 2561e1e89bf5..b6755494e432 100644
--- a/share/man/man4/filemon.4
+++ b/share/man/man4/filemon.4
@@ -29,13 +29,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 1, 2023
+.Dd July 30, 2024
 .Dt FILEMON 4
 .Os
 .Sh NAME
 .Nm filemon
 .Nd the filemon device
 .Sh SYNOPSIS
+.Cd device filemon
+.Pp
 .In dev/filemon/filemon.h
 .Sh DESCRIPTION
 The
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 2011f8edcc74..20465d9aaf32 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2859,3 +2859,6 @@ device            xz              # xz_embedded LZMA 
de-compression library
 
 # Kernel support for stats(3).
 options        STATS
+
+# File system monitoring
+device         filemon         # file monitoring for make(1) meta-mode
diff --git a/sys/conf/options b/sys/conf/options
index 37f09dc7ff3b..1d156ca41a49 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -105,7 +105,6 @@ CY_PCI_FASTINTR
 DEADLKRES      opt_watchdog.h
 EXPERIMENTAL   opt_global.h
 DIRECTIO
-FILEMON                opt_dontuse.h
 FFCLOCK
 FULL_PREEMPTION        opt_sched.h
 GZIO           opt_gzio.h

Reply via email to