git: 8b012980b8cc - main - Revert "oce(4): deprecate"

The branch main has been updated by emaste:

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

commit 8b012980b8cc5f8619cd552ee6df7b98b97c5d62
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-01-27 16:54:20 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-01-27 17:06:21 +0000

    Revert "oce(4): deprecate"
    
    These are reportedly still in fairly wide use.
    
    We strongly encourage folks with this hardware to post a dmesg on
    dmesgd.nycbug.org.
    
    This reverts commit 4591322980a37d6ee38a3ed70569366e16ca71f6.
    
    Discussed with: brooks
    Sponsored by:   The FreeBSD Foundation
---
 share/man/man4/oce.4 | 8 +-------
 sys/dev/oce/oce_if.c | 2 --
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/share/man/man4/oce.4 b/share/man/man4/oce.4
index 47b09cdd7136..a8cd9ae80734 100644
--- a/share/man/man4/oce.4
+++ b/share/man/man4/oce.4
@@ -34,7 +34,7 @@
 .\" 3333 Susan Street
 .\" Costa Mesa, CA 92626
 .\"
-.Dd June 13, 2023
+.Dd January 27, 2025
 .Dt OCE 4
 .Os
 .Sh NAME
@@ -55,12 +55,6 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_oce_load="YES"
 .Ed
-.Sh DEPRECATION NOTICE
-The
-.Nm
-driver may not be present in
-.Fx 15.0
-and later.
 .Sh DESCRIPTION
 Emulex OneConnect adapters come in various skews and with
 different combinations of NIC, FCoE and iSCSI functions.
diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
index 14dd5cf34a7a..1906933fa75a 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -370,8 +370,6 @@ oce_attach(device_t dev)
 	}
 	softc_tail = sc;
 
-	gone_in_dev(dev, 15, "relatively uncommon 10GbE NIC");
-
 	return 0;
 
 stats_free: