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