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