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