Home | History | Annotate | Line # | Download | only in doc
BRANCHES revision 1.185
      1 #	$NetBSD: BRANCHES,v 1.185 2007/04/27 06:33:04 thorpej 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:		vmlocking
    406 Description:	Make memory allocators and trap handling MP safe
    407 Status:		Active
    408 Start Date:	13 March 2007
    409 End Date:
    410 Base Tag:	vmlocking-base
    411 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
    412 Scope:		kernel
    413 Notes:
    414 		- Replace all simplelocks with mutexes
    415 		- Remove spinlockmgr
    416 		- Make memory allocators MP safe
    417 		- Make trap handling MP safe: push kernel lock acquire
    418 		  back into pager ops.
    419 
    420 		Only i386 is currently update.  Most per architecture
    421 		changes need to be made in the pmap module.  LFS is not
    422 		currently stable due interaction between the pagedaemon (?)
    423 		and the HOLDRELE() in lfs_segment.c.  It may trash your
    424 		filesystem..
    425 
    426 		Most of the locks replaced are now sleep/adaptive locks or
    427 		spin locks at IPL_VM.  Assuming audio interrupt handlers
    428 		are made MP safe there are far fewer potential deadlocks
    429 		against the kernel lock.
    430 
    431 		v_interlock becomes an adaptive mutex so now acquring
    432 		it can potentially block, similarly for other locks
    433 		that were before simplelocks.  This needs to be audited
    434 		carefully.
    435 
    436 		Use vnodes in general needs to be audited, as vnodes can
    437 		now be inspected without the kernel lock held.
    438 
    439 		Acquiring locks in the pmap module can now block, meaning
    440 		that the current pmap, cpu or lazy pmap status can change
    441 		out from underneath the requestor.  This also needs to be
    442 		audited.
    443 
    444 		Currently, i386 has the necessary modifications, and has
    445 		trap handling and a few calls to allocators out from under
    446 		the kernel lock.  There are still problems that need to be
    447 		debugged.
    448 
    449 		Need to check that whenever a lock is initialized, it is
    450 		also destroyed.
    451 
    452 		Lots of testing required.
    453 
    454 Branch:		yamt-idlelwp
    455 Description:	idle lwp, and some changes depending on it.
    456 
    457 		1. separate context switching and thread scheduling.
    458 		   (cf. gmcgarry_ctxsw)
    459 		2. implement idle lwp.
    460 		3. clean up related MD/MI interfaces.
    461 		4. make scheduler(s) modular.
    462 
    463 Status:		Active
    464 Start Date:	Fri Feb 17 2007
    465 End Date:	
    466 Base Tag:	yamt-idlelwp-base5
    467 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    468 Scope:		src/sys  (src/common is tagged but not branched)
    469 Notes:		
    470 		Status of ports (minimal goals):
    471 		  alpha			[ Done,
    472 					  UP tested, MP not tested ]
    473 		  i386			[ Done, tested ]
    474 		  amd64			[ Done, tested ]
    475 		  mips			[ Done, MIPS1 tested, MIPSX needs
    476 					  further testing + fixes ]
    477 		  sparc			[ WIP ]
    478 		  sparc64		[ WIP ]
    479 		  arm			[ Done, SA1 tested. ]
    480 		  macppc/powerpc	[ Done, OEA tested ]
    481 		  hppa			[ WIP. SYSCALLGATE trap issues remain. ]
    482 		  sh3			[ Done, tested ]
    483 		  vax			[ Done, UP tested, MP untested ]
    484 
    485 		How to adapt a port?
    486 
    487 		- unify cpu_switch, cpu_exit, cpu_switchto into
    488 		  a single cpu_switchto.  see cpu_switchto.9.
    489 
    490 		- implement cpu_idle.  see cpu_idle.9.
    491 
    492 		- add a flag argument to cpu_need_resched.
    493 		  handle RESCHED_IMMED flag, which means "cause a preemption
    494 		  as soon as possible."  eg. in the case of MULTIPROCESSOR,
    495 		  send an IPI to the target cpu.
    496 
    497 		- "curlwp == NULL" is not a valid check for idle state anymore.
    498 		  use "(curlwp->l_flag & LW_IDLE) != 0" instead.  curlwp is
    499 		  almost always non-NULL, with exceptions like early on boot.
    500 
    501 		- remove idle pcbs.
    502 
    503 		- (if MULTIPROCESSOR) tweak processor trampoline code.
    504 
    505 		- (if MULTIPROCESSOR) call mi_cpu_attach when attaching
    506 		  secondary processors.
    507 
    508 		- (if schedhz!=0) call schedclock regardless of the value of
    509 		  curlwp.
    510 
    511 		- of course, update MD users of scheduler/switching API.
    512 
    513 Branch:		yamt-lazymbuf
    514 Description:	implement and evaluate lazy mapping of mbuf external data pages
    515 		it's intended as the first step of larger changes.
    516 			1. support operations (esp. bus_dma load) on
    517 			   unmapped mbuf.
    518 			2. unify mbuf and buf.
    519 			   (or, at least some parts of them)
    520 			3. then it should be trivial to implement
    521 			   i/o coalescing, etc.
    522 Status:		Active
    523 Start Date:	Wed Jul  6 2005
    524 End Date:	
    525 Base Tag:	yamt-lazymbuf-base4
    526 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    527 Scope:		src/sys  (src/common is tagged but not branched)
    528 Notes:		
    529 
    530 Branch:		reinoud-bufcleanup
    531 Description:	implement and evaluate struct buf usage cleanup strategies.
    532 		Ideas currently in mind (preference for b):
    533 		a)
    534 			1. use of bio_ops per buffer.
    535 			2. allow chaining/overloading of functions in bio_ops
    536 			   and provide some private context.
    537 			3. extend the bio_ops with commenly used functionality
    538 			   like pending action counting, custom context passing,
    539 			   last minute processing of buffer data, buffer cache
    540 			   etc.
    541 			4. investigate the use of the kcont()
    542 			   continuation-passing framework for async io
    543 			   completion notification for bufs
    544 			...
    545 		b)
    546 			1. all sequencing use of B_CALL replaced by
    547 			   device-threads, if possible generic code around BUFQ
    548 			2. possibly use kcont() for async IO finished signalling
    549 			3. counter of pending and queued actions requestable
    550 			   by IOCTL interface?
    551 			4. implement `last minute buffer fixup' calls and maybe
    552 			   even finished I/O calls as vnode operations
    553 			...
    554 Status:		Active
    555 Start Date:	Thu Mar 15 2007
    556 End Date:
    557 Base Tag:	reinoud-bufcleanup-base
    558 Maintainer:	Reinoud Zandijk <reinoud (a] NetBSD.org>
    559 Scope:		src/sys and src/common
    560 Notes:		Used as expiriment sandbox and if successful hopefully one day
    561 		to be intergrated.
    562 
    563 Branch:		thorpej-atomic
    564 Description:	Implementation of an atomic memory operations API modeled
    565 		after the one in Solaris 10.
    566 Status:		Active
    567 Start Date:	Apr 11 2007
    568 End Date:
    569 Base tag:	thorpej-atomic-base
    570 Maintainer:	Jason Thorpe <thorpej (a] netbsd.org>
    571 Scope:		src/common
    572 		src/sys
    573 Notes:		Base atomic primitives need to be implemented for
    574 		all of the supported architectures:
    575 
    576 		alpha		DONE
    577 		arm		DONE
    578 		hppa
    579 		i386		DONE
    580 		ia64
    581 		m68k		DONE (except for 68010)
    582 		mips
    583 		ns32k
    584 		powerpc		DONE except for membar_*()
    585 		powerpc64	DONE except for membar_*()
    586 		sh3
    587 		sparc		DONE except for membar_*()
    588 		sparc64		DONE except for membar_*()
    589 		vax
    590 		x86_64		DONE
    591 
    592 		Tested:
    593 
    594 		alpha		NO
    595 		arm		NO
    596 		hppa		NO
    597 		i386		NO
    598 		ia64		NO
    599 		m68k		NO
    600 		mips		NO
    601 		ns32k		NO
    602 		powerpc		NO
    603 		powerpc64	NO
    604 		sh3		NO
    605 		sparc		NO
    606 		sparc64		NO
    607 		vax		NO
    608 		x86_64		NO
    609 
    610 		TODO:
    611 
    612 		all		- Need to replace mb_*() with membar_*().
    613 
    614 				- Audit MUTEX_CAS() and RWLOCK_CAS() uses
    615 				  to see of membar_enter() is required here.
    616 
    617 				- Talk to ad@ -- figure out of non-atomic
    618 				  mutex / rwlock release is actually safe.
    619 
    620 		arm		- Consider using a RAS technique like
    621 				  MIPS uses for _lock_cas() and the mutex
    622 				  stubs.  Possibly do more than one atomic
    623 				  op as a RAS.  Possibly implement mutex
    624 				  stubs using the technique.
    625 
    626 		m68k		- Need to do 68010 support.
    627 		
    628 		i386		- Need to change when x86_patch() is called
    629 				  so we can test ncpus.
    630 
    631 		powerpc		- Figure out if we need barriers in the
    632 				  atomic ops themselves (hopefully not!)
    633 
    634 		x86_64		- Need to change when x86_patch() is called
    635 				  so we can test ncpus.
    636 
    637 ########################################################################
    638 # Individual developers' branches (Terminated):
    639 ########################################################################
    640 
    641 Branch:		bouyer-scsipi
    642 Description:	Integration of atapi support
    643 Status:		Terminated
    644 Start Date:
    645 End Date:
    646 Base Tag:
    647 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    648 Scope:		kernel
    649 Notes:		Superseded by thorpej_scsipi
    650 
    651 Branch:		bouyer-xen2
    652 Description:	update xen port to xen 2.0, with support for domain0 operations
    653 Status:		Terminated
    654 Start Date:	Dec 13 2004
    655 End Date:	Mar 10 2005
    656 Base Tag:	netbsd-2-base
    657 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    658 Scope:		src/sys/arch/xen
    659 Notes:
    660 
    661 Branch: 	chap-midi
    662 Description:	Renovation of MIDI support
    663 Status: 	Terminated; merged to -current
    664 Start Date:	19 May 2006
    665 End Date:	30 Jun 2006
    666 Base Tag:	chap-midi-base
    667 Maintainer:	Chapman Flack <chap (a] NetBSD.org>
    668 Scope:		sys, share/man, usr.bin
    669 Notes:
    670 
    671 Branch:		chs-ubc
    672 Description:	Unified Buffer Cache
    673 Status:		Terminated
    674 Start Date:
    675 End Date:
    676 Base Tag:	chs-ubc-base
    677 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    678 Scope:		kernel
    679 Notes:
    680 
    681 Branch:		chs-ubc2
    682 Description:	 Unified Buffer Cache
    683 Status:		Terminated; merged to -current
    684 Start Date:
    685 End Date:
    686 Base Tag:	chs-ubc2-base, chs-ubc2-newbase
    687 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    688 Scope:		kernel
    689 Notes:
    690 
    691 Branch:		cjs-build-against-obj-dir
    692 Description:	?
    693 Status:		?
    694 Start Date:
    695 End Date:
    696 Base Tag:
    697 Maintainer:	Curt Sampson <cjs (a] NetBSD.org>
    698 Scope:		Entire tree.
    699 Notes:
    700 
    701 Branch:		eeh-paddr_t
    702 Description:	use separate types for virtual vs. physical addresses
    703 Status:		Terminated; merged to -current
    704 Start Date:
    705 End Date:
    706 Base Tag:	eeh-paddr_t-base
    707 Maintainer:	Eduardo Horvath <eeh (a] NetBSD.org>
    708 Scope:		kernel
    709 Notes:		This is needed to support 32-bit kernels on sparc64.
    710 
    711 Branch:		elad-kernelauth
    712 Description:	Native NetBSD implementation of Apple's kernel authorization
    713 		based on TN2127. This is a "clean-room" implementation to
    714 		avoid any licensing issues.
    715 Status:		Terminated; merged to -current
    716 Start Date:	Tue Mar	 7 2006
    717 End Date:	Mon May 15 2006
    718 Base Tag:	elad-kernelauth-base
    719 Maintainer:	Elad Efrat <elad (a] NetBSD.org>
    720 Scope:		src/sys, src/share/man/man9/Makefile,
    721 		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
    722 Notes:
    723 
    724 Branch:		fvdl-softdep
    725 Description:	FFS soft dependencies
    726 Status:		Terminated; merged to -current
    727 Start Date:
    728 End Date:
    729 Base Tag:	fvdl-softdep-base
    730 Maintainer:	Frank van der Linden <fvdl (a] NetBSD.org>
    731 Scope:		kernel
    732 Notes:
    733 
    734 Branch:		gehenna-devsw
    735 Description:	auto-generation of devsw table
    736 Status:		Terminated
    737 Start Date:	16 May 2002
    738 End Date:	6 Sep 2002
    739 Base Tag:	gehenna-devsw-base
    740 Maintainer:	MAEKAWA Masahide <gehenna (a] NetBSD.org>
    741 Scope:		syssrc
    742 Notes:		The goal is to get rid of the existing device switch tables in
    743 		port-dependent conf.c and to generate them dynamically by
    744 		config(8).
    745 
    746 Branch:		is-newarp
    747 Description:	ARP for non-Ethernet
    748 Status:		Terminated; merged before NetBSD 1.3
    749 Start Date:	1996/10/13
    750 End Date:	1997/03/15
    751 Base Tag:	is-newarp-base
    752 Maintainer:	Ignatios Souvatzis <is (a] NetBSD.org>
    753 Scope:		kernel
    754 Notes:
    755 
    756 Branch:		kenh-if-detach
    757 Description:	Interface detach support.
    758 Status:		?
    759 Start Date:
    760 End Date:
    761 Base Tag:	kenh-if-detach-base
    762 Maintainer:	Ken Hornstein <kenh (a] NetBSD.org>
    763 Scope:		kernel
    764 Notes:
    765 
    766 Branch:		kent-audio1
    767 Description:	Audio converter pipeline
    768 Status:		Terminated; merged to -current
    769 Start Date:	Tue Dec  7 2004
    770 End Date:	Tue Jan 11 2005
    771 Base Tag:	kent-audio1-base
    772 Maintainer:	TAMURA Kent <kent (a] NetBSD.org>
    773 Scope:		kernel (audio device drivers)
    774 Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
    775 		Please consult with the maintainer before committing
    776 		to this branch.
    777 
    778 Branch:		kqueue
    779 Description:	kqueue kernel event notification mechanism (from FreeBSD)
    780 Status:		Terminated; merged to -current
    781 Start Date:	Tue Jul 10 23:08:38 EST 2001
    782 End Date:	Tue Oct 24 09:14:14 GMT 2002
    783 Base Tag:	kqueue-base
    784 Maintainer:	Jaromir Dolecek <jdolecek (a] NetBSD.org>
    785 Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
    786 Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
    787 		local internal changes to better suit NetBSD, and
    788 		enhancements such as looking up filters by name or
    789 		number, and dynamic registration of "user" filters.
    790 		The work is complete as is, but is awaiting more
    791 		feedback from various kernel gurus before going mainline.
    792 
    793 Branch:		ktrace-lwp
    794 Description:	ktrace support for lwp ids.
    795 Status:		Terminated; merged to -current
    796 Start Date:	Wed Jul  2 15:27:30 UTC 2003
    797 End Date:	Sun Dec 11 12:25:29 UTC 2005
    798 Base Tag:	ktrace-lwp-base
    799 Maintainer:	Darren Reed <darrenr (a] NetBSD.org>
    800 Scope:		sys
    801 Notes:		
    802 
    803 Branch:		marc-pcmcia
    804 Description:	PCMCIA support
    805 Status:		Terminated; merged to -current
    806 Start Date:
    807 End Date:
    808 Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
    809 Maintainer:	Marc Horowitz <marc (a] NetBSD.org>
    810 Scope:		kernel
    811 Notes:
    812 
    813 Branch:		minoura_x68k_bus_h
    814 Description:	bus_space(9) and bus_dma(9) implementation for x68k
    815 Status:		Terminated; merged to -current
    816 Start Date:	23 Dec 1998
    817 End Date:	16 Mar 1999
    818 Base Tag:	minoura_x68k_bus_h-base
    819 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    820 Scope:		sys/arch/x68k
    821 Notes:
    822 
    823 Branch:		minoura-xpg4dl
    824 Description:	Citrus Project locale subsystem
    825 Status:		Terminated; (partly) merged to -current
    826 Start Date:	28 March 2000
    827 End Date:
    828 Base Tag:	minoura-xpg4dl-base
    829 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    830 Scope:		basesrc, syssrc, sharesrc
    831 Notes:		Citrus Project is developing dynamically-loadable, codeset-
    832 		independent locale subsystem.  Part of the implementation
    833 		(LC_CTYPE) called XPG4DL is now integrated to -current.
    834 
    835 Branch:		mjf-ufs-trans
    836 Description:	filesystem transactions for ufs
    837 Status:		Active
    838 Start Date:	12 March 2007
    839 End Date:
    840 Base Tag:	mjf-ufs-trans-base
    841 Maintainer:	Matt Fleming <mjf (a] NetBSD.org>
    842 Scope:		kernel
    843 Notes:
    844 
    845 Branch:		mrg-vm-swap
    846 Description:	dynamic swap allocation, swap-to-files support
    847 Status:		Terminated; abondoned for mrg-vm-swap2
    848 Start Date:	12 February 1997
    849 End Date:	15 March 1997
    850 Base Tag:	[none]
    851 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
    852 Scope:		kernel
    853 Notes:
    854 
    855 Branch:		mrg-vm-swap2
    856 Description:	dynamic swap allocation, swap-to-files support
    857 Status:		Terminated; merged to -current
    858 Start Date:	4 May 1997
    859 End Date:	12 June 1997
    860 Base Tag:	mrg-vm-swap2-base
    861 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
    862 Scope:		kernel
    863 Notes:
    864 
    865 Branch:		nathanw_sa
    866 Description:	Scheduler activations
    867 Status:		Terminated; merged to -current
    868 Start Date:	5 March 2001
    869 End Date:	18 January 2003
    870 Base Tag:	nathanw_sa_base
    871 Maintainer:	Nathan Williams <nathanw (a] NetBSD.org>
    872 Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
    873 		bin/ps usr.bin/systat usr.bin/top usr.bin/w
    874 		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
    875 Notes:		The idea of scheduler activations is described in the
    876 		classic paper by Anderson et al., in ACM Transactions
    877 		a on Computer Systems volume 10 issue 1 (1992),which
    878 		can be found at
    879 		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
    880 		Many ideas in the implementation are based on the
    881 		implementation of scheduler activations added to Mach
    882 		3.0 and described by Davis et al. in the University of
    883 		Washington CS tech report 92-08-93, which can be found
    884 		at
    885 		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
    886 
    887 		My USENIX paper on the subject can be found at
    888 		http://web.mit.edu/nathanw/www/usenix/
    889 
    890 		Please consult with the maintainer before committing
    891 		to this branch.
    892 		Other tags starting with nathanw_sa reserved for
    893 		branch management and are not guaranteed to be stable.
    894 
    895 		Trunk tagged with "nathanw_sa_before_merge" prior to
    896 		merging branch down to trunk.  Branch tagged with
    897 		"nathanw_sa_end" to indicate the ending revision of
    898 		the branch.
    899 
    900 Branch:		perseant-lfsv2
    901 Description:	LFS incompatible on-disk data structure changes
    902 Status:		Terminated
    903 Start Date:	27 June 2001
    904 End Date:	16 July 2001
    905 Base Tag:	perseant-lfsv2-base
    906 Maintainer:	Konrad Schroder <perseant (a] NetBSD.org>
    907 Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
    908 Notes:		This branch should be short-lived, I expect to merge as soon
    909 		as the data structures required for unremove are in and tested.
    910 
    911 Branch:		thorpej-devvp
    912 Description:	replace dev_t with struct vnode * in devsw entry points
    913 Status:		Terminated
    914 Start Date:	Sep 6 2001
    915 End Date:	???
    916 Base Tag:	thorpej-devvp-base
    917 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
    918 Scope:		syssrc
    919 Notes:		Kernels built from this branch are not expected
    920 		to function correctly at this time.
    921 
    922 		Ports known to compile on this branch:
    923 			alpha
    924 			i386
    925 
    926 Branch:		peter-altq
    927 Description:	New ALTQ framework:
    928 		- sync with KAME sources
    929 		- share mtag/name mapping functions
    930 		- separate altq + pf attachment
    931 Status:		Terminated; merged to -current
    932 Start Date:	March 16, 2006
    933 End Date:	October 12, 2006
    934 Base Tag:	peter-altq-base
    935 Maintainer:	Peter Postma <peter (a] NetBSD.org>,
    936 		Martin Husemann <martin (a] NetBSD.org>,
    937 		Matthias Scheler <tron (a] NetBSD.org>
    938 Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
    939 Notes:		Only the first item in the description was finished
    940 		in this branch.
    941 
    942 Branch:		sommerfeld_i386mp_1
    943 Description:	Multiprocessor support for i386 using Intel MP BIOS.
    944 Status:		Terminated; merged to -current
    945 Start Date:	21 Feb 2000
    946 End Date:	01 Oct 2002
    947 Base Tag:	sommerfeld_i386mpbase_1
    948 Maintainer:	Bill Sommerfeld <sommerfeld (a] NetBSD.org>
    949 Scope:		sys/arch/i386
    950 Notes:
    951 		Code committed to the branch has booted to multiuser 
    952 		on at least one system.
    953 
    954 		Not guaranteed to compile against mainline since -current
    955 		may have changed incompatibly with the last branch update;
    956 		use "cvs update -D" to roll-back the rest of the tree to match.
    957 
    958 		Please get explicit permission from the maintainer 
    959 		before each commit, or your changes will be backed out.
    960 		Other tags starting with sommerfeld_ are private to 
    961 		the developer and are guaranteed to be unstable.
    962 		Only the maintainer should move tags.
    963 
    964 		Note that this branch uses a DIFFERENT scheme for 
    965 		synching with the mainline.  the maintainer uses some private
    966 		scripts for keeping them in synch; if you make commits 
    967 		to the branch to "resynchronize" things, you'll
    968 		probably do it wrong; instead, ask the maintainer to
    969 		resynchronize things.
    970 
    971 		See sys/arch/i386/TODO on the branch for a list of known
    972 		issues with the branch.
    973 
    974 Branch:		thorpej-mips-cache
    975 Description:	overhaul MIPS cache support code
    976 Status:		Terminated; merged to -current
    977 Start Date:	Oct 23 2001
    978 End Date:	Nov 14 2001
    979 Base Tag:	thorpej-mips-cache-base
    980 Scope:		syssrc
    981 Notes:		This branch needs more debugging, testing, and more
    982 		ports need to be converted to the new world order.
    983 
    984 		The following processors have had cache ops
    985 		written:
    986 
    987 			* R2000/R3000 (cache_r3k) -- light testing,
    988 			  needs to be beat on a lot more to make
    989 			  sure it's working.
    990 
    991 			* R4000/R4400 (cache_r4k) -- mhitch (a] NetBSD.org
    992 			  tracked down a bug, which has been fixed.
    993 
    994 			  Confirmed working on R4000-with-L2.
    995 
    996 			  Confirmed working on R4400-no-L2 and
    997 			  R4400-with-L2.
    998 
    999 			* R4600/R5000 (cache_r5k) -- shin (a] NetBSD.org
   1000 			  has committed fixes to this code.
   1001 
   1002 			  Confirmed working on R4600 v2 (SGI IP-22 with
   1003 			  no SysAD L2 cache).
   1004 
   1005 			  Confirmed working on RM5260 (Algorithmics P-5064).
   1006 
   1007 			* TX39 (cache_tx39) -- uch (a] NetBSD.org has
   1008 			  committed fixes to this code.  Awaiting
   1009 			  confirmation that it is working properly.
   1010 
   1011 			* R5900 (cache_r5900) -- uch (a] NetBSD.org has
   1012 			  written this code and tested it on a
   1013 			  PlayStation 2.
   1014 
   1015 		The following ports have been updated to compile (and
   1016 		use optimized-for-processor bus_dma routines).  Those
   1017 		that have been tested and work are marked with [WORKING].
   1018 
   1019 			* algor		[WORKING]
   1020 
   1021 			* arc		[WORKING]
   1022 
   1023 			* pmax		[WORKING]
   1024 
   1025 			* playstation2	[WORKING]
   1026 					Needs optimized bus_dmamap_sync().
   1027 
   1028 			* hpcmips	[need verification that this is working]
   1029 					Needs optimized bus_dmamap_sync().
   1030 
   1031 			* sgimips	[WORKING]
   1032 					Needs optimized bus_dmamap_sync().
   1033 
   1034 			* cobalt	[need testing]
   1035 
   1036 			* mipsco	[need testing]
   1037 
   1038 			* newsmips	[need testing]
   1039 
   1040 Branch:		thorpej_scsipi
   1041 Description:	SCSI/ATAPI midlayer rewrite.
   1042 Status:		Terminated; merged to -current
   1043 Start Date:
   1044 End Date:	Apr 25 2001
   1045 Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
   1046 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>,
   1047 		Jason Thorpe <thorpej (a] NetBSD.org>
   1048 Scope:		syssrc
   1049 Notes:		When a change from -current is pulled up please move the
   1050 		thorpej_scsipi_base tag to the revision you're syncing with.
   1051 		thorpej_scsipi_nbase is private to maintainer (only
   1052 		used when syncing the whole branch with HEAD).
   1053 		Just before the merge, syssrc has been tagged with
   1054 		thorpej_scsipi_beforemerge
   1055 
   1056 Branch:		thorpej-signal
   1057 Description:	?
   1058 Status:		?
   1059 Start Date:
   1060 End Date:
   1061 Base Tag:	thorpej-signal-base
   1062 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
   1063 Scope:		kernel
   1064 Notes:
   1065 
   1066 Branch:		thorpej-setroot
   1067 Description:	?
   1068 Status:		Terminated; merged to -current
   1069 Start Date:
   1070 End Date:
   1071 Base Tag:
   1072 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
   1073 Scope:		kernel
   1074 Notes:
   1075 
   1076 Branch:		simonb-timecounters
   1077 Description:	Port FreeBSD timecounters to NetBSD
   1078 Status:		Terminated
   1079 Start Date:	Sat Feb 04 2006
   1080 End Date:	Wed Jun 07 2006
   1081 Base Tag:	simonb-timecounters-base
   1082 Maintainer:	Simon Burge <simonb (a] NetBSD.org>,
   1083 		Frank Kardel <kardel (a] NetBSD.org>
   1084 Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
   1085 Notes:		early (partial conversion) commit to -current
   1086 		ok'ed by core@ on 20060605 for testing and further
   1087 		simplified conversion
   1088 
   1089 Branch:		wrstuden-devbsize
   1090 Description:	Modify buffer cache to deal with different devices having
   1091 		different block sizes. Also DEV_BSIZE would go away.
   1092 Status:		Terminated
   1093 Start Date:	Aug or Sept 1999
   1094 End Date:	1 Apr 2000
   1095 Base tag:	wrstuden-devbsize-base
   1096 Maintainer:	Bill Studenmund <wrstuden (a] NetBSD.org>
   1097 Scope:		kernel
   1098 Notes:		No longer active due to lack of time, and introduction
   1099 		of UBC. In terms of UBC, the primary cache for
   1100 		file data is the VM cache, which needs to operate
   1101 		in terms of VM pages. As no existing device has native
   1102 		pages the same size as our VM pages, there already is
   1103 		a mapping going on between the VM system and the
   1104 		underlying blocks. So it would be easier and cleaner
   1105 		to adjust that to deal w/ different block sizes.
   1106 		Also with UBC, all i/o is in terms of bytes at an offset
   1107 		with a certain length, so the exact block size isn't a big
   1108 		deal.
   1109 
   1110 		Any other wrstuden-devbsize tag may (and should) go away.
   1111 
   1112 Branch:		yamt-km, yamt-km-doc
   1113 Description:	simplify/improve kernel memory management and bootstrap
   1114 Status:		Terminated; merged to -current
   1115 Start Date:	Tue Jan 25 2005
   1116 End Date:	Fri Apr  1 2005
   1117 Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
   1118 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1119 Scope:		yamt-km: src/sys
   1120 		yamt-km-doc: src/share/man/man9/uvm.9
   1121 Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
   1122 
   1123 		the followings are per-port status.
   1124 		(account names mean "tested by".)
   1125 
   1126 		works enough to go to multiuser:
   1127 			alpha, i386, xen (yamt@)
   1128 			pc532 (simonb@)
   1129 			alpha, i386, mac68k, macppc, pmax, shark,
   1130 			    sparc, sparc64, sun3, x68k (chs@)
   1131 			cobalt, dreamcast, hp300, news68k, newsmips,
   1132 			    sun3x (tsutsui@)
   1133 			amiga (mhitch@)
   1134 			cats, hp700 (skrll@)
   1135 			xen (bouyer@)
   1136 
   1137 		known to have the same problem as trunk:
   1138 			vax (chs@, stuck while running kvm_mkdb)
   1139 
   1140 		known to have a problem:
   1141 			luna68k (and, if any, other m68k ports which use TTR)
   1142 			needs to be revisited.
   1143 			-> for luna68k, although not tested,
   1144 			   Sysmap has been moved to avoid kva conflict with
   1145 			   I/O ranges.
   1146 
   1147 		buildable:
   1148 			src/sys/arch/acorn26/conf/GENERIC
   1149 			src/sys/arch/acorn32/conf/GENERIC
   1150 			src/sys/arch/algor/conf/P6032
   1151 			src/sys/arch/alpha/conf/GENERIC
   1152 			src/sys/arch/alpha/conf/GENERIC.MP
   1153 			src/sys/arch/amd64/conf/GENERIC
   1154 			src/sys/arch/amd64/conf/GENERIC.MP
   1155 			src/sys/arch/amiga/conf/GENERIC
   1156 			src/sys/arch/arc/conf/GENERIC
   1157 			src/sys/arch/atari/conf/MILAN-PCIIDE
   1158 			src/sys/arch/bebox/conf/GENERIC
   1159 			src/sys/arch/cats/conf/GENERIC
   1160 			src/sys/arch/cesfic/conf/GENERIC
   1161 			src/sys/arch/cobalt/conf/GENERIC
   1162 			src/sys/arch/dreamcast/conf/GENERIC
   1163 			src/sys/arch/evbarm/conf/TS7200
   1164 			src/sys/arch/evbppc/conf/WALNUT
   1165 			src/sys/arch/evbsh3/conf/COMPUTEXEVB
   1166 			src/sys/arch/evbsh5/conf/CAYMAN64
   1167 			src/sys/arch/hp300/conf/GENERIC
   1168 			src/sys/arch/hp700/conf/GENERIC
   1169 			src/sys/arch/hpcarm/conf/JORNADA728
   1170 			src/sys/arch/hpcmips/conf/GENERIC
   1171 			src/sys/arch/hpcsh/conf/GENERIC
   1172 			src/sys/arch/hpcsh/conf/HPW650PA
   1173 			src/sys/arch/i386/conf/GENERIC
   1174 			src/sys/arch/i386/conf/GENERIC.MP
   1175 			src/sys/arch/i386/conf/XEN0
   1176 			src/sys/arch/i386/conf/XENU
   1177 			src/sys/arch/ibmnws/conf/GENERIC
   1178 			src/sys/arch/iyonix/conf/GENERIC
   1179 			src/sys/arch/luna68k/conf/GENERIC
   1180 			src/sys/arch/mac68k/conf/GENERIC
   1181 			src/sys/arch/macppc/conf/GENERIC
   1182 			src/sys/arch/macppc/conf/GENERIC.MP
   1183 			src/sys/arch/mipsco/conf/GENERIC
   1184 			src/sys/arch/mmeye/conf/GENERIC
   1185 			src/sys/arch/mvme68k/conf/GENERIC
   1186 			src/sys/arch/netwinder/conf/GENERIC
   1187 			src/sys/arch/news68k/conf/GENERIC
   1188 			src/sys/arch/newsmips/conf/GENERIC
   1189 			src/sys/arch/next68k/conf/GENERIC
   1190 			src/sys/arch/ofppc/conf/GENERIC
   1191 			src/sys/arch/pc532/conf/GENERIC
   1192 			src/sys/arch/pmax/conf/GENERIC
   1193 			src/sys/arch/prep/conf/GENERIC
   1194 			src/sys/arch/sandpoint/conf/GENERIC
   1195 			src/sys/arch/sbmips/conf/GENERIC
   1196 			src/sys/arch/sgimips/conf/GENERIC32_IP3x
   1197 			src/sys/arch/shark/conf/GENERIC
   1198 			src/sys/arch/sparc/conf/GENERIC
   1199 			src/sys/arch/sparc/conf/GENERIC.MP
   1200 			src/sys/arch/sparc64/conf/GENERIC
   1201 			src/sys/arch/sparc64/conf/GENERIC.MP
   1202 			src/sys/arch/sun2/conf/GENERIC
   1203 			src/sys/arch/sun3/conf/GENERIC
   1204 			src/sys/arch/vax/conf/GENERIC
   1205 			src/sys/arch/vax/conf/GENERIC.MP
   1206 			src/sys/arch/x68k/conf/GENERIC
   1207 
   1208 			src/sys/arch/playstation2/conf/GENERIC
   1209 
   1210 Branch:		yamt-pdpolicy
   1211 Description:	play with page replacement policy
   1212 		- separate page replacement policy from the rest of kernel
   1213 		- implement alternative replacement policy
   1214 		- related read-ahead adjustment?
   1215 Status:		Terminated; merged to -current
   1216 Start Date:	Sun Mar  5 2006
   1217 End Date:	Sat Sep 16 2006
   1218 Base Tag:	yamt-pdpolicy-base9
   1219 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1220 Scope:		src/sys  (src/common is tagged but not branched)
   1221 Notes:		
   1222 
   1223 Branch:		yamt-readahead
   1224 Description:	play with file readahead
   1225 Status:		Terminated; merged to -current
   1226 Start Date:	Mon Nov 14 2005
   1227 End Date:	Wed Nov 30 2005
   1228 Base Tag:	yamt-readahead-base3
   1229 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1230 Scope:		src/sys
   1231 Notes:		
   1232 
   1233 Branch:		yamt-uio_vmspace
   1234 Description:	uio_lwp/uio_segflg -> uio_vmspace
   1235 Status:		Terminated; merged to -current
   1236 Start Date:	Mon Dec 31 2005
   1237 End Date:	Wed Mar  1 2006
   1238 Base Tag:	yamt-uio_vmspace-base5
   1239 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1240 Scope:		src/sys
   1241 Notes:		
   1242 
   1243 Branch:		yamt-splraiseipl
   1244 Description:	finish implementing splraiseipl (and makeiplcookie).
   1245 		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
   1246 
   1247 		- completes workqueue(9) and netbt.
   1248 		- fix PR/33218.
   1249 
   1250 Status:		Terminated; merged to -current
   1251 Start Date:	Mon Sep 18 2006
   1252 End Date:	Fri Dec 22 2006
   1253 Base Tag:	yamt-splraiseipl-base5
   1254 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1255 Scope:		src/sys  (src/common is tagged but not branched)
   1256 Notes:		
   1257 		tested (by who):
   1258 			alpha		(yamt)
   1259 			alpha		(pavel)
   1260 			amd64		(reported privately)
   1261 			cobalt		(tsutsui)
   1262 			ews4800mips	(tsutsui)
   1263 			hp300		(tsutsui)
   1264 			hpcarm		(reported privately)
   1265 			i386		(yamt)
   1266 			macppc		(tsutsui)
   1267 			news68k		(tsutsui)
   1268 			sgimips(IP32)	(tsutsui)
   1269 			sparc(sun4c)	(tsutsui)
   1270 			sun2		(tsutsui)
   1271 			sun3		(tsutsui)
   1272 			sun3x		(tsutsui)
   1273 			xen		(yamt)
   1274 
   1275 		compile-tested:
   1276 			acorn26
   1277 			acorn32
   1278 			algor
   1279 			amiga
   1280 			arc
   1281 			atari
   1282 			bebox
   1283 			cats
   1284 			cesfic
   1285 			dreamcast
   1286 			evbarm
   1287 			evbmips
   1288 			evbppc(marvell)
   1289 			evbppc(ibm4xx)
   1290 			evbsh3
   1291 			hp700
   1292 			hpcmips
   1293 			hpcsh
   1294 			ia64
   1295 			ibmnws
   1296 			iyonix
   1297 			landisk
   1298 			luna68k
   1299 			mac68k
   1300 			mmeye
   1301 			mvme68k
   1302 			mvmeppc
   1303 			mipsco
   1304 			netwinder
   1305 			newsmips
   1306 			next68k
   1307 			ofppc
   1308 			pc532
   1309 			pmax
   1310 			pmppc
   1311 			prep
   1312 			sandpoint
   1313 			sbmips
   1314 			shark
   1315 			sparc
   1316 			sparc64
   1317 			vax
   1318 			x68k
   1319 			zaurus
   1320 
   1321 		not tested:
   1322 			pdp10 (i don't know how to build)
   1323 			sh5 (not buildable with an unrelated problem.)
   1324 
   1325     compile  CAYMAN64/netbsd32_sa.o
   1326     cc1: warnings being treated as errors
   1327     /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c: In function 'netbsd32_sa_ucsp':
   1328     /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c:126: warning: implicit declaration of function '_UC_MACHINE32_SP'
   1329     --- netbsd32_sa.o ---
   1330     *** [netbsd32_sa.o] Error code 1
   1331     1 error
   1332 
   1333 		notyet:
   1334 			amigappc
   1335 			playstation2
   1336 
   1337 Branch:		yamt-vop
   1338 Description:	remove several VOPs
   1339 Status:		Terminated; merged to -current
   1340 Start Date:	Wed Oct 19 2005
   1341 End Date:	Wed Nov  2 2005
   1342 Base Tag:	yamt-vop-base3
   1343 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1344 Scope:		src/sys
   1345 Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
   1346 
   1347 Branch:		gdamore-uart
   1348 Description:	Add register table support to com driver.
   1349 Status:		Active
   1350 Start Date:	14 June 2006
   1351 End Date:	13 July 2006
   1352 Base Tag:	gdamore-uart-base
   1353 Maintainer:	Garrett D'Amore <gdamore (a] NetBSD.org>
   1354 Scope:		kernel
   1355 Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
   1356 		com support, and also removes a nasty hack from Atheros com.
   1357 
   1358 ########################################################################
   1359 # Other:
   1360 ########################################################################
   1361 
   1362 Branch:		magnum
   1363 Description:	?
   1364 Status:		?
   1365 Start Date:
   1366 End Date:
   1367 Base Tag:	magnum-base
   1368 Maintainer:	?
   1369 Scope:		kernel
   1370 Notes:
   1371 
   1372