Home | History | Annotate | Line # | Download | only in doc
BRANCHES revision 1.171
      1 #	$NetBSD: BRANCHES,v 1.171 2007/04/02 10:18:52 rmind 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:		ad-audiomp
    212 Description:	Add MP locking to the audio drivers
    213 Status:		Active
    214 Start Date:	28 Febuary 2007
    215 End Date:
    216 Base Tag:	ad-audiomp-base
    217 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
    218 Scope:		kernel
    219 Notes:		Making the audio drivers MP safe is necessary before efforts
    220 		can be made to make the VM system MP safe. About 1/2 of the
    221 		drivers are converted, the remaining 1/2 need more changes.
    222 
    223 		As of import this is snapshot of work in progress and so
    224 		may not compile; in particular the midi changes are very
    225 		much "in progress". The audio component has been tested
    226 		and verified to work with emuxki and auvia. There may
    227 		be a locking issue in the ac97 code at boot.
    228 
    229 		The are two locks per device instance, an ISR lock and
    230 		a character device lock. The ISR lock replaces calls to
    231 		splaudio()/splx(), and will be held across calls to device
    232 		methods which were called at splaudio() before (e.g.
    233 		trigger_output). The character device lock is held across
    234 		calls to nearly all of the methods, excluding some only
    235 		used for initializtion, e.g. get_locks. This needs to be
    236 		documented at merge time.
    237 
    238 		To test on a multi way x86 system, search for "mpsafe" in
    239 		x86/x86/intr.c and change IPL_SCHED to IPL_AUDIO. Run a job
    240 		that will acquire the ISR lock (depends on the hardware, but
    241 		"while true; do mixerctl -a > /dev/null; done" may suffice).
    242 		Play audio, run lockstat and verify that that there is
    243 		contention on the ISR lock.
    244 
    245 Branch:		bjh21-hydra
    246 Description:	Simtec Hydra support and ARM SMP in general
    247 Status:		Dormant
    248 Start Date:	18 Oct 2002
    249 End Date:
    250 Base Tag:	bjh21-hydra-base
    251 Maintainer:	Ben Harris <bjh21 (a] NetBSD.org>
    252 Scope:		sys/arch/arm sys/arch/acorn32
    253 Notes:		This code was on a branch because it involves changes to
    254 		cpuswitch.S which would otherwise make merging the
    255 		nathanw_sa branch difficult.
    256 
    257 Branch:		gmcgarry_ctxsw
    258 Description:	Separate scheduler from context-switch code
    259 Status:		Dormant
    260 Start Date:	18 December 2002
    261 End Date:
    262 Base Tag:	gmcgarry_ctxsw_base
    263 Maintainer:	Gregory McGarry <gmcgarry (a] NetBSD.org>
    264 Scope:		kernel
    265 Notes:		Removing knowledge of the schedular and its run queues
    266 		from the machine-dependent context switch code is the
    267 		first step in cleaning up the scheduler.  It is necessary
    268 		for the newlock branch, making the scheduler SMP friendly,
    269 		adding real-time scheduler extensions, and reducing the
    270 		number of code paths for LWP and proc switching.
    271 
    272 Branch:		gmcgarry_ucred
    273 Description:	Integrate and encapsulate user credentials
    274 Status:		Dormant
    275 Start Date:	18 December 2002
    276 End Date:
    277 Base Tag:	gmcgarry_ucred_base
    278 Maintainer:	Gregory McGarry <gmcgarry (a] NetBSD.org>
    279 Scope:		kernel
    280 Notes:		merge pcred and ucred and poolify
    281 
    282 Branch:		kame
    283 Description:	KAME Project
    284 Status:		Dormant
    285 Start Date:	28 Jun 1999
    286 End Date:
    287 Base Tag:
    288 Maintainer:	Jun-ichiro itojun Hagino <itojun (a] NetBSD.org>
    289 Scope:		kernel
    290 Notes:		http://www.kame.net
    291 		Used for "reference" purposes for early part of KAME
    292 		integration effort.  The branch is not actively used, as I
    293 		(itojun) use patch(1) and diff(1) for the KAME syncs.
    294 
    295 Branch:		kent-audio2
    296 Description:	In-kernel audio mixer
    297 Status:		Active
    298 Start Date:	Sun Jan 16 2005
    299 End Date:	
    300 Base Tag:	kent-audio2-base
    301 Maintainer:	TAMURA Kent <kent (a] NetBSD.org>
    302 Scope:		kernel (audio device drivers)
    303 Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
    304 		Please consult with the maintainer before committing
    305 		to this branch.
    306 		This branch is not expected to be compilable yet.
    307 
    308 Branch:		matt-timespec
    309 Description:	Convert the kernel to struct timespec as its primary time
    310 		storage mechanism.
    311 Status:		Active
    312 Start Date:	2005-02-19
    313 End Date:
    314 Base Tag:	
    315 Maintainer:	Matt Thomas <matt (a] NetBSD.org>
    316 Scope:		kernel
    317 Notes:	
    318 
    319 Branch:		newlock
    320 Description:	New locking primitives, based on Solaris's
    321 Status:		Terminated
    322 Start Date:	March 9, 2002
    323 End Date:	Febuary 12, 2007
    324 Base Tag:	newlock-base
    325 Maintainer:	Jason R. Thorpe <thorpej (a] NetBSD.org>
    326 Scope:		Kernel
    327 Notes:		The goal is to replace the existing lockmgr() and
    328 		simple_lock() based locking mechanisms with the
    329 		primitives found in Solaris: mutexes and rwlocks.
    330 		Superseeded by the newlock2 branch.
    331 
    332 Branch:		newlock2
    333 Description:	New locking primitives, based on Solaris's
    334 Status:		Terminated
    335 Start Date:	September 9, 2006
    336 End Date:	Febuary 12, 2007
    337 Base Tag:	newlock2-base
    338 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
    339 Scope:		Kernel
    340 Notes:		As per the newlock branch, however given the amount of time
    341 		the original branch has lain dormant, a new one has been
    342 		created.  Goals:
    343 		- Implement new locking primitives on most-used ports.
    344 		- Minor locking improvements.
    345 		- Remove spinlockmgr().
    346 
    347 Branch:	  	pkgviews
    348 Description:  	package views, enabling multiple conflicting packages to co-exist
    349 Status:		Active
    350 Start Date:	22 July 2002
    351 End Date:
    352 Base Tag:	pkgviews
    353 Maintainer:	Alistair Crooks <agc (a] NetBSD.org>
    354 Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
    355 Notes:		A more flexible infrastructure for third-party packages by
    356 		allowing multiple conflicting packages and versions to co-exist
    357 		within the same tree
    358 
    359 Branch:		rpaulo-netinet-merge-pcb
    360 Description:	merge in6pcb with inpcb
    361 Status:		Dormant
    362 Start Date:	Wed Feb 01 2006
    363 End Date:	
    364 Base Tag:	rpaulo-netinet-merge-pcb-base
    365 Maintainer:	Rui Paulo <rpaulo (a] NetBSD.org>
    366 Scope:		src/sys
    367 Notes:		No longer active due to the lack of time. If you plan to
    368 		continue this branch, sys/netinet/in_pcb.h already contains
    369 		the proposed structure layout (which was roughly discussed
    370 		in the tech-net mailing list).
    371 		I also defined INP_*() macros to mimicate FreeBSD's inpcb
    372 		locking style, but currently they do nothing and are not
    373 		yet called at the correct places (needs discussion about
    374 		kernel fine-grained locking).
    375 		To continue this branch, one needs to read all the relevant
    376 		inpcb/in6pcb source files and change the function names,
    377 		structure names, structure fileds according to the new
    378 		layout (in6pcb is gone).
    379 		Don't try to build a kernel from this branch because it won't
    380 		work. The missing pieces required to do a complete build
    381 		were not committed because they were incomplete and generated
    382 		panics.
    383 		You shouldn't need to worry about KAME syncs because
    384 		they did most of them by now.
    385 		After the work is done, you are required to test the branch
    386 		(before the merge to -current) with an interop IPv6 test.
    387 		More info at: http://www.tahi.org/
    388 
    389 Branch:		rtr-xorg-branch
    390 Description:	xorg & static build alterations to src/x11
    391 Status:		Active
    392 Start Date:	Nov 15 2004
    393 End Date:	
    394 Base tag:	rtr-xorg-branch-base
    395 Maintainer:	Tyler R. Retzlaff <rtr (a] NetBSD.org>
    396 Scope:		x11
    397 		distrib/sets/lists
    398 		share/mk/bsd.x11.mk
    399 		share/mk/bsd.own.mk
    400 		etc/mtree/NetBSD.dist
    401 Notes:		Requires parts of xsrc/xfree (HEAD)
    402 		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
    403 		Requires xorg (XORG-6_8_1)
    404 
    405 Branch:		thorpej-devvp
    406 Description:	replace dev_t with struct vnode * in devsw entry points
    407 Status:		Active
    408 Start Date:	Sep 6 2001
    409 End Date:
    410 Base Tag:	thorpej-devvp-base
    411 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
    412 Scope:		syssrc
    413 Notes:		Kernels built from this branch are not expected
    414 		to function correctly at this time.
    415 
    416 		Ports known to compile on this branch:
    417 			alpha
    418 			i386
    419 
    420 Branch:		vmlocking
    421 Description:	Make memory allocators and trap handling MP safe
    422 Status:		Active
    423 Start Date:	13 March 2007
    424 End Date:
    425 Base Tag:	vmlocking-base
    426 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
    427 Scope:		kernel
    428 Notes:
    429 		- Replace all simplelocks with mutexes
    430 		- Remove spinlockmgr
    431 		- Make memory allocators MP safe
    432 		- Make trap handling MP safe: push kernel lock acquire
    433 		  back into pager ops.
    434 
    435 		Only i386 is currently update.  Most per architecture
    436 		changes need to be made in the pmap module.  LFS is not
    437 		currently stable due interaction between the pagedaemon (?)
    438 		and the HOLDRELE() in lfs_segment.c.  It may trash your
    439 		filesystem..
    440 
    441 		Most of the locks replaced are now sleep/adaptive locks or
    442 		spin locks at IPL_VM.  Assuming audio interrupt handlers
    443 		are made MP safe there are far fewer potential deadlocks
    444 		against the kernel lock.
    445 
    446 		v_interlock becomes an adaptive mutex so now acquring
    447 		it can potentially block, similarly for other locks
    448 		that were before simplelocks.  This needs to be audited
    449 		carefully.
    450 
    451 		Use vnodes in general needs to be audited, as vnodes can
    452 		now be inspected without the kernel lock held.
    453 
    454 		Acquiring locks in the pmap module can now block, meaning
    455 		that the current pmap, cpu or lazy pmap status can change
    456 		out from underneath the requestor.  This also needs to be
    457 		audited.
    458 
    459 		Currently, i386 has the necessary modifications, and has
    460 		trap handling and a few calls to allocators out from under
    461 		the kernel lock.  There are still problems that need to be
    462 		debugged.
    463 
    464 		Need to check that whenever a lock is initialized, it is
    465 		also destroyed.
    466 
    467 		Lots of testing required.
    468 
    469 Branch:		yamt-idlelwp
    470 Description:	idle lwp, and some changes depending on it.
    471 
    472 		1. separate context switching and thread scheduling.
    473 		   (cf. gmcgarry_ctxsw)
    474 		2. implement idle lwp.
    475 		3. clean up related MD/MI interfaces.
    476 		4. implement interrupt LWPs.
    477 		5. make scheduler(s) modular.
    478 
    479 Status:		Active
    480 Start Date:	Fri Feb 17 2007
    481 End Date:	
    482 Base Tag:	yamt-idlelwp-base4
    483 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    484 Scope:		src/sys  (src/common is tagged but not branched)
    485 Notes:		
    486 		Status of ports (minimal goals):
    487 		  alpha			[ Done,
    488 					  UP tested, MP not tested ]
    489 		  i386			[ Done, tested ]
    490 		  amd64			[ Done, tested ]
    491 		  mips			[ WIP ]
    492 		  sparc			[ WIP ]
    493 		  sparc64		[ WIP ]
    494 		  arm			[ Done.
    495 					  SA1 tested. ]
    496 		  macppc/powerpc	[ WIP ]
    497 		  hppa			[ WIP ]
    498 		  sh3			[ Done, tested ]
    499 
    500 		How to adapt a port?
    501 
    502 		- unify cpu_switch, cpu_exit, cpu_switchto into
    503 		  a single cpu_switchto.  see cpu_switchto.9.
    504 
    505 		- implement cpu_idle.  see cpu_idle.9.
    506 
    507 		- add a flag argument to cpu_need_resched.
    508 		  handle RESCHED_IMMED flag, which means "cause a preemption
    509 		  as soon as possible."  eg. in the case of MULTIPROCESSOR,
    510 		  send an IPI to the target cpu.
    511 
    512 		- "curlwp == NULL" is not a valid check for idle state anymore.
    513 		  use "(curlwp->l_flag & LW_IDLE) != 0" instead.  curlwp is
    514 		  almost always non-NULL, with exceptions like early on boot.
    515 
    516 		- remove idle pcbs.
    517 
    518 		- (if MULTIPROCESSOR) tweak processor trampoline code.
    519 
    520 		- (if MULTIPROCESSOR) call mi_cpu_attach when attaching
    521 		  secondary processors.
    522 
    523 		- (if schedhz!=0) call schedclock regardless of the value of
    524 		  curlwp.
    525 
    526 		- of course, update MD users of scheduler/switching API.
    527 
    528 Branch:		yamt-lazymbuf
    529 Description:	implement and evaluate lazy mapping of mbuf external data pages
    530 		it's intended as the first step of larger changes.
    531 			1. support operations (esp. bus_dma load) on
    532 			   unmapped mbuf.
    533 			2. unify mbuf and buf.
    534 			   (or, at least some parts of them)
    535 			3. then it should be trivial to implement
    536 			   i/o coalescing, etc.
    537 Status:		Active
    538 Start Date:	Wed Jul  6 2005
    539 End Date:	
    540 Base Tag:	yamt-lazymbuf-base4
    541 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    542 Scope:		src/sys  (src/common is tagged but not branched)
    543 Notes:		
    544 
    545 Branch:		reinoud-bufcleanup
    546 Description:	implement and evaluate struct buf usage cleanup strategies.
    547 		Ideas currently in mind (preference for b):
    548 		a)
    549 			1. use of bio_ops per buffer.
    550 			2. allow chaining/overloading of functions in bio_ops
    551 			   and provide some private context.
    552 			3. extend the bio_ops with commenly used functionality
    553 			   like pending action counting, custom context passing,
    554 			   last minute processing of buffer data, buffer cache
    555 			   etc.
    556 			4. investigate the use of the kcont()
    557 			   continuation-passing framework for async io
    558 			   completion notification for bufs
    559 			...
    560 		b)
    561 			1. all sequencing use of B_CALL replaced by
    562 			   device-threads, if possible generic code around BUFQ
    563 			2. possibly use kcont() for async IO finished signalling
    564 			3. counter of pending and queued actions requestable
    565 			   by IOCTL interface?
    566 			4. implement `last minute buffer fixup' calls and maybe
    567 			   even finished I/O calls as vnode operations
    568 			...
    569 Status:		Active
    570 Start Date:	Thu Mar 15 2007
    571 End Date:
    572 Base Tag:	reinoud-bufcleanup-base
    573 Maintainer:	Reinoud Zandijk <reinoud (a] NetBSD.org>
    574 Scope:		src/sys and src/common
    575 Notes:		Used as expiriment sandbox and if successful hopefully one day
    576 		to be intergrated.
    577 
    578 
    579 ########################################################################
    580 # Individual developers' branches (Terminated):
    581 ########################################################################
    582 
    583 Branch:		bouyer-scsipi
    584 Description:	Integration of atapi support
    585 Status:		Terminated
    586 Start Date:
    587 End Date:
    588 Base Tag:
    589 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    590 Scope:		kernel
    591 Notes:		Superseded by thorpej_scsipi
    592 
    593 Branch:		bouyer-xen2
    594 Description:	update xen port to xen 2.0, with support for domain0 operations
    595 Status:		Terminated
    596 Start Date:	Dec 13 2004
    597 End Date:	Mar 10 2005
    598 Base Tag:	netbsd-2-base
    599 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    600 Scope:		src/sys/arch/xen
    601 Notes:
    602 
    603 Branch: 	chap-midi
    604 Description:	Renovation of MIDI support
    605 Status: 	Terminated; merged to -current
    606 Start Date:	19 May 2006
    607 End Date:	30 Jun 2006
    608 Base Tag:	chap-midi-base
    609 Maintainer:	Chapman Flack <chap (a] NetBSD.org>
    610 Scope:		sys, share/man, usr.bin
    611 Notes:
    612 
    613 Branch:		chs-ubc
    614 Description:	Unified Buffer Cache
    615 Status:		Terminated
    616 Start Date:
    617 End Date:
    618 Base Tag:	chs-ubc-base
    619 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    620 Scope:		kernel
    621 Notes:
    622 
    623 Branch:		chs-ubc2
    624 Description:	 Unified Buffer Cache
    625 Status:		Terminated; merged to -current
    626 Start Date:
    627 End Date:
    628 Base Tag:	chs-ubc2-base, chs-ubc2-newbase
    629 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    630 Scope:		kernel
    631 Notes:
    632 
    633 Branch:		cjs-build-against-obj-dir
    634 Description:	?
    635 Status:		?
    636 Start Date:
    637 End Date:
    638 Base Tag:
    639 Maintainer:	Curt Sampson <cjs (a] NetBSD.org>
    640 Scope:		Entire tree.
    641 Notes:
    642 
    643 Branch:		eeh-paddr_t
    644 Description:	use separate types for virtual vs. physical addresses
    645 Status:		Terminated; merged to -current
    646 Start Date:
    647 End Date:
    648 Base Tag:	eeh-paddr_t-base
    649 Maintainer:	Eduardo Horvath <eeh (a] NetBSD.org>
    650 Scope:		kernel
    651 Notes:		This is needed to support 32-bit kernels on sparc64.
    652 
    653 Branch:		elad-kernelauth
    654 Description:	Native NetBSD implementation of Apple's kernel authorization
    655 		based on TN2127. This is a "clean-room" implementation to
    656 		avoid any licensing issues.
    657 Status:		Terminated; merged to -current
    658 Start Date:	Tue Mar	 7 2006
    659 End Date:	Mon May 15 2006
    660 Base Tag:	elad-kernelauth-base
    661 Maintainer:	Elad Efrat <elad (a] NetBSD.org>
    662 Scope:		src/sys, src/share/man/man9/Makefile,
    663 		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
    664 Notes:
    665 
    666 Branch:		fvdl-softdep
    667 Description:	FFS soft dependencies
    668 Status:		Terminated; merged to -current
    669 Start Date:
    670 End Date:
    671 Base Tag:	fvdl-softdep-base
    672 Maintainer:	Frank van der Linden <fvdl (a] NetBSD.org>
    673 Scope:		kernel
    674 Notes:
    675 
    676 Branch:		gehenna-devsw
    677 Description:	auto-generation of devsw table
    678 Status:		Terminated
    679 Start Date:	16 May 2002
    680 End Date:	6 Sep 2002
    681 Base Tag:	gehenna-devsw-base
    682 Maintainer:	MAEKAWA Masahide <gehenna (a] NetBSD.org>
    683 Scope:		syssrc
    684 Notes:		The goal is to get rid of the existing device switch tables in
    685 		port-dependent conf.c and to generate them dynamically by
    686 		config(8).
    687 
    688 Branch:		is-newarp
    689 Description:	ARP for non-Ethernet
    690 Status:		Terminated; merged before NetBSD 1.3
    691 Start Date:	1996/10/13
    692 End Date:	1997/03/15
    693 Base Tag:	is-newarp-base
    694 Maintainer:	Ignatios Souvatzis <is (a] NetBSD.org>
    695 Scope:		kernel
    696 Notes:
    697 
    698 Branch:		kenh-if-detach
    699 Description:	Interface detach support.
    700 Status:		?
    701 Start Date:
    702 End Date:
    703 Base Tag:	kenh-if-detach-base
    704 Maintainer:	Ken Hornstein <kenh (a] NetBSD.org>
    705 Scope:		kernel
    706 Notes:
    707 
    708 Branch:		kent-audio1
    709 Description:	Audio converter pipeline
    710 Status:		Terminated; merged to -current
    711 Start Date:	Tue Dec  7 2004
    712 End Date:	Tue Jan 11 2005
    713 Base Tag:	kent-audio1-base
    714 Maintainer:	TAMURA Kent <kent (a] NetBSD.org>
    715 Scope:		kernel (audio device drivers)
    716 Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
    717 		Please consult with the maintainer before committing
    718 		to this branch.
    719 
    720 Branch:		kqueue
    721 Description:	kqueue kernel event notification mechanism (from FreeBSD)
    722 Status:		Terminated; merged to -current
    723 Start Date:	Tue Jul 10 23:08:38 EST 2001
    724 End Date:	Tue Oct 24 09:14:14 GMT 2002
    725 Base Tag:	kqueue-base
    726 Maintainer:	Jaromir Dolecek <jdolecek (a] NetBSD.org>
    727 Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
    728 Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
    729 		local internal changes to better suit NetBSD, and
    730 		enhancements such as looking up filters by name or
    731 		number, and dynamic registration of "user" filters.
    732 		The work is complete as is, but is awaiting more
    733 		feedback from various kernel gurus before going mainline.
    734 
    735 Branch:		ktrace-lwp
    736 Description:	ktrace support for lwp ids.
    737 Status:		Terminated; merged to -current
    738 Start Date:	Wed Jul  2 15:27:30 UTC 2003
    739 End Date:	Sun Dec 11 12:25:29 UTC 2005
    740 Base Tag:	ktrace-lwp-base
    741 Maintainer:	Darren Reed <darrenr (a] NetBSD.org>
    742 Scope:		sys
    743 Notes:		
    744 
    745 Branch:		marc-pcmcia
    746 Description:	PCMCIA support
    747 Status:		Terminated; merged to -current
    748 Start Date:
    749 End Date:
    750 Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
    751 Maintainer:	Marc Horowitz <marc (a] NetBSD.org>
    752 Scope:		kernel
    753 Notes:
    754 
    755 Branch:		minoura_x68k_bus_h
    756 Description:	bus_space(9) and bus_dma(9) implementation for x68k
    757 Status:		Terminated; merged to -current
    758 Start Date:	23 Dec 1998
    759 End Date:	16 Mar 1999
    760 Base Tag:	minoura_x68k_bus_h-base
    761 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    762 Scope:		sys/arch/x68k
    763 Notes:
    764 
    765 Branch:		minoura-xpg4dl
    766 Description:	Citrus Project locale subsystem
    767 Status:		Terminated; (partly) merged to -current
    768 Start Date:	28 March 2000
    769 End Date:
    770 Base Tag:	minoura-xpg4dl-base
    771 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    772 Scope:		basesrc, syssrc, sharesrc
    773 Notes:		Citrus Project is developing dynamically-loadable, codeset-
    774 		independent locale subsystem.  Part of the implementation
    775 		(LC_CTYPE) called XPG4DL is now integrated to -current.
    776 
    777 Branch:		mjf-ufs-trans
    778 Description:	filesystem transactions for ufs
    779 Status:		Active
    780 Start Date:	12 March 2007
    781 End Date:
    782 Base Tag:	mjf-ufs-trans-base
    783 Maintainer:	Matt Fleming <mjf (a] NetBSD.org>
    784 Scope:		kernel
    785 Notes:
    786 
    787 Branch:		mrg-vm-swap
    788 Description:	dynamic swap allocation, swap-to-files support
    789 Status:		Terminated; abondoned for mrg-vm-swap2
    790 Start Date:	12 February 1997
    791 End Date:	15 March 1997
    792 Base Tag:	[none]
    793 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
    794 Scope:		kernel
    795 Notes:
    796 
    797 Branch:		mrg-vm-swap2
    798 Description:	dynamic swap allocation, swap-to-files support
    799 Status:		Terminated; merged to -current
    800 Start Date:	4 May 1997
    801 End Date:	12 June 1997
    802 Base Tag:	mrg-vm-swap2-base
    803 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
    804 Scope:		kernel
    805 Notes:
    806 
    807 Branch:		nathanw_sa
    808 Description:	Scheduler activations
    809 Status:		Terminated; merged to -current
    810 Start Date:	5 March 2001
    811 End Date:	18 January 2003
    812 Base Tag:	nathanw_sa_base
    813 Maintainer:	Nathan Williams <nathanw (a] NetBSD.org>
    814 Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
    815 		bin/ps usr.bin/systat usr.bin/top usr.bin/w
    816 		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
    817 Notes:		The idea of scheduler activations is described in the
    818 		classic paper by Anderson et al., in ACM Transactions
    819 		a on Computer Systems volume 10 issue 1 (1992),which
    820 		can be found at
    821 		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
    822 		Many ideas in the implementation are based on the
    823 		implementation of scheduler activations added to Mach
    824 		3.0 and described by Davis et al. in the University of
    825 		Washington CS tech report 92-08-93, which can be found
    826 		at
    827 		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
    828 
    829 		My USENIX paper on the subject can be found at
    830 		http://web.mit.edu/nathanw/www/usenix/
    831 
    832 		Please consult with the maintainer before committing
    833 		to this branch.
    834 		Other tags starting with nathanw_sa reserved for
    835 		branch management and are not guaranteed to be stable.
    836 
    837 		Trunk tagged with "nathanw_sa_before_merge" prior to
    838 		merging branch down to trunk.  Branch tagged with
    839 		"nathanw_sa_end" to indicate the ending revision of
    840 		the branch.
    841 
    842 Branch:		perseant-lfsv2
    843 Description:	LFS incompatible on-disk data structure changes
    844 Status:		Terminated
    845 Start Date:	27 June 2001
    846 End Date:	16 July 2001
    847 Base Tag:	perseant-lfsv2-base
    848 Maintainer:	Konrad Schroder <perseant (a] NetBSD.org>
    849 Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
    850 Notes:		This branch should be short-lived, I expect to merge as soon
    851 		as the data structures required for unremove are in and tested.
    852 
    853 Branch:		peter-altq
    854 Description:	New ALTQ framework:
    855 		- sync with KAME sources
    856 		- share mtag/name mapping functions
    857 		- separate altq + pf attachment
    858 Status:		Terminated; merged to -current
    859 Start Date:	March 16, 2006
    860 End Date:	October 12, 2006
    861 Base Tag:	peter-altq-base
    862 Maintainer:	Peter Postma <peter (a] NetBSD.org>,
    863 		Martin Husemann <martin (a] NetBSD.org>,
    864 		Matthias Scheler <tron (a] NetBSD.org>
    865 Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
    866 Notes:		Only the first item in the description was finished
    867 		in this branch.
    868 
    869 Branch:		sommerfeld_i386mp_1
    870 Description:	Multiprocessor support for i386 using Intel MP BIOS.
    871 Status:		Terminated; merged to -current
    872 Start Date:	21 Feb 2000
    873 End Date:	01 Oct 2002
    874 Base Tag:	sommerfeld_i386mpbase_1
    875 Maintainer:	Bill Sommerfeld <sommerfeld (a] NetBSD.org>
    876 Scope:		sys/arch/i386
    877 Notes:
    878 		Code committed to the branch has booted to multiuser 
    879 		on at least one system.
    880 
    881 		Not guaranteed to compile against mainline since -current
    882 		may have changed incompatibly with the last branch update;
    883 		use "cvs update -D" to roll-back the rest of the tree to match.
    884 
    885 		Please get explicit permission from the maintainer 
    886 		before each commit, or your changes will be backed out.
    887 		Other tags starting with sommerfeld_ are private to 
    888 		the developer and are guaranteed to be unstable.
    889 		Only the maintainer should move tags.
    890 
    891 		Note that this branch uses a DIFFERENT scheme for 
    892 		synching with the mainline.  the maintainer uses some private
    893 		scripts for keeping them in synch; if you make commits 
    894 		to the branch to "resynchronize" things, you'll
    895 		probably do it wrong; instead, ask the maintainer to
    896 		resynchronize things.
    897 
    898 		See sys/arch/i386/TODO on the branch for a list of known
    899 		issues with the branch.
    900 
    901 Branch:		thorpej-mips-cache
    902 Description:	overhaul MIPS cache support code
    903 Status:		Terminated; merged to -current
    904 Start Date:	Oct 23 2001
    905 End Date:	Nov 14 2001
    906 Base Tag:	thorpej-mips-cache-base
    907 Scope:		syssrc
    908 Notes:		This branch needs more debugging, testing, and more
    909 		ports need to be converted to the new world order.
    910 
    911 		The following processors have had cache ops
    912 		written:
    913 
    914 			* R2000/R3000 (cache_r3k) -- light testing,
    915 			  needs to be beat on a lot more to make
    916 			  sure it's working.
    917 
    918 			* R4000/R4400 (cache_r4k) -- mhitch (a] NetBSD.org
    919 			  tracked down a bug, which has been fixed.
    920 
    921 			  Confirmed working on R4000-with-L2.
    922 
    923 			  Confirmed working on R4400-no-L2 and
    924 			  R4400-with-L2.
    925 
    926 			* R4600/R5000 (cache_r5k) -- shin (a] NetBSD.org
    927 			  has committed fixes to this code.
    928 
    929 			  Confirmed working on R4600 v2 (SGI IP-22 with
    930 			  no SysAD L2 cache).
    931 
    932 			  Confirmed working on RM5260 (Algorithmics P-5064).
    933 
    934 			* TX39 (cache_tx39) -- uch (a] NetBSD.org has
    935 			  committed fixes to this code.  Awaiting
    936 			  confirmation that it is working properly.
    937 
    938 			* R5900 (cache_r5900) -- uch (a] NetBSD.org has
    939 			  written this code and tested it on a
    940 			  PlayStation 2.
    941 
    942 		The following ports have been updated to compile (and
    943 		use optimized-for-processor bus_dma routines).  Those
    944 		that have been tested and work are marked with [WORKING].
    945 
    946 			* algor		[WORKING]
    947 
    948 			* arc		[WORKING]
    949 
    950 			* pmax		[WORKING]
    951 
    952 			* playstation2	[WORKING]
    953 					Needs optimized bus_dmamap_sync().
    954 
    955 			* hpcmips	[need verification that this is working]
    956 					Needs optimized bus_dmamap_sync().
    957 
    958 			* sgimips	[WORKING]
    959 					Needs optimized bus_dmamap_sync().
    960 
    961 			* cobalt	[need testing]
    962 
    963 			* mipsco	[need testing]
    964 
    965 			* newsmips	[need testing]
    966 
    967 Branch:		thorpej_scsipi
    968 Description:	SCSI/ATAPI midlayer rewrite.
    969 Status:		Terminated; merged to -current
    970 Start Date:
    971 End Date:	Apr 25 2001
    972 Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
    973 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>,
    974 		Jason Thorpe <thorpej (a] NetBSD.org>
    975 Scope:		syssrc
    976 Notes:		When a change from -current is pulled up please move the
    977 		thorpej_scsipi_base tag to the revision you're syncing with.
    978 		thorpej_scsipi_nbase is private to maintainer (only
    979 		used when syncing the whole branch with HEAD).
    980 		Just before the merge, syssrc has been tagged with
    981 		thorpej_scsipi_beforemerge
    982 
    983 Branch:		thorpej-signal
    984 Description:	?
    985 Status:		?
    986 Start Date:
    987 End Date:
    988 Base Tag:	thorpej-signal-base
    989 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
    990 Scope:		kernel
    991 Notes:
    992 
    993 Branch:		thorpej-setroot
    994 Description:	?
    995 Status:		Terminated; merged to -current
    996 Start Date:
    997 End Date:
    998 Base Tag:
    999 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
   1000 Scope:		kernel
   1001 Notes:
   1002 
   1003 Branch:		simonb-timecounters
   1004 Description:	Port FreeBSD timecounters to NetBSD
   1005 Status:		Terminated
   1006 Start Date:	Sat Feb 04 2006
   1007 End Date:	Wed Jun 07 2006
   1008 Base Tag:	simonb-timecounters-base
   1009 Maintainer:	Simon Burge <simonb (a] NetBSD.org>,
   1010 		Frank Kardel <kardel (a] NetBSD.org>
   1011 Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
   1012 Notes:		early (partial conversion) commit to -current
   1013 		ok'ed by core@ on 20060605 for testing and further
   1014 		simplified conversion
   1015 
   1016 Branch:		wrstuden-devbsize
   1017 Description:	Modify buffer cache to deal with different devices having
   1018 		different block sizes. Also DEV_BSIZE would go away.
   1019 Status:		Terminated
   1020 Start Date:	Aug or Sept 1999
   1021 End Date:	1 Apr 2000
   1022 Base tag:	wrstuden-devbsize-base
   1023 Maintainer:	Bill Studenmund <wrstuden (a] NetBSD.org>
   1024 Scope:		kernel
   1025 Notes:		No longer active due to lack of time, and introduction
   1026 		of UBC. In terms of UBC, the primary cache for
   1027 		file data is the VM cache, which needs to operate
   1028 		in terms of VM pages. As no existing device has native
   1029 		pages the same size as our VM pages, there already is
   1030 		a mapping going on between the VM system and the
   1031 		underlying blocks. So it would be easier and cleaner
   1032 		to adjust that to deal w/ different block sizes.
   1033 		Also with UBC, all i/o is in terms of bytes at an offset
   1034 		with a certain length, so the exact block size isn't a big
   1035 		deal.
   1036 
   1037 		Any other wrstuden-devbsize tag may (and should) go away.
   1038 
   1039 Branch:		yamt-km, yamt-km-doc
   1040 Description:	simplify/improve kernel memory management and bootstrap
   1041 Status:		Terminated; merged to -current
   1042 Start Date:	Tue Jan 25 2005
   1043 End Date:	Fri Apr  1 2005
   1044 Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
   1045 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1046 Scope:		yamt-km: src/sys
   1047 		yamt-km-doc: src/share/man/man9/uvm.9
   1048 Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
   1049 
   1050 		the followings are per-port status.
   1051 		(account names mean "tested by".)
   1052 
   1053 		works enough to go to multiuser:
   1054 			alpha, i386, xen (yamt@)
   1055 			pc532 (simonb@)
   1056 			alpha, i386, mac68k, macppc, pmax, shark,
   1057 			    sparc, sparc64, sun3, x68k (chs@)
   1058 			cobalt, dreamcast, hp300, news68k, newsmips,
   1059 			    sun3x (tsutsui@)
   1060 			amiga (mhitch@)
   1061 			cats, hp700 (skrll@)
   1062 			xen (bouyer@)
   1063 
   1064 		known to have the same problem as trunk:
   1065 			vax (chs@, stuck while running kvm_mkdb)
   1066 
   1067 		known to have a problem:
   1068 			luna68k (and, if any, other m68k ports which use TTR)
   1069 			needs to be revisited.
   1070 			-> for luna68k, although not tested,
   1071 			   Sysmap has been moved to avoid kva conflict with
   1072 			   I/O ranges.
   1073 
   1074 		buildable:
   1075 			src/sys/arch/acorn26/conf/GENERIC
   1076 			src/sys/arch/acorn32/conf/GENERIC
   1077 			src/sys/arch/algor/conf/P6032
   1078 			src/sys/arch/alpha/conf/GENERIC
   1079 			src/sys/arch/alpha/conf/GENERIC.MP
   1080 			src/sys/arch/amd64/conf/GENERIC
   1081 			src/sys/arch/amd64/conf/GENERIC.MP
   1082 			src/sys/arch/amiga/conf/GENERIC
   1083 			src/sys/arch/arc/conf/GENERIC
   1084 			src/sys/arch/atari/conf/MILAN-PCIIDE
   1085 			src/sys/arch/bebox/conf/GENERIC
   1086 			src/sys/arch/cats/conf/GENERIC
   1087 			src/sys/arch/cesfic/conf/GENERIC
   1088 			src/sys/arch/cobalt/conf/GENERIC
   1089 			src/sys/arch/dreamcast/conf/GENERIC
   1090 			src/sys/arch/evbarm/conf/TS7200
   1091 			src/sys/arch/evbppc/conf/WALNUT
   1092 			src/sys/arch/evbsh3/conf/COMPUTEXEVB
   1093 			src/sys/arch/evbsh5/conf/CAYMAN64
   1094 			src/sys/arch/hp300/conf/GENERIC
   1095 			src/sys/arch/hp700/conf/GENERIC
   1096 			src/sys/arch/hpcarm/conf/JORNADA728
   1097 			src/sys/arch/hpcmips/conf/GENERIC
   1098 			src/sys/arch/hpcsh/conf/GENERIC
   1099 			src/sys/arch/hpcsh/conf/HPW650PA
   1100 			src/sys/arch/i386/conf/GENERIC
   1101 			src/sys/arch/i386/conf/GENERIC.MP
   1102 			src/sys/arch/i386/conf/XEN0
   1103 			src/sys/arch/i386/conf/XENU
   1104 			src/sys/arch/ibmnws/conf/GENERIC
   1105 			src/sys/arch/iyonix/conf/GENERIC
   1106 			src/sys/arch/luna68k/conf/GENERIC
   1107 			src/sys/arch/mac68k/conf/GENERIC
   1108 			src/sys/arch/macppc/conf/GENERIC
   1109 			src/sys/arch/macppc/conf/GENERIC.MP
   1110 			src/sys/arch/mipsco/conf/GENERIC
   1111 			src/sys/arch/mmeye/conf/GENERIC
   1112 			src/sys/arch/mvme68k/conf/GENERIC
   1113 			src/sys/arch/netwinder/conf/GENERIC
   1114 			src/sys/arch/news68k/conf/GENERIC
   1115 			src/sys/arch/newsmips/conf/GENERIC
   1116 			src/sys/arch/next68k/conf/GENERIC
   1117 			src/sys/arch/ofppc/conf/GENERIC
   1118 			src/sys/arch/pc532/conf/GENERIC
   1119 			src/sys/arch/pmax/conf/GENERIC
   1120 			src/sys/arch/prep/conf/GENERIC
   1121 			src/sys/arch/sandpoint/conf/GENERIC
   1122 			src/sys/arch/sbmips/conf/GENERIC
   1123 			src/sys/arch/sgimips/conf/GENERIC32_IP3x
   1124 			src/sys/arch/shark/conf/GENERIC
   1125 			src/sys/arch/sparc/conf/GENERIC
   1126 			src/sys/arch/sparc/conf/GENERIC.MP
   1127 			src/sys/arch/sparc64/conf/GENERIC
   1128 			src/sys/arch/sparc64/conf/GENERIC.MP
   1129 			src/sys/arch/sun2/conf/GENERIC
   1130 			src/sys/arch/sun3/conf/GENERIC
   1131 			src/sys/arch/vax/conf/GENERIC
   1132 			src/sys/arch/vax/conf/GENERIC.MP
   1133 			src/sys/arch/x68k/conf/GENERIC
   1134 
   1135 			src/sys/arch/playstation2/conf/GENERIC
   1136 
   1137 Branch:		yamt-pdpolicy
   1138 Description:	play with page replacement policy
   1139 		- separate page replacement policy from the rest of kernel
   1140 		- implement alternative replacement policy
   1141 		- related read-ahead adjustment?
   1142 Status:		Terminated; merged to -current
   1143 Start Date:	Sun Mar  5 2006
   1144 End Date:	Sat Sep 16 2006
   1145 Base Tag:	yamt-pdpolicy-base9
   1146 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1147 Scope:		src/sys  (src/common is tagged but not branched)
   1148 Notes:		
   1149 
   1150 Branch:		yamt-readahead
   1151 Description:	play with file readahead
   1152 Status:		Terminated; merged to -current
   1153 Start Date:	Mon Nov 14 2005
   1154 End Date:	Wed Nov 30 2005
   1155 Base Tag:	yamt-readahead-base3
   1156 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1157 Scope:		src/sys
   1158 Notes:		
   1159 
   1160 Branch:		yamt-uio_vmspace
   1161 Description:	uio_lwp/uio_segflg -> uio_vmspace
   1162 Status:		Terminated; merged to -current
   1163 Start Date:	Mon Dec 31 2005
   1164 End Date:	Wed Mar  1 2006
   1165 Base Tag:	yamt-uio_vmspace-base5
   1166 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1167 Scope:		src/sys
   1168 Notes:		
   1169 
   1170 Branch:		yamt-splraiseipl
   1171 Description:	finish implementing splraiseipl (and makeiplcookie).
   1172 		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
   1173 
   1174 		- completes workqueue(9) and netbt.
   1175 		- fix PR/33218.
   1176 
   1177 Status:		Terminated; merged to -current
   1178 Start Date:	Mon Sep 18 2006
   1179 End Date:	Fri Dec 22 2006
   1180 Base Tag:	yamt-splraiseipl-base5
   1181 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1182 Scope:		src/sys  (src/common is tagged but not branched)
   1183 Notes:		
   1184 		tested (by who):
   1185 			alpha		(yamt)
   1186 			alpha		(pavel)
   1187 			amd64		(reported privately)
   1188 			cobalt		(tsutsui)
   1189 			ews4800mips	(tsutsui)
   1190 			hp300		(tsutsui)
   1191 			hpcarm		(reported privately)
   1192 			i386		(yamt)
   1193 			macppc		(tsutsui)
   1194 			news68k		(tsutsui)
   1195 			sgimips(IP32)	(tsutsui)
   1196 			sparc(sun4c)	(tsutsui)
   1197 			sun2		(tsutsui)
   1198 			sun3		(tsutsui)
   1199 			sun3x		(tsutsui)
   1200 			xen		(yamt)
   1201 
   1202 		compile-tested:
   1203 			acorn26
   1204 			acorn32
   1205 			algor
   1206 			amiga
   1207 			arc
   1208 			atari
   1209 			bebox
   1210 			cats
   1211 			cesfic
   1212 			dreamcast
   1213 			evbarm
   1214 			evbmips
   1215 			evbppc(marvell)
   1216 			evbppc(ibm4xx)
   1217 			evbsh3
   1218 			hp700
   1219 			hpcmips
   1220 			hpcsh
   1221 			ia64
   1222 			ibmnws
   1223 			iyonix
   1224 			landisk
   1225 			luna68k
   1226 			mac68k
   1227 			mmeye
   1228 			mvme68k
   1229 			mvmeppc
   1230 			mipsco
   1231 			netwinder
   1232 			newsmips
   1233 			next68k
   1234 			ofppc
   1235 			pc532
   1236 			pmax
   1237 			pmppc
   1238 			prep
   1239 			sandpoint
   1240 			sbmips
   1241 			shark
   1242 			sparc
   1243 			sparc64
   1244 			vax
   1245 			x68k
   1246 			zaurus
   1247 
   1248 		not tested:
   1249 			pdp10 (i don't know how to build)
   1250 			sh5 (not buildable with an unrelated problem.)
   1251 
   1252     compile  CAYMAN64/netbsd32_sa.o
   1253     cc1: warnings being treated as errors
   1254     /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c: In function 'netbsd32_sa_ucsp':
   1255     /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c:126: warning: implicit declaration of function '_UC_MACHINE32_SP'
   1256     --- netbsd32_sa.o ---
   1257     *** [netbsd32_sa.o] Error code 1
   1258     1 error
   1259 
   1260 		notyet:
   1261 			amigappc
   1262 			playstation2
   1263 
   1264 Branch:		yamt-vop
   1265 Description:	remove several VOPs
   1266 Status:		Terminated; merged to -current
   1267 Start Date:	Wed Oct 19 2005
   1268 End Date:	Wed Nov  2 2005
   1269 Base Tag:	yamt-vop-base3
   1270 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1271 Scope:		src/sys
   1272 Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
   1273 
   1274 Branch:		gdamore-uart
   1275 Description:	Add register table support to com driver.
   1276 Status:		Active
   1277 Start Date:	14 June 2006
   1278 End Date:	13 July 2006
   1279 Base Tag:	gdamore-uart-base
   1280 Maintainer:	Garrett D'Amore <gdamore (a] NetBSD.org>
   1281 Scope:		kernel
   1282 Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
   1283 		com support, and also removes a nasty hack from Atheros com.
   1284 
   1285 ########################################################################
   1286 # Other:
   1287 ########################################################################
   1288 
   1289 Branch:		magnum
   1290 Description:	?
   1291 Status:		?
   1292 Start Date:
   1293 End Date:
   1294 Base Tag:	magnum-base
   1295 Maintainer:	?
   1296 Scope:		kernel
   1297 Notes:
   1298 
   1299