From nobody Thu Aug  1 16:16:56 2024
X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WZYy06Nvkz5T0Yq;
	Thu, 01 Aug 2024 16:16:56 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4WZYy0375mz4gbt;
	Thu,  1 Aug 2024 16:16:56 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1722529016;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=O1gS7VD8toQ2nXJey5pLT0os98h09z3BY54yhITRmVQ=;
	b=tQVVrz4BngPh3NgGTLP6qsxaSMKAtw1Y9R3Om8HkmDkmO2af5xPR2+YxdbvIkcgv8wtg4C
	k0MJoQVGCQLHC8NSxIJYS7pxbEn3g9tYPdzit+8Z7aMZwmQjOvoWXj0jxMOs0//7Px5rCC
	SOpN+aU4YQqdksBVNzJFZW0dIIvPo3PD+OkWcJbUjgLmjmT8ErW+u8jJOzx/CCp/QbuWKn
	SYkcEIwvuPJOqDa5CWpBKWnvcXlKXmug47OS4BIWUOFSJMFqsYk4EEEEsl3B1n3YHbaKEX
	NCV5yhpPbBlfyBkU2PYoC+mq/hxlK+ro88qRUKFXgod+RyM1VuSZIUS+47Piug==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722529016; a=rsa-sha256; cv=none;
	b=y4wHj+zyXvmgZXWoxo0DnivYsUbfqbWJ7VCnMeqKdKizG6f7w99GXfj6eFCv9ZOo9r/dyk
	vXMgltq9Nak5re9alNVS/If7tJZq5FbESDvW09n8ikfjYIJDGQDl5XXUo5yj5VTaCG4fcY
	qD1MNonPmab1UxHtTNxoSQ9MtldEhiMlZkveKWkDex5Lo6dr1i5IR3/310Rb2AkkSjGrLg
	nYVp2RuRZ5cK2GZTgWLdv0zhZLuJhVGIgQXCJtZcizzKeLFq82fdC1V2ylQLTN0fVFcg6x
	8ITqnDCdHxReFK7CIeHvNe72ImtjwKBWyU/H/fcEPdBBdIOxP8RQqYxqYtlTwQ==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1722529016;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=O1gS7VD8toQ2nXJey5pLT0os98h09z3BY54yhITRmVQ=;
	b=NR9n9H660t0MeMruHpG7dYwtGY9J5ki13gYxBYjXDlpPSR2WSiGl/GNGINHKXChKeSeHVV
	tKBXNa7AZ6TNndkozs/WDv86JGCN3U0hYseQZg4SBbzru5dMC0uYBN7jTY3Mh2YimH1GyC
	E8Q70nxxw6xskEps8WJe5zr9PzxWBL+kZP14/Y5JYX32SiUMSPV6YRJgHoiJWGQoOU9oaj
	/eTW0hd0c5EpRKbPs//ldsRnxvEy37qRiZSJS97z5/llko32xnWniZ7hDqzpFIKHSs7b32
	4v+cDudSXxdWMCsr80gWx+anqGXfQ/IjzISDQmiax6/xOAP0hkhRt9c2AAgqlQ==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WZYy02dZ3zrs4;
	Thu,  1 Aug 2024 16:16:56 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471GGu9A095983;
	Thu, 1 Aug 2024 16:16:56 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471GGuhE095980;
	Thu, 1 Aug 2024 16:16:56 GMT
	(envelope-from git)
Date: Thu, 1 Aug 2024 16:16:56 GMT
Message-Id: <202408011616.471GGuhE095980@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-branches@FreeBSD.org
From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= <des@FreeBSD.org>
Subject: git: 2495f56913fb - stable/14 - filemon: Document how to
  build into the kernel.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-branches@freebsd.org
Sender: owner-dev-commits-src-branches@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: des
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/14
X-Git-Reftype: branch
X-Git-Commit: 2495f56913fb90d48f7f1bf3d2617f260c977844
Auto-Submitted: auto-generated

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 <des@FreeBSD.org>
AuthorDate: 2024-07-30 19:04:16 +0000
Commit:     Dag-Erling Smørgrav <des@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