Note the MFC of ATA support for new chipsets and tagged queueing,

ATA raid support (+MFC), snc(4) driver added (+MFC), ich(4) driver
added (+MFC), IFS, libisc now added, fix to netstat(1) "in use"
percentage (+MFC).

3 files changed, 45 insertions, 8 deletions

diff --git a/release/texts/HARDWARE.TXT b/release/texts/HARDWARE.TXT
index 1e597bf..bba224d 100644
--- a/release/texts/HARDWARE.TXT
+++ b/release/texts/HARDWARE.TXT
@@ -744,6 +744,10 @@ Xircom CreditCard adapters(16bit) and workalikes
     Xircom CreditCard 10Base-T "CreditCard Ethernet Adaptor IIps" (PS-CE2-10)
     Xircom CreditCard Ethernet 10/100 + modem (Ethernet part)
 
+National Semiconductor DP8393X (SONIC) Ethernet cards
+    NEC PC-9801-83, -84, -103, and -104
+    NEC PC-9801N-25 and -J02R
+
 
 4.3.    USB
 ----    ---
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 4e3b16b..b5ffd0a 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -89,12 +89,15 @@ accept_filters, a kernel feature to reduce overheads when accepting
 and reading new connections on listening sockets, has been added.
 [MERGED]
 
-The ata(4) driver now has support for ATA100 controllers. [MERGED]
-In addition, it now supports the ServerWorks ROSB4 ATA33 chipset,
-the CMD 648 ATA66 and CMD 649 ATA100 chipsets, and the Cyrix 5530.
+The ata(4) driver now has support for ATA100 controllers.  In
+addition, it now supports the ServerWorks ROSB4 ATA33 chipset, the CMD
+648 ATA66 and CMD 649 ATA100 chipsets, and the Cyrix 5530. [MERGED]
 
 The ata(4) driver now has support for tagged queueing, which is
-enabled by the ATA_ENABLE_TAGS option.
+enabled by the ATA_ENABLE_TAGS option. [MERGED]
+
+The ata(4) driver now has support for ATA "pseudo" RAID controllers as
+the Promise Fasttrak and HighPoint HPT370 controllers. [MERGED]
 
 AlphaServer 1200 ("Tincup") has been tested and works OK. Currently it does
 not want to boot from CD or floppy but a transplanted disk that was
@@ -162,6 +165,9 @@ when unloading and reloading, and syncs with some NetBSD changes.
 
 Extremely large swap areas (>67 GB) no longer panic the system.
 
+The Inode Filesystem (IFS) has been added; more information can be
+found in /usr/src/sys/ufs/ifs/README.
+
 
 1.2. SECURITY FIXES
 -------------------
@@ -356,6 +362,11 @@ gperf has been updated to 2.7.2.
 style.perl.7, a style guide for Perl code in the FreeBSD base system,
 has been added.
 
+The ISC library from the BIND distribution is now built as libisc.
+
+The "in use" percentage metric displayed by netstat(1) now really
+reflects the percentage of network mbufs used. [MERGED]
+
 
 2. Supported Configurations
 ---------------------------
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index 5409d58..cbb1499 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -101,12 +101,15 @@ accept_filters, a kernel feature to reduce overheads when accepting
 and reading new connections on listening sockets, has been added.
 [MERGED]
 
-The ata(4) driver now has support for ATA100 controllers. [MERGED]
-In addition, it now supports the ServerWorks ROSB4 ATA33 chipset,
-the CMD 648 ATA66 and CMD 649 ATA100 chipsets, and the Cyrix 5530.
+The ata(4) driver now has support for ATA100 controllers.  In
+addition, it now supports the ServerWorks ROSB4 ATA33 chipset, the CMD
+648 ATA66 and CMD 649 ATA100 chipsets, and the Cyrix 5530. [MERGED]
 
 The ata(4) driver now has support for tagged queueing, which is
-enabled by the ATA_ENABLE_TAGS option.
+enabled by the ATA_ENABLE_TAGS option. [MERGED]
+
+The ata(4) driver now has support for ATA "pseudo" RAID controllers as
+the Promise Fasttrak and HighPoint HPT370 controllers. [MERGED]
 
 The ti(4) driver now supports the Alteon AceNIC 1000baseT Gigabit
 Ethernet and Netgear GA620T 1000baseT Gigabit cards. [MERGED]
@@ -195,6 +198,16 @@ when unloading and reloading, and syncs with some NetBSD changes.
 
 Extremely large swap areas (>67 GB) no longer panic the system.
 
+The snc(4) driver for the National Semiconductor DP8393X (SONIC)
+Ethernet controller.  Curently, this driver is only used on the PC-98
+architecture. [MERGED]
+
+The ich(4) driver for the Intel 82801AA (ICH) SMBus controller and
+compatibles has been added. [MERGED]
+
+The Inode Filesystem (IFS) has been added; more information can be
+found in /usr/src/sys/ufs/ifs/README.
+
 
 1.2. SECURITY FIXES
 -------------------
@@ -408,6 +421,11 @@ gperf has been updated to 2.7.2.
 style.perl.7, a style guide for Perl code in the FreeBSD base system,
 has been added.
 
+The ISC library from the BIND distribution is now built as libisc.
+
+The "in use" percentage metric displayed by netstat(1) now really
+reflects the percentage of network mbufs used. [MERGED]
+
 
 2. Supported Configurations
 ---------------------------
@@ -800,6 +818,10 @@ Xircom CreditCard adapters(16bit) and workalikes
     Xircom CreditCard 10Base-T "CreditCard Ethernet Adaptor IIps" (PS-CE2-10)
     Xircom CreditCard Ethernet 10/100 + modem (Ethernet part)
 
+National Semiconductor DP8393X (SONIC) Ethernet cards
+    NEC PC-9801-83, -84, -103, and -104
+    NEC PC-9801N-25 and -J02R
+
 
 2.3. FDDI
 ---------