The branch main has been updated by emaste:

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

commit e93db9abc9a62d662c40d783663d64cdb829a0cc
Author:     Ed Maste <[email protected]>
AuthorDate: 2025-10-24 19:36:42 +0000
Commit:     Ed Maste <[email protected]>
CommitDate: 2025-10-26 00:38:38 +0000

    cam: Bump deprecated sysctl removal to 16
    
    The descriptions for these unmapped_io and rotating sysctls indicated
    that they're deprecated and being removed for FreeBSD 15.0.  That did
    not happen, so update to FreeBSD 16 instead.
    
    Sponsored by:   The FreeBSD Foundation
---
 sys/cam/ata/ata_da.c   | 4 ++--
 sys/cam/scsi/scsi_da.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index 0d844a6fbf9e..08747cd59131 100644
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -1557,11 +1557,11 @@ adasysctlinit(void *context, int pending)
        SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
            OID_AUTO, "unmapped_io", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE,
            &softc->flags, (u_int)ADA_FLAG_UNMAPPEDIO, adabitsysctl, "I",
-           "Use unmapped I/O. This sysctl is *DEPRECATED*, gone in FreeBSD 
15");
+           "Use unmapped I/O. This sysctl is *DEPRECATED*, gone in FreeBSD 
16");
        SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
            OID_AUTO, "rotating", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE,
            &softc->flags, (u_int)ADA_FLAG_ROTATING, adabitsysctl, "I",
-           "Rotating media. This sysctl is *DEPRECATED*, gone in FreeBSD 15");
+           "Rotating media. This sysctl is *DEPRECATED*, gone in FreeBSD 16");
 
 #ifdef CAM_TEST_FAILURE
        /*
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index fc8c0413448d..c0c0be12856b 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -2408,11 +2408,11 @@ dasysctlinit(void *context, int pending)
        SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
            OID_AUTO, "rotating", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE,
            &softc->flags, (u_int)DA_FLAG_ROTATING, dabitsysctl, "I",
-           "Rotating media *DEPRECATED* gone in FreeBSD 15");
+           "Rotating media *DEPRECATED* gone in FreeBSD 16");
        SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
            OID_AUTO, "unmapped_io", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE,
            &softc->flags, (u_int)DA_FLAG_UNMAPPEDIO, dabitsysctl, "I",
-           "Unmapped I/O support *DEPRECATED* gone in FreeBSD 15");
+           "Unmapped I/O support *DEPRECATED* gone in FreeBSD 16");
 
 #ifdef CAM_TEST_FAILURE
        SYSCTL_ADD_PROC(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),

Reply via email to