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