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