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