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