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