Home | History | Annotate | Line # | Download | only in doc
BRANCHES revision 1.98
      1 #	$NetBSD: BRANCHES,v 1.98 2006/09/15 18:32:14 gdamore Exp $
      2 #
      3 # This file contains a list of branches that exist in the NetBSD CVS
      4 # tree and their current state.
      5 #
      6 # This list is necessarily incomplete.
      7 # 
      8 # Within reason, developers may create branch and version tags at any
      9 # time for any purpose.  To avoid name collisions, private tags should
     10 # have names which begin with the developer's NetBSD login name
     11 # followed by a - or _ character (e.g., thorpej_scsipi,
     12 # thorpej-signal)
     13 # 
     14 # Any branch or version tag not listed here should be assumed to be
     15 # private to the developer who created it.  It is inappropriate for
     16 # anyone other than that developer to commit, move tags, or otherwise
     17 # modify the contents of the branch.
     18 #
     19 # Please update this file when a new branch is ready for consumption
     20 # by folks other than the maintainer, or when the use or status of an
     21 # existing branch changes significantly.
     22 #
     23 # Format:
     24 #   Branch:	  name of branch
     25 #   Description:  Purpose and intention of the branch
     26 #   Status:	  Active/Terminated/Dormant
     27 #   Start Date:	  date first instantiated
     28 #   End Date:	  date it was Terminated/made_Dormant, if any
     29 #   Base Tag:	  netbsd-1-5-base, etc.
     30 #   Maintainer:	  Somebody to blame.
     31 #   Scope:	  Portion of the tree covered.
     32 #   Notes:	  Various other info, perhaps explanation of special tags,
     33 #		  who-may-commit policies, etc.
     34 #
     35 # There are four sections to this file:
     36 #   Release branches
     37 #   Individual developers' branches (Active/Dormant)
     38 #   Individual developers' branches (Terminated), and
     39 #   other
     40 #
     41 # Entries within each section should be alphabetized.
     42 #
     43 
     44 
     45 # Release branches:
     46 
     47 Branch:		comdex-fall-1999
     48 Description:	Special release branch for pre-1.5 release at
     49 		Fall 1999 COMDEX.
     50 Status:		Terminated
     51 Start Date:
     52 End Date:
     53 Base Tag:	comdex-fall-1999-base
     54 Maintainer:	?
     55 Scope:		Entire tree.
     56 Notes:
     57 
     58 Branch:		netbsd-0-9
     59 Description:	The NetBSD 0.9 release branch
     60 Status:		Terminated
     61 Start Date:
     62 End Date:
     63 Base Tag:	netbsd-0-9-base
     64 Maintainer:	Release Engineering <releng (a] NetBSD.org>
     65 Scope:		Entire tree.
     66 Notes:		Subsidiary tags of: netbsd-0-9-ALPHA, netbsd-0-9-ALPHA2,
     67 		netbsd-0-9-BETA, netbsd-0-9-RELEASE.
     68 		Commits restricted to release engineering.
     69 
     70 Branch:		netbsd-1-0
     71 Description:	The NetBSD 1.0 release branch
     72 Status:		Terminated
     73 Start Date:
     74 End Date:
     75 Base Tag:	netbsd-1-0-base
     76 Maintainer:	Release Engineering <releng (a] NetBSD.org>
     77 Scope:		Entire tree.
     78 Notes:
     79 		Commits restricted to release engineering.
     80 
     81 Branch:		netbsd-1-1
     82 Description:	The NetBSD 1.1 release branch
     83 Status:		Terminated
     84 Start Date:
     85 End Date:
     86 Base Tag:	netbsd-1-1-base
     87 Maintainer:	Release Engineering <releng (a] NetBSD.org>
     88 Scope:		Entire tree.
     89 Notes:
     90 		Commits restricted to release engineering.
     91 
     92 Branch:		netbsd-1-2
     93 Description:	The NetBSD 1.2 release branch
     94 Status:		Terminated
     95 Start Date:
     96 End Date:
     97 Base Tag:	netbsd-1-2-base
     98 Maintainer:	Release Engineering <releng (a] NetBSD.org>
     99 Scope:		Entire tree.
    100 Notes:
    101 		Commits restricted to release engineering.
    102 
    103 Branch:		netbsd-1-3
    104 Description:	The NetBSD 1.3 release branch
    105 Status:		Terminated
    106 Start Date:
    107 End Date:
    108 Base Tag:	netbsd-1-3-base
    109 Maintainer:	Release Engineering <releng (a] NetBSD.org>
    110 Scope:		Entire tree.
    111 Notes:
    112 		Commits restricted to release engineering.
    113 
    114 Branch:		netbsd-1-4
    115 Description:	The NetBSD 1.4 release branch
    116 Status:		Terminated
    117 Start Date:	1 Apr 2000
    118 End Date:
    119 Base Tag:	netbsd-1-4-base
    120 Maintainer:	1.4 Release Engineering <releng-1-4 (a] NetBSD.org>
    121 Scope:		Entire tree.
    122 Notes:
    123 		Commits restricted to release engineering.
    124 
    125 Branch:		netbsd-1-5
    126 Description:	The NetBSD 1.5 release branch
    127 Status:		Terminated
    128 Start Date:	20 Jun 2000
    129 End Date:	26 Jan 2005
    130 Base Tag:	netbsd-1-5-base
    131 Maintainer:	1.5 Release Engineering <releng-1-5 (a] NetBSD.org>
    132 Scope:		Entire tree.
    133 Notes:
    134 		Commits restricted to release engineering.
    135 
    136 Branch:		netbsd-1-6
    137 Description:	The NetBSD 1.6 release branch
    138 Status:		Terminated
    139 Start Date:	22 May 2002
    140 End Date:
    141 Base Tag:	netbsd-1-6-base
    142 Maintainer:	1.6 Release Engineering <releng-1-6 (a] NetBSD.org>
    143 Scope:		Entire tree.
    144 Notes:
    145 		Commits restricted to Release Engineering.
    146 
    147 Branch:		netbsd-2
    148 Description:    The NetBSD 2 release branch
    149 Status:		Active
    150 Start Date:	23 Dec 2004
    151 End Date:
    152 Base Tag:	netbsd-2-base
    153 Maintainer:	2 Release Engineering <releng-2 (a] NetBSD.org>
    154 Scope:		Entire tree. (src + xsrc)
    155 Notes:
    156 		Commits restricted to Release Engineering.
    157 
    158 Branch:		netbsd-2-0
    159 Description:	Originally the NetBSD 2.0 release branch and now the branch 
    160 		tracking security/critical fixes for the NetBSD 2.0 series
    161 Status:		Active
    162 Start Date:	28 Mar 2004 and changed for security/critical function on
    163        		23 Dec 2004
    164 End Date:
    165 Base Tag:	netbsd-2-0-base
    166 Maintainer:	2.0 Release Engineering <releng-2-0 (a] NetBSD.org>
    167 Scope:		Entire tree. (src + xsrc)
    168 Notes:		Branch was re-purposed to security/critical change function
    169 		once 2.0 released. See netbsd-2 for current branch to track
    170 		NetBSD 2 tree.
    171 		Commits restricted to Release Engineering.
    172 
    173 Branch:		netbsd-2-1
    174 Description:	Tracking security/critical fixes for NetBSD 2.1
    175 Status:		Active
    176 Start Date:     26 Oct 2005 
    177 End Date:
    178 Base Tag:	netbsd-2-1-RELEASE
    179 Maintainer:	2 Release Engineering <releng-2 (a] NetBSD.org>
    180 Scope:		Entire tree. (src + xsrc)
    181 Notes:		Branch contains only security/critical fixes to
    182 		NetBSD 2.1.  For new features, use netbsd-2 branch.
    183 		Commits restricted to Release Engineering.
    184 
    185 Branch:		netbsd-3
    186 Description:	The NetBSD 3 release branch
    187 Status:		Active
    188 Start Date:	16 Mar 2005
    189 End Date:
    190 Base Tag:	netbsd-3-base
    191 Maintainer:	3 Release Engineering <releng-3 (a] NetBSD.org>
    192 Scope:		Entire tree. (src + xsrc)
    193 Notes:
    194 		Commits restricted to Release Engineering.
    195 
    196 Branch:		netbsd-4
    197 Description:	The NetBSD 4 release branch
    198 Status:		Active
    199 Start Date:	8 Aug 2006
    200 End Date:
    201 Base Tag:	netbsd-4-base
    202 Maintainer:	4 Release Engineering <releng-4 (a] NetBSD.org>
    203 Scope:		Entire tree. (src + xsrc)
    204 Notes:
    205 		Commits restricted to Release Engineering.
    206 
    207 ########################################################################
    208 # Individual developers' branches (Active/Dormant):
    209 ########################################################################
    210 
    211 Branch:		bjh21-hydra
    212 Description:	Simtec Hydra support and ARM SMP in general
    213 Status:		Dormant
    214 Start Date:	18 Oct 2002
    215 End Date:
    216 Base Tag:	bjh21-hydra-base
    217 Maintainer:	Ben Harris <bjh21 (a] NetBSD.org>
    218 Scope:		sys/arch/arm sys/arch/acorn32
    219 Notes:		This code was on a branch because it involves changes to
    220 		cpuswitch.S which would otherwise make merging the
    221 		nathanw_sa branch difficult.
    222 
    223 Branch:		gmcgarry_ctxsw
    224 Description:	Separate scheduler from context-switch code
    225 Status:		Dormant
    226 Start Date:	18 December 2002
    227 End Date:
    228 Base Tag:	gmcgarry_ctxsw_base
    229 Maintainer:	Gregory McGarry <gmcgarry (a] NetBSD.org>
    230 Scope:		kernel
    231 Notes:		Removing knowledge of the schedular and its run queues
    232 		from the machine-dependent context switch code is the
    233 		first step in cleaning up the scheduler.  It is necessary
    234 		for the newlock branch, making the scheduler SMP friendly,
    235 		adding real-time scheduler extensions, and reducing the
    236 		number of code paths for LWP and proc switching.
    237 
    238 Branch:		gmcgarry_ucred
    239 Description:	Integrate and encapsulate user credentials
    240 Status:		Dormant
    241 Start Date:	18 December 2002
    242 End Date:
    243 Base Tag:	gmcgarry_ucred_base
    244 Maintainer:	Gregory McGarry <gmcgarry (a] NetBSD.org>
    245 Scope:		kernel
    246 Notes:		merge pcred and ucred and poolify
    247 
    248 Branch:		kame
    249 Description:	KAME Project
    250 Status:		Dormant
    251 Start Date:	28 Jun 1999
    252 End Date:
    253 Base Tag:
    254 Maintainer:	Jun-ichiro itojun Hagino <itojun (a] NetBSD.org>
    255 Scope:		kernel
    256 Notes:		http://www.kame.net
    257 		Used for "reference" purposes for early part of KAME
    258 		integration effort.  The branch is not actively used, as I
    259 		(itojun) use patch(1) and diff(1) for the KAME syncs.
    260 
    261 Branch:		kent-audio2
    262 Description:	In-kernel audio mixer
    263 Status:		Active
    264 Start Date:	Sun Jan 16 2005
    265 End Date:	
    266 Base Tag:	kent-audio2-base
    267 Maintainer:	TAMURA Kent <kent (a] NetBSD.org>
    268 Scope:		kernel (audio device drivers)
    269 Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
    270 		Please consult with the maintainer before committing
    271 		to this branch.
    272 		This branch is not expected to be compilable yet.
    273 
    274 Branch:		matt-timespec
    275 Description:	Convert the kernel to struct timespec as its primary time
    276 		storage mechanism.
    277 Status:		Active
    278 Start Date:	2005-02-19
    279 End Date:
    280 Base Tag:	
    281 Maintainer:	Matt Thomas <matt (a] NetBSD.org>
    282 Scope:		kernel
    283 Notes:	
    284 
    285 Branch:		newlock
    286 Description:	New locking primitives, based on Solaris's
    287 Status:		Dormant
    288 Start Date:	March 9, 2002
    289 End Date:
    290 Base Tag:	newlock-base
    291 Maintainer:	Jason R. Thorpe <thorpej (a] NetBSD.org>
    292 Scope:		Kernel
    293 Notes:		The goal is to replace the existing lockmgr() and
    294 		simple_lock() based locking mechanisms with the
    295 		primitives found in Solaris: mutexes and rwlocks.
    296 
    297 Branch:		newlock2
    298 Description:	New locking primitives, based on Solaris's
    299 Status:		Active
    300 Start Date:	September 9, 2006
    301 End Date:
    302 Base Tag:	newlock2-base
    303 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
    304 Scope:		Kernel
    305 Notes:		As per the newlock branch, however given the amount of time
    306 		the original branch has lain dormant, a new one has been
    307 		created. Goals:
    308 		- Implement new locking primitives on most-used ports.
    309 		- Minor locking improvements.
    310 		- Remove spinlockmgr().
    311 
    312 Branch:		peter-altq
    313 Description:	New ALTQ framework:
    314 		- sync with KAME sources
    315 		- share mtag/name mapping functions
    316 		- separate altq + pf attachment 
    317 Status:		Active
    318 Start Date:	March 16, 2006
    319 End Date:
    320 Base Tag:	peter-altq-base
    321 Maintainer:	Peter Postma <peter (a] NetBSD.org>,
    322 		Martin Husemann <martin (a] NetBSD.org>,
    323 		Matthias Scheler <tron (a] NetBSD.org>
    324 Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
    325 Notes:
    326 
    327 Branch:	  	pkgviews
    328 Description:  	package views, enabling multiple conflicting packages to co-exist
    329 Status:		Active
    330 Start Date:	22 July 2002
    331 End Date:
    332 Base Tag:	pkgviews
    333 Maintainer:	Alistair Crooks <agc (a] NetBSD.org>
    334 Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
    335 Notes:		A more flexible infrastructure for third-party packages by
    336 		allowing multiple conflicting packages and versions to co-exist
    337 		within the same tree
    338 
    339 Branch:		rpaulo-netinet-merge-pcb
    340 Description:	merge in6pcb with inpcb
    341 Status:		Active
    342 Start Date:	Wed Feb 01 2006
    343 End Date:	
    344 Base Tag:	rpaulo-netinet-merge-pcb-base
    345 Maintainer:	Rui Paulo <rpaulo (a] NetBSD.org>
    346 Scope:		src/sys
    347 Notes:
    348 
    349 Branch:		rtr-xorg-branch
    350 Description:	xorg & static build alterations to src/x11
    351 Status:		Active
    352 Start Date:	Nov 15 2004
    353 End Date:	
    354 Base tag:	rtr-xorg-branch-base
    355 Maintainer:	Tyler R. Retzlaff <rtr (a] NetBSD.org>
    356 Scope:		x11
    357 		distrib/sets/lists
    358 		share/mk/bsd.x11.mk
    359 		share/mk/bsd.own.mk
    360 		etc/mtree/NetBSD.dist
    361 Notes:		Requires parts of xsrc/xfree (HEAD)
    362 		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
    363 		Requires xorg (XORG-6_8_1)
    364 
    365 Branch:		thorpej-devvp
    366 Description:	replace dev_t with struct vnode * in devsw entry points
    367 Status:		Active
    368 Start Date:	Sep 6 2001
    369 End Date:
    370 Base Tag:	thorpej-devvp-base
    371 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
    372 Scope:		syssrc
    373 Notes:		Kernels built from this branch are not expected
    374 		to function correctly at this time.
    375 
    376 		Ports known to compile on this branch:
    377 			alpha
    378 			i386
    379 
    380 Branch:		yamt-lazymbuf
    381 Description:	implement and evaluate lazy mapping of mbuf external data pages
    382 		it's intended as the first step of larger changes.
    383 			1. support operations (esp. bus_dma load) on
    384 			   unmapped mbuf.
    385 			2. unify mbuf and buf.
    386 			   (or, at least some parts of them)
    387 			3. then it should be trivial to implement
    388 			   i/o coalescing, etc.
    389 Status:		Active
    390 Start Date:	Wed Jul  6 2005
    391 End Date:	
    392 Base Tag:	yamt-lazymbuf-base2
    393 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    394 Scope:		src/sys
    395 Notes:		
    396 
    397 
    398 ########################################################################
    399 # Individual developers' branches (Terminated):
    400 ########################################################################
    401 
    402 Branch:		bouyer-scsipi
    403 Description:	Integration of atapi support
    404 Status:		Terminated
    405 Start Date:
    406 End Date:
    407 Base Tag:
    408 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    409 Scope:		kernel
    410 Notes:		Superseded by thorpej_scsipi
    411 
    412 Branch:		bouyer-xen2
    413 Description:	update xen port to xen 2.0, with support for domain0 operations
    414 Status:		Terminated
    415 Start Date:	Dec 13 2004
    416 End Date:	Mar 10 2005
    417 Base Tag:	netbsd-2-base
    418 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    419 Scope:		src/sys/arch/xen
    420 Notes:
    421 
    422 Branch: 	chap-midi
    423 Description:	Renovation of MIDI support
    424 Status: 	Terminated; merged to -current
    425 Start Date:	19 May 2006
    426 End Date:	30 Jun 2006
    427 Base Tag:	chap-midi-base
    428 Maintainer:	Chapman Flack <chap (a] NetBSD.org>
    429 Scope:		sys, share/man, usr.bin
    430 Notes:
    431 
    432 Branch:		chs-ubc
    433 Description:	Unified Buffer Cache
    434 Status:		Terminated
    435 Start Date:
    436 End Date:
    437 Base Tag:	chs-ubc-base
    438 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    439 Scope:		kernel
    440 Notes:
    441 
    442 Branch:		chs-ubc2
    443 Description:	 Unified Buffer Cache
    444 Status:		Terminated; merged to -current
    445 Start Date:
    446 End Date:
    447 Base Tag:	chs-ubc2-base, chs-ubc2-newbase
    448 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    449 Scope:		kernel
    450 Notes:
    451 
    452 Branch:		cjs-build-against-obj-dir
    453 Description:	?
    454 Status:		?
    455 Start Date:
    456 End Date:
    457 Base Tag:
    458 Maintainer:	Curt Sampson <cjs (a] NetBSD.org>
    459 Scope:		Entire tree.
    460 Notes:
    461 
    462 Branch:		eeh-paddr_t
    463 Description:	use separate types for virtual vs. physical addresses
    464 Status:		Terminated; merged to -current
    465 Start Date:
    466 End Date:
    467 Base Tag:	eeh-paddr_t-base
    468 Maintainer:	Eduardo Horvath <eeh (a] NetBSD.org>
    469 Scope:		kernel
    470 Notes:		This is needed to support 32-bit kernels on sparc64.
    471 
    472 Branch:		elad-kernelauth
    473 Description:	Native NetBSD implementation of Apple's kernel authorization
    474 		based on TN2127. This is a "clean-room" implementation to
    475 		avoid any licensing issues.
    476 Status:		Terminated; merged to -current
    477 Start Date:	Tue Mar	 7 2006
    478 End Date:	Mon May 15 2006
    479 Base Tag:	elad-kernelauth-base
    480 Maintainer:	Elad Efrat <elad (a] NetBSD.org>
    481 Scope:		src/sys, src/share/man/man9/Makefile,
    482 		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
    483 Notes:
    484 
    485 Branch:		fvdl-softdep
    486 Description:	FFS soft dependencies
    487 Status:		Terminated; merged to -current
    488 Start Date:
    489 End Date:
    490 Base Tag:	fvdl-softdep-base
    491 Maintainer:	Frank van der Linden <fvdl (a] NetBSD.org>
    492 Scope:		kernel
    493 Notes:
    494 
    495 Branch:		gehenna-devsw
    496 Description:	auto-generation of devsw table
    497 Status:		Terminated
    498 Start Date:	16 May 2002
    499 End Date:	6 Sep 2002
    500 Base Tag:	gehenna-devsw-base
    501 Maintainer:	MAEKAWA Masahide <gehenna (a] NetBSD.org>
    502 Scope:		syssrc
    503 Notes:		The goal is to get rid of the existing device switch tables in
    504 		port-dependent conf.c and to generate them dynamically by
    505 		config(8).
    506 
    507 Branch:		is-newarp
    508 Description:	ARP for non-Ethernet
    509 Status:		Terminated; merged before NetBSD 1.3
    510 Start Date:	1996/10/13
    511 End Date:	1997/03/15
    512 Base Tag:	is-newarp-base
    513 Maintainer:	Ignatios Souvatzis <is (a] NetBSD.org>
    514 Scope:		kernel
    515 Notes:
    516 
    517 Branch:		kenh-if-detach
    518 Description:	Interface detach support.
    519 Status:		?
    520 Start Date:
    521 End Date:
    522 Base Tag:	kenh-if-detach-base
    523 Maintainer:	Ken Hornstein <kenh (a] NetBSD.org>
    524 Scope:		kernel
    525 Notes:
    526 
    527 Branch:		kent-audio1
    528 Description:	Audio converter pipeline
    529 Status:		Terminated; merged to -current
    530 Start Date:	Tue Dec  7 2004
    531 End Date:	Tue Jan 11 2005
    532 Base Tag:	kent-audio1-base
    533 Maintainer:	TAMURA Kent <kent (a] NetBSD.org>
    534 Scope:		kernel (audio device drivers)
    535 Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
    536 		Please consult with the maintainer before committing
    537 		to this branch.
    538 
    539 Branch:		kqueue
    540 Description:	kqueue kernel event notification mechanism (from FreeBSD)
    541 Status:		Terminated; merged to -current
    542 Start Date:	Tue Jul 10 23:08:38 EST 2001
    543 End Date:	Tue Oct 24 09:14:14 GMT 2002
    544 Base Tag:	kqueue-base
    545 Maintainer:	Jaromir Dolecek <jdolecek (a] NetBSD.org>
    546 Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
    547 Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
    548 		local internal changes to better suit NetBSD, and
    549 		enhancements such as looking up filters by name or
    550 		number, and dynamic registration of "user" filters.
    551 		The work is complete as is, but is awaiting more
    552 		feedback from various kernel gurus before going mainline.
    553 
    554 Branch:		ktrace-lwp
    555 Description:	ktrace support for lwp ids.
    556 Status:		Terminated; merged to -current
    557 Start Date:	Wed Jul  2 15:27:30 UTC 2003
    558 End Date:	Sun Dec 11 12:25:29 UTC 2005
    559 Base Tag:	ktrace-lwp-base
    560 Maintainer:	Darren Reed <darrenr (a] NetBSD.org>
    561 Scope:		sys
    562 Notes:		
    563 
    564 Branch:		marc-pcmcia
    565 Description:	PCMCIA support
    566 Status:		Terminated; merged to -current
    567 Start Date:
    568 End Date:
    569 Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
    570 Maintainer:	Marc Horowitz <marc (a] NetBSD.org>
    571 Scope:		kernel
    572 Notes:
    573 
    574 Branch:		minoura_x68k_bus_h
    575 Description:	bus_space(9) and bus_dma(9) implementation for x68k
    576 Status:		Terminated; merged to -current
    577 Start Date:	23 Dec 1998
    578 End Date:	16 Mar 1999
    579 Base Tag:	minoura_x68k_bus_h-base
    580 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    581 Scope:		sys/arch/x68k
    582 Notes:
    583 
    584 Branch:		minoura-xpg4dl
    585 Description:	Citrus Project locale subsystem
    586 Status:		Terminated; (partly) merged to -current
    587 Start Date:	28 March 2000
    588 End Date:
    589 Base Tag:	minoura-xpg4dl-base
    590 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    591 Scope:		basesrc, syssrc, sharesrc
    592 Notes:		Citrus Project is developing dynamically-loadable, codeset-
    593 		independent locale subsystem.  Part of the implementation
    594 		(LC_CTYPE) called XPG4DL is now integrated to -current.
    595 
    596 Branch:		mrg-vm-swap
    597 Description:	dynamic swap allocation, swap-to-files support
    598 Status:		Terminated; abondoned for mrg-vm-swap2
    599 Start Date:	12 February 1997
    600 End Date:	15 March 1997
    601 Base Tag:	[none]
    602 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
    603 Scope:		kernel
    604 Notes:
    605 
    606 Branch:		mrg-vm-swap2
    607 Description:	dynamic swap allocation, swap-to-files support
    608 Status:		Terminated; merged to -current
    609 Start Date:	4 May 1997
    610 End Date:	12 June 1997
    611 Base Tag:	mrg-vm-swap2-base
    612 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
    613 Scope:		kernel
    614 Notes:
    615 
    616 Branch:		nathanw_sa
    617 Description:	Scheduler activations
    618 Status:		Terminated; merged to -current
    619 Start Date:	5 March 2001
    620 End Date:	18 January 2003
    621 Base Tag:	nathanw_sa_base
    622 Maintainer:	Nathan Williams <nathanw (a] NetBSD.org>
    623 Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
    624 		bin/ps usr.bin/systat usr.bin/top usr.bin/w
    625 		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
    626 Notes:		The idea of scheduler activations is described in the
    627 		classic paper by Anderson et al., in ACM Transactions
    628 		a on Computer Systems volume 10 issue 1 (1992),which
    629 		can be found at
    630 		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
    631 		Many ideas in the implementation are based on the
    632 		implementation of scheduler activations added to Mach
    633 		3.0 and described by Davis et al. in the University of
    634 		Washington CS tech report 92-08-93, which can be found
    635 		at
    636 		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
    637 
    638 		My USENIX paper on the subject can be found at
    639 		http://web.mit.edu/nathanw/www/usenix/
    640 
    641 		Please consult with the maintainer before committing
    642 		to this branch.
    643 		Other tags starting with nathanw_sa reserved for
    644 		branch management and are not guaranteed to be stable.
    645 
    646 		Trunk tagged with "nathanw_sa_before_merge" prior to
    647 		merging branch down to trunk.  Branch tagged with
    648 		"nathanw_sa_end" to indicate the ending revision of
    649 		the branch.
    650 
    651 Branch:		perseant-lfsv2
    652 Description:	LFS incompatible on-disk data structure changes
    653 Status:		Terminated
    654 Start Date:	27 June 2001
    655 End Date:	16 July 2001
    656 Base Tag:	perseant-lfsv2-base
    657 Maintainer:	Konrad Schroder <perseant (a] NetBSD.org>
    658 Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
    659 Notes:		This branch should be short-lived, I expect to merge as soon
    660 		as the data structures required for unremove are in and tested.
    661 
    662 Branch:		sommerfeld_i386mp_1
    663 Description:	Multiprocessor support for i386 using Intel MP BIOS.
    664 Status:		Terminated; merged to -current
    665 Start Date:	21 Feb 2000
    666 End Date:	01 Oct 2002
    667 Base Tag:	sommerfeld_i386mpbase_1
    668 Maintainer:	Bill Sommerfeld <sommerfeld (a] NetBSD.org>
    669 Scope:		sys/arch/i386
    670 Notes:
    671 		Code committed to the branch has booted to multiuser 
    672 		on at least one system.
    673 
    674 		Not guaranteed to compile against mainline since -current
    675 		may have changed incompatibly with the last branch update;
    676 		use "cvs update -D" to roll-back the rest of the tree to match.
    677 
    678 		Please get explicit permission from the maintainer 
    679 		before each commit, or your changes will be backed out.
    680 		Other tags starting with sommerfeld_ are private to 
    681 		the developer and are guaranteed to be unstable.
    682 		Only the maintainer should move tags.
    683 
    684 		Note that this branch uses a DIFFERENT scheme for 
    685 		synching with the mainline.  the maintainer uses some private
    686 		scripts for keeping them in synch; if you make commits 
    687 		to the branch to "resynchronize" things, you'll
    688 		probably do it wrong; instead, ask the maintainer to
    689 		resynchronize things.
    690 
    691 		See sys/arch/i386/TODO on the branch for a list of known
    692 		issues with the branch.
    693 
    694 Branch:		thorpej-mips-cache
    695 Description:	overhaul MIPS cache support code
    696 Status:		Terminated; merged to -current
    697 Start Date:	Oct 23 2001
    698 End Date:	Nov 14 2001
    699 Base Tag:	thorpej-mips-cache-base
    700 Scope:		syssrc
    701 Notes:		This branch needs more debugging, testing, and more
    702 		ports need to be converted to the new world order.
    703 
    704 		The following processors have had cache ops
    705 		written:
    706 
    707 			* R2000/R3000 (cache_r3k) -- light testing,
    708 			  needs to be beat on a lot more to make
    709 			  sure it's working.
    710 
    711 			* R4000/R4400 (cache_r4k) -- mhitch (a] NetBSD.org
    712 			  tracked down a bug, which has been fixed.
    713 
    714 			  Confirmed working on R4000-with-L2.
    715 
    716 			  Confirmed working on R4400-no-L2 and
    717 			  R4400-with-L2.
    718 
    719 			* R4600/R5000 (cache_r5k) -- shin (a] NetBSD.org
    720 			  has committed fixes to this code.
    721 
    722 			  Confirmed working on R4600 v2 (SGI IP-22 with
    723 			  no SysAD L2 cache).
    724 
    725 			  Confirmed working on RM5260 (Algorithmics P-5064).
    726 
    727 			* TX39 (cache_tx39) -- uch (a] NetBSD.org has
    728 			  committed fixes to this code.  Awaiting
    729 			  confirmation that it is working properly.
    730 
    731 			* R5900 (cache_r5900) -- uch (a] NetBSD.org has
    732 			  written this code and tested it on a
    733 			  PlayStation 2.
    734 
    735 		The following ports have been updated to compile (and
    736 		use optimized-for-processor bus_dma routines).  Those
    737 		that have been tested and work are marked with [WORKING].
    738 
    739 			* algor		[WORKING]
    740 
    741 			* arc		[WORKING]
    742 
    743 			* pmax		[WORKING]
    744 
    745 			* playstation2	[WORKING]
    746 					Needs optimized bus_dmamap_sync().
    747 
    748 			* hpcmips	[need verification that this is working]
    749 					Needs optimized bus_dmamap_sync().
    750 
    751 			* sgimips	[WORKING]
    752 					Needs optimized bus_dmamap_sync().
    753 
    754 			* cobalt	[need testing]
    755 
    756 			* mipsco	[need testing]
    757 
    758 			* newsmips	[need testing]
    759 
    760 Branch:		thorpej_scsipi
    761 Description:	SCSI/ATAPI midlayer rewrite.
    762 Status:		Terminated; merged to -current
    763 Start Date:
    764 End Date:	Apr 25 2001
    765 Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
    766 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>,
    767 		Jason Thorpe <thorpej (a] NetBSD.org>
    768 Scope:		syssrc
    769 Notes:		When a change from -current is pulled up please move the
    770 		thorpej_scsipi_base tag to the revision you're syncing with.
    771 		thorpej_scsipi_nbase is private to maintainer (only
    772 		used when syncing the whole branch with HEAD).
    773 		Just before the merge, syssrc has been tagged with
    774 		thorpej_scsipi_beforemerge
    775 
    776 Branch:		thorpej-signal
    777 Description:	?
    778 Status:		?
    779 Start Date:
    780 End Date:
    781 Base Tag:	thorpej-signal-base
    782 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
    783 Scope:		kernel
    784 Notes:
    785 
    786 Branch:		thorpej-setroot
    787 Description:	?
    788 Status:		Terminated; merged to -current
    789 Start Date:
    790 End Date:
    791 Base Tag:
    792 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
    793 Scope:		kernel
    794 Notes:
    795 
    796 Branch:		simonb-timecounters
    797 Description:	Port FreeBSD timecounters to NetBSD
    798 Status:		Terminated
    799 Start Date:	Sat Feb 04 2006
    800 End Date:	Wed Jun 07 2006
    801 Base Tag:	simonb-timecounters-base
    802 Maintainer:	Simon Burge <simonb (a] NetBSD.org>,
    803 		Frank Kardel <kardel (a] NetBSD.org>
    804 Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
    805 Notes:		early (partial conversion) commit to -current
    806 		ok'ed by core@ on 20060605 for testing and further
    807 		simplified conversion
    808 
    809 Branch:		wrstuden-devbsize
    810 Description:	Modify buffer cache to deal with different devices having
    811 		different block sizes. Also DEV_BSIZE would go away.
    812 Status:		Terminated
    813 Start Date:	Aug or Sept 1999
    814 End Date:	1 Apr 2000
    815 Base tag:	wrstuden-devbsize-base
    816 Maintainer:	Bill Studenmund <wrstuden (a] NetBSD.org>
    817 Scope:		kernel
    818 Notes:		No longer active due to lack of time, and introduction
    819 		of UBC. In terms of UBC, the primary cache for
    820 		file data is the VM cache, which needs to operate
    821 		in terms of VM pages. As no existing device has native
    822 		pages the same size as our VM pages, there already is
    823 		a mapping going on between the VM system and the
    824 		underlying blocks. So it would be easier and cleaner
    825 		to adjust that to deal w/ different block sizes.
    826 		Also with UBC, all i/o is in terms of bytes at an offset
    827 		with a certain length, so the exact block size isn't a big
    828 		deal.
    829 
    830 		Any other wrstuden-devbsize tag may (and should) go away.
    831 
    832 Branch:		yamt-km, yamt-km-doc
    833 Description:	simplify/improve kernel memory management and bootstrap
    834 Status:		Terminated; merged to -current
    835 Start Date:	Tue Jan 25 2005
    836 End Date:	Fri Apr  1 2005
    837 Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
    838 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    839 Scope:		yamt-km: src/sys
    840 		yamt-km-doc: src/share/man/man9/uvm.9
    841 Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
    842 
    843 		the followings are per-port status.
    844 		(account names mean "tested by".)
    845 
    846 		works enough to go to multiuser:
    847 			alpha, i386, xen (yamt@)
    848 			pc532 (simonb@)
    849 			alpha, i386, mac68k, macppc, pmax, shark,
    850 			    sparc, sparc64, sun3, x68k (chs@)
    851 			cobalt, dreamcast, hp300, news68k, newsmips,
    852 			    sun3x (tsutsui@)
    853 			amiga (mhitch@)
    854 			cats, hp700 (skrll@)
    855 			xen (bouyer@)
    856 
    857 		known to have the same problem as trunk:
    858 			vax (chs@, stuck while running kvm_mkdb)
    859 
    860 		known to have a problem:
    861 			luna68k (and, if any, other m68k ports which use TTR)
    862 			needs to be revisited.
    863 			-> for luna68k, although not tested,
    864 			   Sysmap has been moved to avoid kva conflict with
    865 			   I/O ranges.
    866 
    867 		buildable:
    868 			src/sys/arch/acorn26/conf/GENERIC
    869 			src/sys/arch/acorn32/conf/GENERIC
    870 			src/sys/arch/algor/conf/P6032
    871 			src/sys/arch/alpha/conf/GENERIC
    872 			src/sys/arch/alpha/conf/GENERIC.MP
    873 			src/sys/arch/amd64/conf/GENERIC
    874 			src/sys/arch/amd64/conf/GENERIC.MP
    875 			src/sys/arch/amiga/conf/GENERIC
    876 			src/sys/arch/arc/conf/GENERIC
    877 			src/sys/arch/atari/conf/MILAN-PCIIDE
    878 			src/sys/arch/bebox/conf/GENERIC
    879 			src/sys/arch/cats/conf/GENERIC
    880 			src/sys/arch/cesfic/conf/GENERIC
    881 			src/sys/arch/cobalt/conf/GENERIC
    882 			src/sys/arch/dreamcast/conf/GENERIC
    883 			src/sys/arch/evbarm/conf/TS7200
    884 			src/sys/arch/evbppc/conf/WALNUT
    885 			src/sys/arch/evbsh3/conf/COMPUTEXEVB
    886 			src/sys/arch/evbsh5/conf/CAYMAN64
    887 			src/sys/arch/hp300/conf/GENERIC
    888 			src/sys/arch/hp700/conf/GENERIC
    889 			src/sys/arch/hpcarm/conf/JORNADA728
    890 			src/sys/arch/hpcmips/conf/GENERIC
    891 			src/sys/arch/hpcsh/conf/GENERIC
    892 			src/sys/arch/hpcsh/conf/HPW650PA
    893 			src/sys/arch/i386/conf/GENERIC
    894 			src/sys/arch/i386/conf/GENERIC.MP
    895 			src/sys/arch/i386/conf/XEN0
    896 			src/sys/arch/i386/conf/XENU
    897 			src/sys/arch/ibmnws/conf/GENERIC
    898 			src/sys/arch/iyonix/conf/GENERIC
    899 			src/sys/arch/luna68k/conf/GENERIC
    900 			src/sys/arch/mac68k/conf/GENERIC
    901 			src/sys/arch/macppc/conf/GENERIC
    902 			src/sys/arch/macppc/conf/GENERIC.MP
    903 			src/sys/arch/mipsco/conf/GENERIC
    904 			src/sys/arch/mmeye/conf/GENERIC
    905 			src/sys/arch/mvme68k/conf/GENERIC
    906 			src/sys/arch/netwinder/conf/GENERIC
    907 			src/sys/arch/news68k/conf/GENERIC
    908 			src/sys/arch/newsmips/conf/GENERIC
    909 			src/sys/arch/next68k/conf/GENERIC
    910 			src/sys/arch/ofppc/conf/GENERIC
    911 			src/sys/arch/pc532/conf/GENERIC
    912 			src/sys/arch/pmax/conf/GENERIC
    913 			src/sys/arch/prep/conf/GENERIC
    914 			src/sys/arch/sandpoint/conf/GENERIC
    915 			src/sys/arch/sbmips/conf/GENERIC
    916 			src/sys/arch/sgimips/conf/GENERIC32_IP3x
    917 			src/sys/arch/shark/conf/GENERIC
    918 			src/sys/arch/sparc/conf/GENERIC
    919 			src/sys/arch/sparc/conf/GENERIC.MP
    920 			src/sys/arch/sparc64/conf/GENERIC
    921 			src/sys/arch/sparc64/conf/GENERIC.MP
    922 			src/sys/arch/sun2/conf/GENERIC
    923 			src/sys/arch/sun3/conf/GENERIC
    924 			src/sys/arch/vax/conf/GENERIC
    925 			src/sys/arch/vax/conf/GENERIC.MP
    926 			src/sys/arch/x68k/conf/GENERIC
    927 
    928 			src/sys/arch/playstation2/conf/GENERIC
    929 
    930 Branch:		yamt-pdpolicy
    931 Description:	play with page replacement policy
    932 		- separate page replacement policy from the rest of kernel
    933 		- implement alternative replacement policy
    934 		- related read-ahead adjustment?
    935 Status:		Terminated; merged to -current
    936 Start Date:	Sun Mar  5 2006
    937 End Date:	Sat Sep 16 2006
    938 Base Tag:	yamt-pdpolicy-base9
    939 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    940 Scope:		src/sys  (src/common is tagged but not branched)
    941 Notes:		
    942 
    943 Branch:		yamt-readahead
    944 Description:	play with file readahead
    945 Status:		Terminated; merged to -current
    946 Start Date:	Mon Nov 14 2005
    947 End Date:	Wed Nov 30 2005
    948 Base Tag:	yamt-readahead-base3
    949 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    950 Scope:		src/sys
    951 Notes:		
    952 
    953 Branch:		yamt-uio_vmspace
    954 Description:	uio_lwp/uio_segflg -> uio_vmspace
    955 Status:		Terminated; merged to -current
    956 Start Date:	Mon Dec 31 2005
    957 End Date:	Wed Mar  1 2006
    958 Base Tag:	yamt-uio_vmspace-base5
    959 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    960 Scope:		src/sys
    961 Notes:		
    962 
    963 Branch:		yamt-vop
    964 Description:	remove several VOPs
    965 Status:		Terminated; merged to -current
    966 Start Date:	Wed Oct 19 2005
    967 End Date:	Wed Nov  2 2005
    968 Base Tag:	yamt-vop-base3
    969 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    970 Scope:		src/sys
    971 Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
    972 
    973 Branch:		gdamore-uart
    974 Description:	Add register table support to com driver.
    975 Status:		Active
    976 Start Date:	14 June 2006
    977 End Date:	13 July 2006
    978 Base Tag:	gdamore-uart-base
    979 Maintainer:	Garrett D'Amore <gdamore (a] NetBSD.org>
    980 Scope:		kernel
    981 Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
    982 		com support, and also removes a nasty hack from Atheros com.
    983 
    984 
    985 ########################################################################
    986 # Other:
    987 ########################################################################
    988 
    989 Branch:		magnum
    990 Description:	?
    991 Status:		?
    992 Start Date:
    993 End Date:
    994 Base Tag:	magnum-base
    995 Maintainer:	?
    996 Scope:		kernel
    997 Notes:
    998 
    999