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