Home | History | Annotate | Line # | Download | only in doc
BRANCHES revision 1.184
      1 #	$NetBSD: BRANCHES,v 1.184 2007/04/26 05:51:21 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
    586 		sh3
    587 		sparc
    588 		sparc64
    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 		arm		- Consider using a RAS technique like
    618 				  MIPS uses for _lock_cas() and the mutex
    619 				  stubs.  Possibly do more than one atomic
    620 				  op as a RAS.  Possibly implement mutex
    621 				  stubs using the technique.
    622 
    623 		m68k		- Need to do 68010 support.
    624 		
    625 		i386		- Need to change when x86_patch() is called
    626 				  so we can test ncpus.
    627 
    628 		powerpc		- Figure out if we need barriers in the
    629 				  atomic ops themselves (hopefully not!)
    630 
    631 		x86_64		- Need to change when x86_patch() is called
    632 				  so we can test ncpus.
    633 
    634 ########################################################################
    635 # Individual developers' branches (Terminated):
    636 ########################################################################
    637 
    638 Branch:		bouyer-scsipi
    639 Description:	Integration of atapi support
    640 Status:		Terminated
    641 Start Date:
    642 End Date:
    643 Base Tag:
    644 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    645 Scope:		kernel
    646 Notes:		Superseded by thorpej_scsipi
    647 
    648 Branch:		bouyer-xen2
    649 Description:	update xen port to xen 2.0, with support for domain0 operations
    650 Status:		Terminated
    651 Start Date:	Dec 13 2004
    652 End Date:	Mar 10 2005
    653 Base Tag:	netbsd-2-base
    654 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    655 Scope:		src/sys/arch/xen
    656 Notes:
    657 
    658 Branch: 	chap-midi
    659 Description:	Renovation of MIDI support
    660 Status: 	Terminated; merged to -current
    661 Start Date:	19 May 2006
    662 End Date:	30 Jun 2006
    663 Base Tag:	chap-midi-base
    664 Maintainer:	Chapman Flack <chap (a] NetBSD.org>
    665 Scope:		sys, share/man, usr.bin
    666 Notes:
    667 
    668 Branch:		chs-ubc
    669 Description:	Unified Buffer Cache
    670 Status:		Terminated
    671 Start Date:
    672 End Date:
    673 Base Tag:	chs-ubc-base
    674 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    675 Scope:		kernel
    676 Notes:
    677 
    678 Branch:		chs-ubc2
    679 Description:	 Unified Buffer Cache
    680 Status:		Terminated; merged to -current
    681 Start Date:
    682 End Date:
    683 Base Tag:	chs-ubc2-base, chs-ubc2-newbase
    684 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    685 Scope:		kernel
    686 Notes:
    687 
    688 Branch:		cjs-build-against-obj-dir
    689 Description:	?
    690 Status:		?
    691 Start Date:
    692 End Date:
    693 Base Tag:
    694 Maintainer:	Curt Sampson <cjs (a] NetBSD.org>
    695 Scope:		Entire tree.
    696 Notes:
    697 
    698 Branch:		eeh-paddr_t
    699 Description:	use separate types for virtual vs. physical addresses
    700 Status:		Terminated; merged to -current
    701 Start Date:
    702 End Date:
    703 Base Tag:	eeh-paddr_t-base
    704 Maintainer:	Eduardo Horvath <eeh (a] NetBSD.org>
    705 Scope:		kernel
    706 Notes:		This is needed to support 32-bit kernels on sparc64.
    707 
    708 Branch:		elad-kernelauth
    709 Description:	Native NetBSD implementation of Apple's kernel authorization
    710 		based on TN2127. This is a "clean-room" implementation to
    711 		avoid any licensing issues.
    712 Status:		Terminated; merged to -current
    713 Start Date:	Tue Mar	 7 2006
    714 End Date:	Mon May 15 2006
    715 Base Tag:	elad-kernelauth-base
    716 Maintainer:	Elad Efrat <elad (a] NetBSD.org>
    717 Scope:		src/sys, src/share/man/man9/Makefile,
    718 		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
    719 Notes:
    720 
    721 Branch:		fvdl-softdep
    722 Description:	FFS soft dependencies
    723 Status:		Terminated; merged to -current
    724 Start Date:
    725 End Date:
    726 Base Tag:	fvdl-softdep-base
    727 Maintainer:	Frank van der Linden <fvdl (a] NetBSD.org>
    728 Scope:		kernel
    729 Notes:
    730 
    731 Branch:		gehenna-devsw
    732 Description:	auto-generation of devsw table
    733 Status:		Terminated
    734 Start Date:	16 May 2002
    735 End Date:	6 Sep 2002
    736 Base Tag:	gehenna-devsw-base
    737 Maintainer:	MAEKAWA Masahide <gehenna (a] NetBSD.org>
    738 Scope:		syssrc
    739 Notes:		The goal is to get rid of the existing device switch tables in
    740 		port-dependent conf.c and to generate them dynamically by
    741 		config(8).
    742 
    743 Branch:		is-newarp
    744 Description:	ARP for non-Ethernet
    745 Status:		Terminated; merged before NetBSD 1.3
    746 Start Date:	1996/10/13
    747 End Date:	1997/03/15
    748 Base Tag:	is-newarp-base
    749 Maintainer:	Ignatios Souvatzis <is (a] NetBSD.org>
    750 Scope:		kernel
    751 Notes:
    752 
    753 Branch:		kenh-if-detach
    754 Description:	Interface detach support.
    755 Status:		?
    756 Start Date:
    757 End Date:
    758 Base Tag:	kenh-if-detach-base
    759 Maintainer:	Ken Hornstein <kenh (a] NetBSD.org>
    760 Scope:		kernel
    761 Notes:
    762 
    763 Branch:		kent-audio1
    764 Description:	Audio converter pipeline
    765 Status:		Terminated; merged to -current
    766 Start Date:	Tue Dec  7 2004
    767 End Date:	Tue Jan 11 2005
    768 Base Tag:	kent-audio1-base
    769 Maintainer:	TAMURA Kent <kent (a] NetBSD.org>
    770 Scope:		kernel (audio device drivers)
    771 Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
    772 		Please consult with the maintainer before committing
    773 		to this branch.
    774 
    775 Branch:		kqueue
    776 Description:	kqueue kernel event notification mechanism (from FreeBSD)
    777 Status:		Terminated; merged to -current
    778 Start Date:	Tue Jul 10 23:08:38 EST 2001
    779 End Date:	Tue Oct 24 09:14:14 GMT 2002
    780 Base Tag:	kqueue-base
    781 Maintainer:	Jaromir Dolecek <jdolecek (a] NetBSD.org>
    782 Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
    783 Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
    784 		local internal changes to better suit NetBSD, and
    785 		enhancements such as looking up filters by name or
    786 		number, and dynamic registration of "user" filters.
    787 		The work is complete as is, but is awaiting more
    788 		feedback from various kernel gurus before going mainline.
    789 
    790 Branch:		ktrace-lwp
    791 Description:	ktrace support for lwp ids.
    792 Status:		Terminated; merged to -current
    793 Start Date:	Wed Jul  2 15:27:30 UTC 2003
    794 End Date:	Sun Dec 11 12:25:29 UTC 2005
    795 Base Tag:	ktrace-lwp-base
    796 Maintainer:	Darren Reed <darrenr (a] NetBSD.org>
    797 Scope:		sys
    798 Notes:		
    799 
    800 Branch:		marc-pcmcia
    801 Description:	PCMCIA support
    802 Status:		Terminated; merged to -current
    803 Start Date:
    804 End Date:
    805 Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
    806 Maintainer:	Marc Horowitz <marc (a] NetBSD.org>
    807 Scope:		kernel
    808 Notes:
    809 
    810 Branch:		minoura_x68k_bus_h
    811 Description:	bus_space(9) and bus_dma(9) implementation for x68k
    812 Status:		Terminated; merged to -current
    813 Start Date:	23 Dec 1998
    814 End Date:	16 Mar 1999
    815 Base Tag:	minoura_x68k_bus_h-base
    816 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    817 Scope:		sys/arch/x68k
    818 Notes:
    819 
    820 Branch:		minoura-xpg4dl
    821 Description:	Citrus Project locale subsystem
    822 Status:		Terminated; (partly) merged to -current
    823 Start Date:	28 March 2000
    824 End Date:
    825 Base Tag:	minoura-xpg4dl-base
    826 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    827 Scope:		basesrc, syssrc, sharesrc
    828 Notes:		Citrus Project is developing dynamically-loadable, codeset-
    829 		independent locale subsystem.  Part of the implementation
    830 		(LC_CTYPE) called XPG4DL is now integrated to -current.
    831 
    832 Branch:		mjf-ufs-trans
    833 Description:	filesystem transactions for ufs
    834 Status:		Active
    835 Start Date:	12 March 2007
    836 End Date:
    837 Base Tag:	mjf-ufs-trans-base
    838 Maintainer:	Matt Fleming <mjf (a] NetBSD.org>
    839 Scope:		kernel
    840 Notes:
    841 
    842 Branch:		mrg-vm-swap
    843 Description:	dynamic swap allocation, swap-to-files support
    844 Status:		Terminated; abondoned for mrg-vm-swap2
    845 Start Date:	12 February 1997
    846 End Date:	15 March 1997
    847 Base Tag:	[none]
    848 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
    849 Scope:		kernel
    850 Notes:
    851 
    852 Branch:		mrg-vm-swap2
    853 Description:	dynamic swap allocation, swap-to-files support
    854 Status:		Terminated; merged to -current
    855 Start Date:	4 May 1997
    856 End Date:	12 June 1997
    857 Base Tag:	mrg-vm-swap2-base
    858 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
    859 Scope:		kernel
    860 Notes:
    861 
    862 Branch:		nathanw_sa
    863 Description:	Scheduler activations
    864 Status:		Terminated; merged to -current
    865 Start Date:	5 March 2001
    866 End Date:	18 January 2003
    867 Base Tag:	nathanw_sa_base
    868 Maintainer:	Nathan Williams <nathanw (a] NetBSD.org>
    869 Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
    870 		bin/ps usr.bin/systat usr.bin/top usr.bin/w
    871 		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
    872 Notes:		The idea of scheduler activations is described in the
    873 		classic paper by Anderson et al., in ACM Transactions
    874 		a on Computer Systems volume 10 issue 1 (1992),which
    875 		can be found at
    876 		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
    877 		Many ideas in the implementation are based on the
    878 		implementation of scheduler activations added to Mach
    879 		3.0 and described by Davis et al. in the University of
    880 		Washington CS tech report 92-08-93, which can be found
    881 		at
    882 		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
    883 
    884 		My USENIX paper on the subject can be found at
    885 		http://web.mit.edu/nathanw/www/usenix/
    886 
    887 		Please consult with the maintainer before committing
    888 		to this branch.
    889 		Other tags starting with nathanw_sa reserved for
    890 		branch management and are not guaranteed to be stable.
    891 
    892 		Trunk tagged with "nathanw_sa_before_merge" prior to
    893 		merging branch down to trunk.  Branch tagged with
    894 		"nathanw_sa_end" to indicate the ending revision of
    895 		the branch.
    896 
    897 Branch:		perseant-lfsv2
    898 Description:	LFS incompatible on-disk data structure changes
    899 Status:		Terminated
    900 Start Date:	27 June 2001
    901 End Date:	16 July 2001
    902 Base Tag:	perseant-lfsv2-base
    903 Maintainer:	Konrad Schroder <perseant (a] NetBSD.org>
    904 Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
    905 Notes:		This branch should be short-lived, I expect to merge as soon
    906 		as the data structures required for unremove are in and tested.
    907 
    908 Branch:		thorpej-devvp
    909 Description:	replace dev_t with struct vnode * in devsw entry points
    910 Status:		Terminated
    911 Start Date:	Sep 6 2001
    912 End Date:	???
    913 Base Tag:	thorpej-devvp-base
    914 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
    915 Scope:		syssrc
    916 Notes:		Kernels built from this branch are not expected
    917 		to function correctly at this time.
    918 
    919 		Ports known to compile on this branch:
    920 			alpha
    921 			i386
    922 
    923 Branch:		peter-altq
    924 Description:	New ALTQ framework:
    925 		- sync with KAME sources
    926 		- share mtag/name mapping functions
    927 		- separate altq + pf attachment
    928 Status:		Terminated; merged to -current
    929 Start Date:	March 16, 2006
    930 End Date:	October 12, 2006
    931 Base Tag:	peter-altq-base
    932 Maintainer:	Peter Postma <peter (a] NetBSD.org>,
    933 		Martin Husemann <martin (a] NetBSD.org>,
    934 		Matthias Scheler <tron (a] NetBSD.org>
    935 Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
    936 Notes:		Only the first item in the description was finished
    937 		in this branch.
    938 
    939 Branch:		sommerfeld_i386mp_1
    940 Description:	Multiprocessor support for i386 using Intel MP BIOS.
    941 Status:		Terminated; merged to -current
    942 Start Date:	21 Feb 2000
    943 End Date:	01 Oct 2002
    944 Base Tag:	sommerfeld_i386mpbase_1
    945 Maintainer:	Bill Sommerfeld <sommerfeld (a] NetBSD.org>
    946 Scope:		sys/arch/i386
    947 Notes:
    948 		Code committed to the branch has booted to multiuser 
    949 		on at least one system.
    950 
    951 		Not guaranteed to compile against mainline since -current
    952 		may have changed incompatibly with the last branch update;
    953 		use "cvs update -D" to roll-back the rest of the tree to match.
    954 
    955 		Please get explicit permission from the maintainer 
    956 		before each commit, or your changes will be backed out.
    957 		Other tags starting with sommerfeld_ are private to 
    958 		the developer and are guaranteed to be unstable.
    959 		Only the maintainer should move tags.
    960 
    961 		Note that this branch uses a DIFFERENT scheme for 
    962 		synching with the mainline.  the maintainer uses some private
    963 		scripts for keeping them in synch; if you make commits 
    964 		to the branch to "resynchronize" things, you'll
    965 		probably do it wrong; instead, ask the maintainer to
    966 		resynchronize things.
    967 
    968 		See sys/arch/i386/TODO on the branch for a list of known
    969 		issues with the branch.
    970 
    971 Branch:		thorpej-mips-cache
    972 Description:	overhaul MIPS cache support code
    973 Status:		Terminated; merged to -current
    974 Start Date:	Oct 23 2001
    975 End Date:	Nov 14 2001
    976 Base Tag:	thorpej-mips-cache-base
    977 Scope:		syssrc
    978 Notes:		This branch needs more debugging, testing, and more
    979 		ports need to be converted to the new world order.
    980 
    981 		The following processors have had cache ops
    982 		written:
    983 
    984 			* R2000/R3000 (cache_r3k) -- light testing,
    985 			  needs to be beat on a lot more to make
    986 			  sure it's working.
    987 
    988 			* R4000/R4400 (cache_r4k) -- mhitch (a] NetBSD.org
    989 			  tracked down a bug, which has been fixed.
    990 
    991 			  Confirmed working on R4000-with-L2.
    992 
    993 			  Confirmed working on R4400-no-L2 and
    994 			  R4400-with-L2.
    995 
    996 			* R4600/R5000 (cache_r5k) -- shin (a] NetBSD.org
    997 			  has committed fixes to this code.
    998 
    999 			  Confirmed working on R4600 v2 (SGI IP-22 with
   1000 			  no SysAD L2 cache).
   1001 
   1002 			  Confirmed working on RM5260 (Algorithmics P-5064).
   1003 
   1004 			* TX39 (cache_tx39) -- uch (a] NetBSD.org has
   1005 			  committed fixes to this code.  Awaiting
   1006 			  confirmation that it is working properly.
   1007 
   1008 			* R5900 (cache_r5900) -- uch (a] NetBSD.org has
   1009 			  written this code and tested it on a
   1010 			  PlayStation 2.
   1011 
   1012 		The following ports have been updated to compile (and
   1013 		use optimized-for-processor bus_dma routines).  Those
   1014 		that have been tested and work are marked with [WORKING].
   1015 
   1016 			* algor		[WORKING]
   1017 
   1018 			* arc		[WORKING]
   1019 
   1020 			* pmax		[WORKING]
   1021 
   1022 			* playstation2	[WORKING]
   1023 					Needs optimized bus_dmamap_sync().
   1024 
   1025 			* hpcmips	[need verification that this is working]
   1026 					Needs optimized bus_dmamap_sync().
   1027 
   1028 			* sgimips	[WORKING]
   1029 					Needs optimized bus_dmamap_sync().
   1030 
   1031 			* cobalt	[need testing]
   1032 
   1033 			* mipsco	[need testing]
   1034 
   1035 			* newsmips	[need testing]
   1036 
   1037 Branch:		thorpej_scsipi
   1038 Description:	SCSI/ATAPI midlayer rewrite.
   1039 Status:		Terminated; merged to -current
   1040 Start Date:
   1041 End Date:	Apr 25 2001
   1042 Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
   1043 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>,
   1044 		Jason Thorpe <thorpej (a] NetBSD.org>
   1045 Scope:		syssrc
   1046 Notes:		When a change from -current is pulled up please move the
   1047 		thorpej_scsipi_base tag to the revision you're syncing with.
   1048 		thorpej_scsipi_nbase is private to maintainer (only
   1049 		used when syncing the whole branch with HEAD).
   1050 		Just before the merge, syssrc has been tagged with
   1051 		thorpej_scsipi_beforemerge
   1052 
   1053 Branch:		thorpej-signal
   1054 Description:	?
   1055 Status:		?
   1056 Start Date:
   1057 End Date:
   1058 Base Tag:	thorpej-signal-base
   1059 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
   1060 Scope:		kernel
   1061 Notes:
   1062 
   1063 Branch:		thorpej-setroot
   1064 Description:	?
   1065 Status:		Terminated; merged to -current
   1066 Start Date:
   1067 End Date:
   1068 Base Tag:
   1069 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
   1070 Scope:		kernel
   1071 Notes:
   1072 
   1073 Branch:		simonb-timecounters
   1074 Description:	Port FreeBSD timecounters to NetBSD
   1075 Status:		Terminated
   1076 Start Date:	Sat Feb 04 2006
   1077 End Date:	Wed Jun 07 2006
   1078 Base Tag:	simonb-timecounters-base
   1079 Maintainer:	Simon Burge <simonb (a] NetBSD.org>,
   1080 		Frank Kardel <kardel (a] NetBSD.org>
   1081 Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
   1082 Notes:		early (partial conversion) commit to -current
   1083 		ok'ed by core@ on 20060605 for testing and further
   1084 		simplified conversion
   1085 
   1086 Branch:		wrstuden-devbsize
   1087 Description:	Modify buffer cache to deal with different devices having
   1088 		different block sizes. Also DEV_BSIZE would go away.
   1089 Status:		Terminated
   1090 Start Date:	Aug or Sept 1999
   1091 End Date:	1 Apr 2000
   1092 Base tag:	wrstuden-devbsize-base
   1093 Maintainer:	Bill Studenmund <wrstuden (a] NetBSD.org>
   1094 Scope:		kernel
   1095 Notes:		No longer active due to lack of time, and introduction
   1096 		of UBC. In terms of UBC, the primary cache for
   1097 		file data is the VM cache, which needs to operate
   1098 		in terms of VM pages. As no existing device has native
   1099 		pages the same size as our VM pages, there already is
   1100 		a mapping going on between the VM system and the
   1101 		underlying blocks. So it would be easier and cleaner
   1102 		to adjust that to deal w/ different block sizes.
   1103 		Also with UBC, all i/o is in terms of bytes at an offset
   1104 		with a certain length, so the exact block size isn't a big
   1105 		deal.
   1106 
   1107 		Any other wrstuden-devbsize tag may (and should) go away.
   1108 
   1109 Branch:		yamt-km, yamt-km-doc
   1110 Description:	simplify/improve kernel memory management and bootstrap
   1111 Status:		Terminated; merged to -current
   1112 Start Date:	Tue Jan 25 2005
   1113 End Date:	Fri Apr  1 2005
   1114 Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
   1115 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1116 Scope:		yamt-km: src/sys
   1117 		yamt-km-doc: src/share/man/man9/uvm.9
   1118 Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
   1119 
   1120 		the followings are per-port status.
   1121 		(account names mean "tested by".)
   1122 
   1123 		works enough to go to multiuser:
   1124 			alpha, i386, xen (yamt@)
   1125 			pc532 (simonb@)
   1126 			alpha, i386, mac68k, macppc, pmax, shark,
   1127 			    sparc, sparc64, sun3, x68k (chs@)
   1128 			cobalt, dreamcast, hp300, news68k, newsmips,
   1129 			    sun3x (tsutsui@)
   1130 			amiga (mhitch@)
   1131 			cats, hp700 (skrll@)
   1132 			xen (bouyer@)
   1133 
   1134 		known to have the same problem as trunk:
   1135 			vax (chs@, stuck while running kvm_mkdb)
   1136 
   1137 		known to have a problem:
   1138 			luna68k (and, if any, other m68k ports which use TTR)
   1139 			needs to be revisited.
   1140 			-> for luna68k, although not tested,
   1141 			   Sysmap has been moved to avoid kva conflict with
   1142 			   I/O ranges.
   1143 
   1144 		buildable:
   1145 			src/sys/arch/acorn26/conf/GENERIC
   1146 			src/sys/arch/acorn32/conf/GENERIC
   1147 			src/sys/arch/algor/conf/P6032
   1148 			src/sys/arch/alpha/conf/GENERIC
   1149 			src/sys/arch/alpha/conf/GENERIC.MP
   1150 			src/sys/arch/amd64/conf/GENERIC
   1151 			src/sys/arch/amd64/conf/GENERIC.MP
   1152 			src/sys/arch/amiga/conf/GENERIC
   1153 			src/sys/arch/arc/conf/GENERIC
   1154 			src/sys/arch/atari/conf/MILAN-PCIIDE
   1155 			src/sys/arch/bebox/conf/GENERIC
   1156 			src/sys/arch/cats/conf/GENERIC
   1157 			src/sys/arch/cesfic/conf/GENERIC
   1158 			src/sys/arch/cobalt/conf/GENERIC
   1159 			src/sys/arch/dreamcast/conf/GENERIC
   1160 			src/sys/arch/evbarm/conf/TS7200
   1161 			src/sys/arch/evbppc/conf/WALNUT
   1162 			src/sys/arch/evbsh3/conf/COMPUTEXEVB
   1163 			src/sys/arch/evbsh5/conf/CAYMAN64
   1164 			src/sys/arch/hp300/conf/GENERIC
   1165 			src/sys/arch/hp700/conf/GENERIC
   1166 			src/sys/arch/hpcarm/conf/JORNADA728
   1167 			src/sys/arch/hpcmips/conf/GENERIC
   1168 			src/sys/arch/hpcsh/conf/GENERIC
   1169 			src/sys/arch/hpcsh/conf/HPW650PA
   1170 			src/sys/arch/i386/conf/GENERIC
   1171 			src/sys/arch/i386/conf/GENERIC.MP
   1172 			src/sys/arch/i386/conf/XEN0
   1173 			src/sys/arch/i386/conf/XENU
   1174 			src/sys/arch/ibmnws/conf/GENERIC
   1175 			src/sys/arch/iyonix/conf/GENERIC
   1176 			src/sys/arch/luna68k/conf/GENERIC
   1177 			src/sys/arch/mac68k/conf/GENERIC
   1178 			src/sys/arch/macppc/conf/GENERIC
   1179 			src/sys/arch/macppc/conf/GENERIC.MP
   1180 			src/sys/arch/mipsco/conf/GENERIC
   1181 			src/sys/arch/mmeye/conf/GENERIC
   1182 			src/sys/arch/mvme68k/conf/GENERIC
   1183 			src/sys/arch/netwinder/conf/GENERIC
   1184 			src/sys/arch/news68k/conf/GENERIC
   1185 			src/sys/arch/newsmips/conf/GENERIC
   1186 			src/sys/arch/next68k/conf/GENERIC
   1187 			src/sys/arch/ofppc/conf/GENERIC
   1188 			src/sys/arch/pc532/conf/GENERIC
   1189 			src/sys/arch/pmax/conf/GENERIC
   1190 			src/sys/arch/prep/conf/GENERIC
   1191 			src/sys/arch/sandpoint/conf/GENERIC
   1192 			src/sys/arch/sbmips/conf/GENERIC
   1193 			src/sys/arch/sgimips/conf/GENERIC32_IP3x
   1194 			src/sys/arch/shark/conf/GENERIC
   1195 			src/sys/arch/sparc/conf/GENERIC
   1196 			src/sys/arch/sparc/conf/GENERIC.MP
   1197 			src/sys/arch/sparc64/conf/GENERIC
   1198 			src/sys/arch/sparc64/conf/GENERIC.MP
   1199 			src/sys/arch/sun2/conf/GENERIC
   1200 			src/sys/arch/sun3/conf/GENERIC
   1201 			src/sys/arch/vax/conf/GENERIC
   1202 			src/sys/arch/vax/conf/GENERIC.MP
   1203 			src/sys/arch/x68k/conf/GENERIC
   1204 
   1205 			src/sys/arch/playstation2/conf/GENERIC
   1206 
   1207 Branch:		yamt-pdpolicy
   1208 Description:	play with page replacement policy
   1209 		- separate page replacement policy from the rest of kernel
   1210 		- implement alternative replacement policy
   1211 		- related read-ahead adjustment?
   1212 Status:		Terminated; merged to -current
   1213 Start Date:	Sun Mar  5 2006
   1214 End Date:	Sat Sep 16 2006
   1215 Base Tag:	yamt-pdpolicy-base9
   1216 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1217 Scope:		src/sys  (src/common is tagged but not branched)
   1218 Notes:		
   1219 
   1220 Branch:		yamt-readahead
   1221 Description:	play with file readahead
   1222 Status:		Terminated; merged to -current
   1223 Start Date:	Mon Nov 14 2005
   1224 End Date:	Wed Nov 30 2005
   1225 Base Tag:	yamt-readahead-base3
   1226 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1227 Scope:		src/sys
   1228 Notes:		
   1229 
   1230 Branch:		yamt-uio_vmspace
   1231 Description:	uio_lwp/uio_segflg -> uio_vmspace
   1232 Status:		Terminated; merged to -current
   1233 Start Date:	Mon Dec 31 2005
   1234 End Date:	Wed Mar  1 2006
   1235 Base Tag:	yamt-uio_vmspace-base5
   1236 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1237 Scope:		src/sys
   1238 Notes:		
   1239 
   1240 Branch:		yamt-splraiseipl
   1241 Description:	finish implementing splraiseipl (and makeiplcookie).
   1242 		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
   1243 
   1244 		- completes workqueue(9) and netbt.
   1245 		- fix PR/33218.
   1246 
   1247 Status:		Terminated; merged to -current
   1248 Start Date:	Mon Sep 18 2006
   1249 End Date:	Fri Dec 22 2006
   1250 Base Tag:	yamt-splraiseipl-base5
   1251 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1252 Scope:		src/sys  (src/common is tagged but not branched)
   1253 Notes:		
   1254 		tested (by who):
   1255 			alpha		(yamt)
   1256 			alpha		(pavel)
   1257 			amd64		(reported privately)
   1258 			cobalt		(tsutsui)
   1259 			ews4800mips	(tsutsui)
   1260 			hp300		(tsutsui)
   1261 			hpcarm		(reported privately)
   1262 			i386		(yamt)
   1263 			macppc		(tsutsui)
   1264 			news68k		(tsutsui)
   1265 			sgimips(IP32)	(tsutsui)
   1266 			sparc(sun4c)	(tsutsui)
   1267 			sun2		(tsutsui)
   1268 			sun3		(tsutsui)
   1269 			sun3x		(tsutsui)
   1270 			xen		(yamt)
   1271 
   1272 		compile-tested:
   1273 			acorn26
   1274 			acorn32
   1275 			algor
   1276 			amiga
   1277 			arc
   1278 			atari
   1279 			bebox
   1280 			cats
   1281 			cesfic
   1282 			dreamcast
   1283 			evbarm
   1284 			evbmips
   1285 			evbppc(marvell)
   1286 			evbppc(ibm4xx)
   1287 			evbsh3
   1288 			hp700
   1289 			hpcmips
   1290 			hpcsh
   1291 			ia64
   1292 			ibmnws
   1293 			iyonix
   1294 			landisk
   1295 			luna68k
   1296 			mac68k
   1297 			mmeye
   1298 			mvme68k
   1299 			mvmeppc
   1300 			mipsco
   1301 			netwinder
   1302 			newsmips
   1303 			next68k
   1304 			ofppc
   1305 			pc532
   1306 			pmax
   1307 			pmppc
   1308 			prep
   1309 			sandpoint
   1310 			sbmips
   1311 			shark
   1312 			sparc
   1313 			sparc64
   1314 			vax
   1315 			x68k
   1316 			zaurus
   1317 
   1318 		not tested:
   1319 			pdp10 (i don't know how to build)
   1320 			sh5 (not buildable with an unrelated problem.)
   1321 
   1322     compile  CAYMAN64/netbsd32_sa.o
   1323     cc1: warnings being treated as errors
   1324     /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c: In function 'netbsd32_sa_ucsp':
   1325     /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c:126: warning: implicit declaration of function '_UC_MACHINE32_SP'
   1326     --- netbsd32_sa.o ---
   1327     *** [netbsd32_sa.o] Error code 1
   1328     1 error
   1329 
   1330 		notyet:
   1331 			amigappc
   1332 			playstation2
   1333 
   1334 Branch:		yamt-vop
   1335 Description:	remove several VOPs
   1336 Status:		Terminated; merged to -current
   1337 Start Date:	Wed Oct 19 2005
   1338 End Date:	Wed Nov  2 2005
   1339 Base Tag:	yamt-vop-base3
   1340 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1341 Scope:		src/sys
   1342 Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
   1343 
   1344 Branch:		gdamore-uart
   1345 Description:	Add register table support to com driver.
   1346 Status:		Active
   1347 Start Date:	14 June 2006
   1348 End Date:	13 July 2006
   1349 Base Tag:	gdamore-uart-base
   1350 Maintainer:	Garrett D'Amore <gdamore (a] NetBSD.org>
   1351 Scope:		kernel
   1352 Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
   1353 		com support, and also removes a nasty hack from Atheros com.
   1354 
   1355 ########################################################################
   1356 # Other:
   1357 ########################################################################
   1358 
   1359 Branch:		magnum
   1360 Description:	?
   1361 Status:		?
   1362 Start Date:
   1363 End Date:
   1364 Base Tag:	magnum-base
   1365 Maintainer:	?
   1366 Scope:		kernel
   1367 Notes:
   1368 
   1369