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