From 73fb5e8d65592f14f3632afc7f1df13a45c890f3 Mon Sep 17 00:00:00 2001 From: kardel Date: Wed, 7 Jun 2006 22:43:43 +0000 Subject: [PATCH] document timecounters branch simonb-timecounters terminated --- doc/BRANCHES | 8 +++++--- doc/CHANGES | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/BRANCHES b/doc/BRANCHES index 34082bd6747d..6c3a9457bddd 100644 --- a/doc/BRANCHES +++ b/doc/BRANCHES @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.81 2006/05/24 11:03:28 yamt Exp $ +# $NetBSD: BRANCHES,v 1.82 2006/06/07 22:43:43 kardel Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -353,12 +353,14 @@ Branch: simonb-timecounters Description: Port FreeBSD timecounters to NetBSD Status: Active Start Date: Sat Feb 04 2006 -End Date: +End Date: Wed Jun 07 2006 Base Tag: simonb-timecounters-base Maintainer: Simon Burge , Frank Kardel Scope: sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp -Notes: +Notes: early (partial conversion) commit to -current + ok'ed by core@ on 20060605 for testing and further + simplified conversion Branch: thorpej-devvp Description: replace dev_t with struct vnode * in devsw entry points diff --git a/doc/CHANGES b/doc/CHANGES index dd89d16a0df3..53c0439700a5 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.629 $> +LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.630 $> [Note: This file does not mention every change made to the NetBSD source tree. @@ -297,4 +297,8 @@ Changes from NetBSD 3.0 to NetBSD 4.0: (AR531x devices), and 32-bit SPARC. [gdamore 20060605] ral(4): new driver layout supporting the RT2661 chipset. From OpenBSD. [rpaulo 20060606] - + timecounter: ported from FreeBSD. + completely new time-keeping infrastructure along with + NTP API 4 nanokernel implementation. was expected after + 4.0 but core@ voted for early import to facilitate early + testing and port conversion. [simonb, kardel 20060607]