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