git: 6c7ddf2c1437 - stable/13 - cam/ata: Postpone removal of two compat sysctls until 15

The branch stable/13 has been updated by zlei:

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

commit 6c7ddf2c14374511bf0b092ac0ed3d977f0f6a74
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2023-11-02 05:14:40 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2023-11-02 05:22:05 +0000

    cam/ata: Postpone removal of two compat sysctls until 15
    
    Prefer UNMAPPEDIO and ROTATING from flags sysctl. See
     1. aeab0812e68c (Add flags sysctl to ada)
     2. cf3ff63e55e4 (Convert unmappedio over to a flag)
     3. 96eb32bf0f5a (Convert rotating to a flag bit)
    
    Reviewed by:    imp, ken, #cam
    MFC after:      immediately (we want this in 14.0)
    Differential Revision:  https://reviews.freebsd.org/D42402
    
    (cherry picked from commit d24729b2fd66a87c2b925b0c30e46bb0a9d6446a)
    (cherry picked from commit fb288d493989d9df4c4f9c8eb3d7e28af61f8302)
---
 sys/cam/ata/ata_da.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index 6afd1f273178..359ece18960e 100644
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -1533,11 +1533,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",
-	    "Unmapped I/O support *DEPRECATED* gone in FreeBSD 14");
+	    "Use unmapped I/O. This sysctl is *DEPRECATED*, gone in FreeBSD 15");
 	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 *DEPRECATED* gone in FreeBSD 14");
+	    "Rotating media. This sysctl is *DEPRECATED*, gone in FreeBSD 15");
 
 #ifdef CAM_TEST_FAILURE
 	/*