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