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