The branch main has been updated by oshogbo:
URL:
https://cgit.FreeBSD.org/src/commit/?id=96d8f35f2a2bf13e0ecf203e3ce514a3c05e3691
commit 96d8f35f2a2bf13e0ecf203e3ce514a3c05e3691
Author: Mariusz Zaborski <osho...@freebsd.org>
AuthorDate: 2024-07-08 10:43:38 +0000
Commit: Mariusz Zaborski <osho...@freebsd.org>
CommitDate: 2024-07-08 10:43:38 +0000
bde: remove lingering references
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D45874
---
share/man/man4/geom.4 | 3 +--
sys/conf/NOTES | 1 -
sys/conf/options | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4
index c0f3bb23499d..18ecf7e5f852 100644
--- a/share/man/man4/geom.4
+++ b/share/man/man4/geom.4
@@ -32,14 +32,13 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd October 6, 2023
+.Dd July 8, 2024
.Dt GEOM 4
.Os
.Sh NAME
.Nm GEOM
.Nd "modular disk I/O request transformation framework"
.Sh SYNOPSIS
-.Cd options GEOM_BDE
.Cd options GEOM_CACHE
.Cd options GEOM_CONCAT
.Cd options GEOM_ELI
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index bcaac1c85899..ecfa7aa5b33a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -154,7 +154,6 @@ options BOOT_TAG=\"\"
# size for both BOOT_TAG and the assocated tunable.
options BOOT_TAG_SZ=32
-options GEOM_BDE # Disk encryption.
options GEOM_CACHE # Disk cache.
options GEOM_CONCAT # Disk concatenation.
options GEOM_ELI # Disk encryption.
diff --git a/sys/conf/options b/sys/conf/options
index 52fafffabd99..f50d009987bc 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -112,7 +112,6 @@ FULL_PREEMPTION opt_sched.h
GZIO opt_gzio.h
IMGACT_BINMISC opt_dontuse.h
IPI_PREEMPTION opt_sched.h
-GEOM_BDE opt_geom.h
GEOM_CACHE opt_geom.h
GEOM_CONCAT opt_geom.h
GEOM_ELI opt_geom.h
