Home | History | Annotate | Line # | Download | only in doc
BRANCHES revision 1.284
      1 #	$NetBSD: BRANCHES,v 1.284 2009/08/10 21:27:46 matt 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:		Terminated
    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:		Terminated
    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:		Terminated
    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:		Terminated
    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 Branch:		netbsd-5
    208 Description:	The NetBSD 5 release branch
    209 Status:		Active
    210 Start Date:	31 Oct 2008
    211 End Date:
    212 Base Tag:	netbsd-5-base
    213 Maintainer:	5.0 Release Engineering <releng-5 (a] NetBSD.org>
    214 Scope:		Entire tree. (src + xsrc)
    215 Notes:
    216 		Commits restricted to Release Engineering.
    217 
    218 Branch:		netbsd-5-0
    219 Description:	Tracking security/critical fixes for NetBSD 5.0
    220 Status:		Active
    221 Start Date:	29 Apr 2009
    222 End Date:
    223 Base Tag:	netbsd-5-0-RELEASE
    224 Maintainer:	5.0 Release Engineering <releng-5 (a] NetBSD.org>
    225 Scope:		Entire tree. (src + xsrc)
    226 Notes:		Commits restricted to Release Engineering.
    227 
    228 ########################################################################
    229 # Individual developers' branches (Active/Dormant):
    230 ########################################################################
    231 
    232 Branch:		ad-audiomp
    233 Description:	Add MP locking to the audio drivers
    234 Status:		Terminated
    235 Start Date:	28 February 2007
    236 End Date:	7 December 2008
    237 Base Tag:	ad-audiomp-base
    238 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
    239 Scope:		kernel
    240 Notes:		Making the audio drivers MP safe is necessary before efforts
    241 		can be made to make the VM system MP safe. About 1/2 of the
    242 		drivers are converted, the remaining 1/2 need more changes.
    243 
    244 		As of import this is snapshot of work in progress and so
    245 		may not compile; in particular the midi changes are very
    246 		much "in progress". The audio component has been tested
    247 		and verified to work with emuxki and auvia. There may
    248 		be a locking issue in the ac97 code at boot.
    249 
    250 		The are two locks per device instance, an ISR lock and
    251 		a character device lock. The ISR lock replaces calls to
    252 		splaudio()/splx(), and will be held across calls to device
    253 		methods which were called at splaudio() before (e.g.
    254 		trigger_output). The character device lock is held across
    255 		calls to nearly all of the methods, excluding some only
    256 		used for initialization, e.g. get_locks. This needs to be
    257 		documented at merge time.
    258 
    259 		To test on a multi way x86 system, search for "mpsafe" in
    260 		x86/x86/intr.c and change IPL_SCHED to IPL_AUDIO. Run a job
    261 		that will acquire the ISR lock (depends on the hardware, but
    262 		"while true; do mixerctl -a > /dev/null; done" may suffice).
    263 		Play audio, run lockstat and verify that that there is
    264 		contention on the ISR lock.
    265 
    266 Branch:		ad-audiomp2
    267 Description:	Add MP locking to the audio drivers
    268 Status:		Active
    269 Start Date:	7 December 2008
    270 End Date:	
    271 Base Tag:	ad-audiomp2-base
    272 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
    273 Scope:		kernel
    274 Notes:		Ressurect ad-audiomp, make the audio drivers MP safe.
    275 
    276 Branch:		bjh21-hydra
    277 Description:	Simtec Hydra support and ARM SMP in general
    278 Status:		Dormant
    279 Start Date:	18 Oct 2002
    280 End Date:
    281 Base Tag:	bjh21-hydra-base
    282 Maintainer:	Ben Harris <bjh21 (a] NetBSD.org>
    283 Scope:		sys/arch/arm sys/arch/acorn32
    284 Notes:		This code was on a branch because it involves changes to
    285 		cpuswitch.S which would otherwise make merging the
    286 		nathanw_sa branch difficult.
    287 
    288 Branch:		chris-arm-intr-rework
    289 Description:	Rework arm interrupt handling code
    290 Status:		Active
    291 Start Date:	11 Aug 2007
    292 End Date:
    293 Base Tag:	chris-arm-intr-rework-base
    294 Maintainer:	Chris Gilbert <chris (a] NetBSD.org>
    295 Scope:		sys/arch/arm sys/arch/cats (other arm archs to follow)
    296 Notes:		Rework arm interrupt code to provide a shared set of interrupt
    297 		routines, and allow improvements to be shared across all arm
    298 		based hardware.
    299 
    300 Branch:		cube-autoconf
    301 Description:	Renovate autoconf(9) API
    302 Status:		Active
    303 Start Date:	11 Dec 2007
    304 End Date:
    305 Base Tag:	cube-autoconf-base
    306 Maintainer:	Quentin Garnier <cube (a] NetBSD.org>
    307 Scope:		kernel usr.bin/config (and some other userland bits)
    308 Notes:		Address a number of issues the current autoconf(9) API has.
    309 
    310 Branch:		gmcgarry_ctxsw
    311 Description:	Separate scheduler from context-switch code
    312 Status:		Dormant
    313 Start Date:	18 December 2002
    314 End Date:
    315 Base Tag:	gmcgarry_ctxsw_base
    316 Maintainer:	Gregory McGarry <gmcgarry (a] NetBSD.org>
    317 Scope:		kernel
    318 Notes:		Removing knowledge of the scheduler and its run queues
    319 		from the machine-dependent context switch code is the
    320 		first step in cleaning up the scheduler.  It is necessary
    321 		for the newlock branch, making the scheduler SMP friendly,
    322 		adding real-time scheduler extensions, and reducing the
    323 		number of code paths for LWP and proc switching.
    324 
    325 Branch:		gmcgarry_ucred
    326 Description:	Integrate and encapsulate user credentials
    327 Status:		Dormant
    328 Start Date:	18 December 2002
    329 End Date:
    330 Base Tag:	gmcgarry_ucred_base
    331 Maintainer:	Gregory McGarry <gmcgarry (a] NetBSD.org>
    332 Scope:		kernel
    333 Notes:		merge pcred and ucred and poolify
    334 
    335 Branch:		hpcarm-cleanup
    336 Description:	Fix build problems for hpcarm
    337 Status:		Active
    338 Start Date:	31 July 2007
    339 End Date:
    340 Base Tag:	hpcarm-cleanup-base
    341 Maintainer:	Robert Swindells <rjs (a] NetBSD.org>
    342 Scope:		kernel
    343 Notes:		Modify SA11x0 interrupt code to match PXA2x0 equivalent.
    344 
    345 Branch:		itohy-usb1
    346 Description:	USB stack overhaul, mostly DMA related
    347 Status:		Active
    348 Start Date:	22 May 2007
    349 End Date:
    350 Base Tag:	itohy-usb1-base
    351 Maintainer:	ITOH Yasufumi <itohy (a] NetBSD.org>
    352 Scope:		kernel
    353 Notes:		To check out the kernel source tree,
    354 		1. check out checkout script
    355 			cvs checkout -ritohy-usb1 src/sys/dev/usb/filelist
    356 		2. update files in the branch
    357 			sh -e src/sys/dev/usb/filelist
    358 
    359 Branch:		jym-xensuspend
    360 Description:	Implement xm save/restore/migrate for NetBSD domU
    361 Status:		Active
    362 Start Date:	2009-02-08
    363 End Date:
    364 Base Tag:	jym-xensuspend-base
    365 Maintainer:	Jean-Yves Migeon <jym (a] NetBSD.org>
    366 Scope:		kernel
    367 Notes:		This branch contains the code required to support the Xen
    368 		save/restore/migrate facilities. It affects domU frontend
    369 		drivers (xbd, xennet, xencons, hypervisor), autoconf(9)
    370 		machinery, as well as MD code (mostly pmap(9)).
    371 
    372 Branch:		kame
    373 Description:	KAME Project
    374 Status:		Dormant
    375 Start Date:	28 Jun 1999
    376 End Date:
    377 Base Tag:
    378 Maintainer:	Jun-ichiro itojun Hagino <itojun (a] NetBSD.org>
    379 Scope:		kernel
    380 Notes:		http://www.kame.net
    381 		Used for "reference" purposes for early part of KAME
    382 		integration effort.  The branch is not actively used, as I
    383 		(itojun) use patch(1) and diff(1) for the KAME syncs.
    384 
    385 Branch:		keiichi-mipv6
    386 Description:	Developing Mobile IPv6 function
    387 Status:		Active
    388 Start Date:	21 Feb 2008
    389 End Date:	
    390 Base Tag:	keiichi-mipv6-base
    391 Maintainer:	Keiichi Shima <keiichi (a] netbsd.org>
    392 Scope:		sys, sbin, libc/net, distrib/sets, share/man/
    393 Notes:		http://www.mobileip.jp/
    394 		Work on developing Mobile IPv6/NEMO BS functions and
    395 		related MIPv6 based advanced functions on NetBSD.
    396 		Please consult keiichi for joining this activity.
    397 
    398 Branch:		kent-audio2
    399 Description:	In-kernel audio mixer
    400 Status:		Active
    401 Start Date:	Sun Jan 16 2005
    402 End Date:	
    403 Base Tag:	kent-audio2-base
    404 Maintainer:	TAMURA Kent <kent (a] NetBSD.org>
    405 Scope:		kernel (audio device drivers)
    406 Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
    407 		Please consult with the maintainer before committing
    408 		to this branch.
    409 		This branch is not expected to be compilable yet.
    410 
    411 Branch:		matt-timespec
    412 Description:	Convert the kernel to struct timespec as its primary time
    413 		storage mechanism.
    414 Status:		Inactive
    415 Start Date:	2005-02-19
    416 End Date:
    417 Base Tag:	
    418 Maintainer:	Matt Thomas <matt (a] NetBSD.org>
    419 Scope:		kernel
    420 Notes:	
    421 
    422 Branch:		matt-mips64
    423 Description:	Rototill the mips code to support LP64 mips and N32/N64 ABIs
    424 Status:		Mostly dead
    425 Start Date:	2007-07-17
    426 End Date:
    427 Base Tag:	matt-mips64-base
    428 Maintainer:	Matt Thomas <matt (a] NetBSD.org>
    429 Scope:		kernel & userland
    430 Notes:		
    431 
    432 Branch:		matt-nb5-mips64
    433 Description:	Rototill the mips code to support LP64 mips and N32/N64 ABIs
    434 Status:		Mostly dead
    435 Start Date:	2009-08-01
    436 End Date:
    437 Base Tag:	netbsd-5-0-1-RELEASE
    438 Maintainer:	Matt Thomas <matt (a] NetBSD.org>
    439 Scope:		kernel & userland
    440 Notes:		
    441 
    442 Branch:		mjf-devfs2
    443 Description:	device file system supporting dynamic device nodes
    444 Status:		Active
    445 Start Date:	21 February 2008
    446 End Date:
    447 Base Tag:	mjf-devfs2-base
    448 Maintainer:	Matt Fleming <mjf (a] NetBSD.org>
    449 Scope:		kernel and userland
    450 Notes:		This branch will move away from the static device nodes that
    451 		are created with MAKEDEV scripts and allow nodes to be created
    452 		and removed dynamically as devices are attached and detached
    453 		from the machine.
    454 
    455 Branch:		mjf-ufs-trans
    456 Description:	file system transactions for ufs
    457 Status:		Active
    458 Start Date:	12 March 2007
    459 End Date:
    460 Base Tag:	mjf-ufs-trans-base
    461 Maintainer:	Matt Fleming <mjf (a] NetBSD.org>
    462 Scope:		kernel
    463 Notes:
    464 
    465 Branch:		nick-hppapmap
    466 Description:	Update of hppa pmap with OpenBSD code.
    467 Status: 	Terminated; merged to -current
    468 Start Date:	27 October 2008
    469 End Date:	30 April 2009
    470 Base Tag:	nick-hppapmap-base3
    471 Maintainer:	Nick Hudson <skrll (a] NetBSD.org>
    472 Scope:		sys/
    473 Notes:		Port of the OpenBSD pmap including support for PA2.0 CPUs in
    474 		32-bit mode.
    475 
    476 Branch:		nick-net80211-sync
    477 Description:	sync of net80211 with FreeBSD
    478 Status:		Active
    479 Start Date:	21 February 2008
    480 End Date:
    481 Base Tag:	nick-net80211-base
    482 Maintainer:	Nick Hudson <skrll (a] NetBSD.org>
    483 Scope:		sys/
    484 Notes:		Sync'ing net80211 with FreeBSD and drivers update. The branch is
    485 		currently only the kernel, but will likely extend to some userland
    486 		areas.
    487 
    488 Branch:	  	pkgviews
    489 Description:  	package views, enabling multiple conflicting packages to co-exist
    490 Status:		Active
    491 Start Date:	22 July 2002
    492 End Date:
    493 Base Tag:	pkgviews
    494 Maintainer:	Alistair Crooks <agc (a] NetBSD.org>
    495 Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
    496 Notes:		A more flexible infrastructure for third-party packages by
    497 		allowing multiple conflicting packages and versions to co-exist
    498 		within the same tree
    499 
    500 Branch:		rpaulo-netinet-merge-pcb
    501 Description:	merge in6pcb with inpcb
    502 Status:		Dormant
    503 Start Date:	Wed Feb 01 2006
    504 End Date:	
    505 Base Tag:	rpaulo-netinet-merge-pcb-base
    506 Maintainer:	Rui Paulo <rpaulo (a] NetBSD.org>
    507 Scope:		src/sys
    508 Notes:		No longer active due to the lack of time. If you plan to
    509 		continue this branch, sys/netinet/in_pcb.h already contains
    510 		the proposed structure layout (which was roughly discussed
    511 		in the tech-net mailing list).
    512 		I also defined INP_*() macros to mimicate FreeBSD's inpcb
    513 		locking style, but currently they do nothing and are not
    514 		yet called at the correct places (needs discussion about
    515 		kernel fine-grained locking).
    516 		To continue this branch, one needs to read all the relevant
    517 		inpcb/in6pcb source files and change the function names,
    518 		structure names, structure fields according to the new
    519 		layout (in6pcb is gone).
    520 		Don't try to build a kernel from this branch because it won't
    521 		work. The missing pieces required to do a complete build
    522 		were not committed because they were incomplete and generated
    523 		panics.
    524 		You shouldn't need to worry about KAME syncs because
    525 		they did most of them by now.
    526 		After the work is done, you are required to test the branch
    527 		(before the merge to -current) with an interop IPv6 test.
    528 		More info at: http://www.tahi.org/
    529 
    530 Branch:		rtr-xorg-branch
    531 Description:	xorg & static build alterations to src/x11
    532 Status:		Active
    533 Start Date:	Nov 15 2004
    534 End Date:	
    535 Base tag:	rtr-xorg-branch-base
    536 Maintainer:	Tyler R. Retzlaff <rtr (a] NetBSD.org>
    537 Scope:		x11
    538 		distrib/sets/lists
    539 		share/mk/bsd.x11.mk
    540 		share/mk/bsd.own.mk
    541 		etc/mtree/NetBSD.dist
    542 Notes:		Requires parts of xsrc/xfree (HEAD)
    543 		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
    544 		Requires xorg (XORG-6_8_1)
    545 
    546 Branch:  	wrstuden-fixsa
    547 Description:	Fix a number of issues present with Scheduler Activations.
    548 Status: 	Active
    549 Start Date:	15 May 2007
    550 End Date:
    551 Base Tag:	wrstuden-fixsa-base
    552 Maintainer:	Bill Stouder-Studenmund <wrstuden (a] NetBSD.org>
    553 Scope:		src, though all the interesting stuff is in the kernel
    554 		or lib/libpthread or maybe gdb.
    555 Notes:		This branch is based off of the netbsd-4 branch!
    556 		This branch is intended to stage improvements for the
    557 		Scheduler Activations system for NetBSD 4. Improvements
    558 		include not allocating memory while preparing to tsleep(),
    559 		reducing inappropriate upcall delivery (hopefully also
    560 		eliminating the need to mlock stacks), and being
    561 		able to pthread_kill() running threads. At this date,
    562 		most goals have been achieved. This branch also includes
    563 		fixes to gdb to support working with threaded apps.
    564 
    565 Branch:  	wrstuden-revivesa
    566 Description:	Fix a number of issues present with Scheduler Activations.
    567 Status: 	Active
    568 Start Date:	10 May 2008
    569 End Date:
    570 Base Tag:	wrstuden-revivesa-base
    571 Maintainer:	Bill Stouder-Studenmund <wrstuden (a] NetBSD.org>
    572 Scope:		src, though all the interesting stuff is in the kernel
    573 Notes:		This branch is intended to revive Scheduler Activations
    574 		in -current in the 5.0 era. This branch's main goal is
    575 		to re-add syscall compatability so that SA-based libpthread
    576 		programs can run with a -current kernel. 1:1 threading will
    577 		remain the NetBSD-default. This branch will re-add necessary
    578 		upcall support, and will also serve as a chance to clean
    579 		out cruft that had accumulated in the implementation over
    580 		time.
    581 
    582 Branch:		yamt-kmem
    583 Description:	
    584 		- separate kernel va allocation from kernel fault handling.
    585 		- make kmem_alloc interrupt-safe.
    586 Status:		Active
    587 Start Date:	Sun Dec  9 2007
    588 End Date:	
    589 Base Tag:	yamt-kmem-base3
    590 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    591 Scope:		src/sys  (src/common is tagged but not branched)
    592 Notes:		
    593 		todo:
    594 		- investigate if PMAP_PREFER equivalent can be done
    595 		  with vmem_xalloc.  find a tester with hardware for it.
    596 		- g/c replaced code, including kmapent and malloc.
    597 		- consider to remove other submaps.  eg. mb_map
    598 
    599 Branch:		yamt-nfs-mp
    600 Description:	make nfs client mp-safe
    601 Status:		Active
    602 Start Date:	Sun Apr 27 2008
    603 End Date:	
    604 Base Tag:	yamt-nfs-mp-base6
    605 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    606 Scope:		src/sys  (src/common is tagged but not branched)
    607 Notes:		
    608 
    609 Branch:		reinoud-bufcleanup
    610 Description:	implement and evaluate struct buf usage cleanup strategies.
    611 		Ideas currently in mind (preference for b):
    612 		a)
    613 			1. use of bio_ops per buffer.
    614 			2. allow chaining/overloading of functions in bio_ops
    615 			   and provide some private context.
    616 			3. extend the bio_ops with commonly used functionality
    617 			   like pending action counting, custom context passing,
    618 			   last minute processing of buffer data, buffer cache
    619 			   etc.
    620 			4. investigate the use of the kcont()
    621 			   continuation-passing framework for async io
    622 			   completion notification for bufs
    623 			...
    624 		b)
    625 			1. all sequencing use of B_CALL replaced by
    626 			   device-threads, if possible generic code around BUFQ
    627 			2. possibly use kcont() for async IO finished signaling
    628 			3. counter of pending and queued actions requestable
    629 			   by IOCTL interface?
    630 			4. implement `last minute buffer fixup' calls and maybe
    631 			   even finished I/O calls as vnode operations
    632 			...
    633 Status:		Active
    634 Start Date:	Thu Mar 15 2007
    635 End Date:
    636 Base Tag:	reinoud-bufcleanup-base
    637 Maintainer:	Reinoud Zandijk <reinoud (a] NetBSD.org>
    638 Scope:		src/sys and src/common
    639 Notes:		Used as experiment sandbox and if successful hopefully one day
    640 		to be integrated.
    641 
    642 Branch:		thorpej-atomic
    643 Description:	Implementation of an atomic memory operations API modeled
    644 		after the one in Solaris 10.
    645 Status:		Active
    646 Start Date:	Apr 11 2007
    647 End Date:
    648 Base tag:	thorpej-atomic-base
    649 Maintainer:	Jason Thorpe <thorpej (a] netbsd.org>
    650 Scope:		src/common
    651 		src/sys
    652 Notes:		Base atomic primitives need to be implemented for
    653 		all of the supported architectures:
    654 
    655 		alpha		DONE
    656 		arm		DONE
    657 		hppa
    658 		i386		DONE
    659 		ia64
    660 		m68k		DONE (except for 68010)
    661 		mips
    662 		ns32k
    663 		powerpc		DONE except for membar_*()
    664 		powerpc64	DONE except for membar_*()
    665 		sh3
    666 		sparc		DONE except for membar_*()
    667 		sparc64		DONE except for membar_*()
    668 		vax
    669 		x86_64		DONE
    670 
    671 		Tested:
    672 
    673 		alpha		NO
    674 		arm		NO
    675 		hppa		NO
    676 		i386		NO
    677 		ia64		NO
    678 		m68k		NO
    679 		mips		NO
    680 		ns32k		NO
    681 		powerpc		NO
    682 		powerpc64	NO
    683 		sh3		NO
    684 		sparc		NO
    685 		sparc64		NO
    686 		vax		NO
    687 		x86_64		NO
    688 
    689 		TODO:
    690 
    691 		all		- Need to replace mb_*() with membar_*().
    692 
    693 				- Audit MUTEX_CAS() and RWLOCK_CAS() uses
    694 				  to see of membar_enter() is required here.
    695 
    696 				- Talk to ad@ -- figure out of non-atomic
    697 				  mutex / rwlock release is actually safe.
    698 
    699 		arm		- Consider using a RAS technique like
    700 				  MIPS uses for _lock_cas() and the mutex
    701 				  stubs.  Possibly do more than one atomic
    702 				  op as a RAS.  Possibly implement mutex
    703 				  stubs using the technique.
    704 
    705 		m68k		- Need to do 68010 support.
    706 		
    707 		i386		- Need to change when x86_patch() is called
    708 				  so we can test ncpus.
    709 
    710 		powerpc		- Figure out if we need barriers in the
    711 				  atomic ops themselves (hopefully not!)
    712 
    713 		x86_64		- Need to change when x86_patch() is called
    714 				  so we can test ncpus.
    715 
    716 ########################################################################
    717 # Individual developers' branches (Terminated):
    718 ########################################################################
    719 
    720 Branch:		bouyer-scsipi
    721 Description:	Integration of atapi support
    722 Status:		Terminated
    723 Start Date:
    724 End Date:
    725 Base Tag:
    726 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    727 Scope:		kernel
    728 Notes:		Superseded by thorpej_scsipi
    729 
    730 Branch:		bouyer-xen2
    731 Description:	update xen port to xen 2.0, with support for domain0 operations
    732 Status:		Terminated
    733 Start Date:	Dec 13 2004
    734 End Date:	Mar 10 2005
    735 Base Tag:	netbsd-2-base
    736 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    737 Scope:		src/sys/arch/xen
    738 Notes:
    739 
    740 Branch:		bouyer-xenamd64
    741 Description:	add amd64 support to Xen and rework some parts to share more code between Xen and others
    742 Status:		Terminated
    743 Start Date:	18 Oct 2007
    744 End Date:	22 Nov 2007
    745 Base Tag:	bouyer-xenamd64-base
    746 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    747 Scope:		kernel
    748 Notes:		
    749 
    750 Branch:		bouyer-xeni386
    751 Description:	switch xen on i386 to the x86 pmap and the xen/x86/x86_xpmap.c bootstrap, and add i386 PAE support
    752 Status:		Terminated
    753 Start Date:	10 Dec 2007
    754 End Date:	23 Jan 2008
    755 Base Tag:	bouyer-xeni386-base
    756 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    757 Scope:		kernel
    758 Notes:		
    759 
    760 Branch: 	chap-midi
    761 Description:	Renovation of MIDI support
    762 Status: 	Terminated; merged to -current
    763 Start Date:	19 May 2006
    764 End Date:	30 Jun 2006
    765 Base Tag:	chap-midi-base
    766 Maintainer:	Chapman Flack <chap (a] NetBSD.org>
    767 Scope:		sys, share/man, usr.bin
    768 Notes:
    769 
    770 Branch:		chs-ubc
    771 Description:	Unified Buffer Cache
    772 Status:		Terminated
    773 Start Date:
    774 End Date:
    775 Base Tag:	chs-ubc-base
    776 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    777 Scope:		kernel
    778 Notes:
    779 
    780 Branch:		chs-ubc2
    781 Description:	 Unified Buffer Cache
    782 Status:		Terminated; merged to -current
    783 Start Date:
    784 End Date:
    785 Base Tag:	chs-ubc2-base, chs-ubc2-newbase
    786 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    787 Scope:		kernel
    788 Notes:
    789 
    790 Branch:		cjs-build-against-obj-dir
    791 Description:	?
    792 Status:		?
    793 Start Date:
    794 End Date:
    795 Base Tag:
    796 Maintainer:	Curt Sampson <cjs (a] NetBSD.org>
    797 Scope:		Entire tree.
    798 Notes:
    799 
    800 Branch:		eeh-paddr_t
    801 Description:	use separate types for virtual vs. physical addresses
    802 Status:		Terminated; merged to -current
    803 Start Date:
    804 End Date:
    805 Base Tag:	eeh-paddr_t-base
    806 Maintainer:	Eduardo Horvath <eeh (a] NetBSD.org>
    807 Scope:		kernel
    808 Notes:		This is needed to support 32-bit kernels on sparc64.
    809 
    810 Branch:		elad-kernelauth
    811 Description:	Native NetBSD implementation of Apple's kernel authorization
    812 		based on TN2127. This is a "clean-room" implementation to
    813 		avoid any licensing issues.
    814 Status:		Terminated; merged to -current
    815 Start Date:	Tue Mar	 7 2006
    816 End Date:	Mon May 15 2006
    817 Base Tag:	elad-kernelauth-base
    818 Maintainer:	Elad Efrat <elad (a] NetBSD.org>
    819 Scope:		src/sys, src/share/man/man9/Makefile,
    820 		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
    821 Notes:
    822 
    823 Branch:		fvdl-softdep
    824 Description:	FFS soft dependencies
    825 Status:		Terminated; merged to -current
    826 Start Date:
    827 End Date:
    828 Base Tag:	fvdl-softdep-base
    829 Maintainer:	Frank van der Linden <fvdl (a] NetBSD.org>
    830 Scope:		kernel
    831 Notes:
    832 
    833 Branch:		gehenna-devsw
    834 Description:	auto-generation of devsw table
    835 Status:		Terminated
    836 Start Date:	16 May 2002
    837 End Date:	6 Sep 2002
    838 Base Tag:	gehenna-devsw-base
    839 Maintainer:	MAEKAWA Masahide <gehenna (a] NetBSD.org>
    840 Scope:		syssrc
    841 Notes:		The goal is to get rid of the existing device switch tables in
    842 		port-dependent conf.c and to generate them dynamically by
    843 		config(8).
    844 
    845 Branch:         haad-dm
    846 Description:    Add support for LVM to NetBSD
    847 Status:         Terminated; merged with -current
    848 Start Date:     7 July 2008
    849 End Date:	19 December 2008
    850 Base Tag:       haad-dm-base
    851 Maintainer:     Adam Hamsik <haad (a] NetBSD.org>
    852 Scope:          kernel
    853 Notes:          LVM support is based on Linux lvm2tools, 
    854                 libdevmapper library and NetBSD device-mapper
    855                 driver. 
    856 
    857 Branch:		is-newarp
    858 Description:	ARP for non-Ethernet
    859 Status:		Terminated; merged before NetBSD 1.3
    860 Start Date:	1996/10/13
    861 End Date:	1997/03/15
    862 Base Tag:	is-newarp-base
    863 Maintainer:	Ignatios Souvatzis <is (a] NetBSD.org>
    864 Scope:		kernel
    865 Notes:
    866 
    867 Branch:		jmcneill-pm
    868 Description:	Power management framework overhaul, ACPI improvements
    869 Status:		Terminated; merged before NetBSD 5.0
    870 Start Date:	3 Aug 2007
    871 End Date:	9 Dec 2007
    872 Base Tag:	jmcneill-pm-base
    873 Maintainer:	Jared D. McNeill <jmcneill (a] NetBSD.org>
    874 Scope:		kernel
    875 Notes:		
    876 
    877 Branch:		kenh-if-detach
    878 Description:	Interface detach support.
    879 Status:		?
    880 Start Date:
    881 End Date:
    882 Base Tag:	kenh-if-detach-base
    883 Maintainer:	Ken Hornstein <kenh (a] NetBSD.org>
    884 Scope:		kernel
    885 Notes:
    886 
    887 Branch:		kent-audio1
    888 Description:	Audio converter pipeline
    889 Status:		Terminated; merged to -current
    890 Start Date:	Tue Dec  7 2004
    891 End Date:	Tue Jan 11 2005
    892 Base Tag:	kent-audio1-base
    893 Maintainer:	TAMURA Kent <kent (a] NetBSD.org>
    894 Scope:		kernel (audio device drivers)
    895 Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
    896 		Please consult with the maintainer before committing
    897 		to this branch.
    898 
    899 Branch:		kqueue
    900 Description:	kqueue kernel event notification mechanism (from FreeBSD)
    901 Status:		Terminated; merged to -current
    902 Start Date:	Tue Jul 10 23:08:38 EST 2001
    903 End Date:	Tue Oct 24 09:14:14 GMT 2002
    904 Base Tag:	kqueue-base
    905 Maintainer:	Jaromir Dolecek <jdolecek (a] NetBSD.org>
    906 Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
    907 Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
    908 		local internal changes to better suit NetBSD, and
    909 		enhancements such as looking up filters by name or
    910 		number, and dynamic registration of "user" filters.
    911 		The work is complete as is, but is awaiting more
    912 		feedback from various kernel gurus before going mainline.
    913 
    914 Branch:		ktrace-lwp
    915 Description:	ktrace support for lwp ids.
    916 Status:		Terminated; merged to -current
    917 Start Date:	Wed Jul  2 15:27:30 UTC 2003
    918 End Date:	Sun Dec 11 12:25:29 UTC 2005
    919 Base Tag:	ktrace-lwp-base
    920 Maintainer:	Darren Reed <darrenr (a] NetBSD.org>
    921 Scope:		sys
    922 Notes:		
    923 
    924 Branch:		marc-pcmcia
    925 Description:	PCMCIA support
    926 Status:		Terminated; merged to -current
    927 Start Date:
    928 End Date:
    929 Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
    930 Maintainer:	Marc Horowitz <marc (a] NetBSD.org>
    931 Scope:		kernel
    932 Notes:
    933 
    934 Branch:		matt-armv6
    935 Description:	Rototill the arm code to support features present in the
    936 		v6 of the ARM Architecture.  Additionally, clean up things
    937 		along the way to use common practices.
    938 Status:		Terminated; merged to -current
    939 Start Date:	2007-08-27
    940 End Date:	2008-04-27
    941 Base Tag:	matt-armv6-base
    942 Maintainer:	Matt Thomas <matt (a] NetBSD.org>
    943 Scope:		kernel & userland
    944 Notes:	
    945 
    946 Branch:		minoura_x68k_bus_h
    947 Description:	bus_space(9) and bus_dma(9) implementation for x68k
    948 Status:		Terminated; merged to -current
    949 Start Date:	23 Dec 1998
    950 End Date:	16 Mar 1999
    951 Base Tag:	minoura_x68k_bus_h-base
    952 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    953 Scope:		sys/arch/x68k
    954 Notes:
    955 
    956 Branch:		minoura-xpg4dl
    957 Description:	Citrus Project locale subsystem
    958 Status:		Terminated; (partly) merged to -current
    959 Start Date:	28 March 2000
    960 End Date:
    961 Base Tag:	minoura-xpg4dl-base
    962 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    963 Scope:		basesrc, syssrc, sharesrc
    964 Notes:		Citrus Project is developing dynamically-loadable, codeset-
    965 		independent locale subsystem.  Part of the implementation
    966 		(LC_CTYPE) called XPG4DL is now integrated to -current.
    967 
    968 Branch:		mjf-devfs
    969 Description:	device file system supporting dynamic device nodes
    970 Status:		Terminated
    971 Start Date:	12 November 2007
    972 End Date:	21 February 2008
    973 Base Tag:	mjf-devfs-base
    974 Maintainer:	Matt Fleming <mjf (a] NetBSD.org>
    975 Scope:		kernel and userland
    976 Notes:		This branch will move away from the static device nodes that
    977 		are created with MAKEDEV scripts and allow nodes to be created
    978 		and removed dynamically as devices are attached and detached
    979 		from the machine.
    980 
    981 Branch:		mrg-vm-swap
    982 Description:	dynamic swap allocation, swap-to-files support
    983 Status:		Terminated; abandoned for mrg-vm-swap2
    984 Start Date:	12 February 1997
    985 End Date:	15 March 1997
    986 Base Tag:	[none]
    987 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
    988 Scope:		kernel
    989 Notes:
    990 
    991 Branch:		mrg-vm-swap2
    992 Description:	dynamic swap allocation, swap-to-files support
    993 Status:		Terminated; merged to -current
    994 Start Date:	4 May 1997
    995 End Date:	12 June 1997
    996 Base Tag:	mrg-vm-swap2-base
    997 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
    998 Scope:		kernel
    999 Notes:
   1000 
   1001 Branch:		nathanw_sa
   1002 Description:	Scheduler activations
   1003 Status:		Terminated; merged to -current
   1004 Start Date:	5 March 2001
   1005 End Date:	18 January 2003
   1006 Base Tag:	nathanw_sa_base
   1007 Maintainer:	Nathan Williams <nathanw (a] NetBSD.org>
   1008 Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
   1009 		bin/ps usr.bin/systat usr.bin/top usr.bin/w
   1010 		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
   1011 Notes:		The idea of scheduler activations is described in the
   1012 		classic paper by Anderson et al., in ACM Transactions
   1013 		a on Computer Systems volume 10 issue 1 (1992),which
   1014 		can be found at
   1015 		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
   1016 		Many ideas in the implementation are based on the
   1017 		implementation of scheduler activations added to Mach
   1018 		3.0 and described by Davis et al. in the University of
   1019 		Washington CS tech report 92-08-93, which can be found
   1020 		at
   1021 		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
   1022 
   1023 		My USENIX paper on the subject can be found at
   1024 		http://web.mit.edu/nathanw/www/usenix/
   1025 
   1026 		Please consult with the maintainer before committing
   1027 		to this branch.
   1028 		Other tags starting with nathanw_sa reserved for
   1029 		branch management and are not guaranteed to be stable.
   1030 
   1031 		Trunk tagged with "nathanw_sa_before_merge" prior to
   1032 		merging branch down to trunk.  Branch tagged with
   1033 		"nathanw_sa_end" to indicate the ending revision of
   1034 		the branch.
   1035 
   1036 Branch:		newlock
   1037 Description:	New locking primitives, based on Solaris's
   1038 Status:		Terminated
   1039 Start Date:	March 9, 2002
   1040 End Date:	February 12, 2007
   1041 Base Tag:	newlock-base
   1042 Maintainer:	Jason R. Thorpe <thorpej (a] NetBSD.org>
   1043 Scope:		Kernel
   1044 Notes:		The goal is to replace the existing lockmgr() and
   1045 		simple_lock() based locking mechanisms with the
   1046 		primitives found in Solaris: mutexes and rwlocks.
   1047 		Superseded by the newlock2 branch.
   1048 
   1049 Branch:		newlock2
   1050 Description:	New locking primitives, based on Solaris's
   1051 Status:		Terminated
   1052 Start Date:	September 9, 2006
   1053 End Date:	February 12, 2007
   1054 Base Tag:	newlock2-base
   1055 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
   1056 Scope:		Kernel
   1057 Notes:		As per the newlock branch, however given the amount of time
   1058 		the original branch has lain dormant, a new one has been
   1059 		created.  Goals:
   1060 		- Implement new locking primitives on most-used ports.
   1061 		- Minor locking improvements.
   1062 		- Remove spinlockmgr().
   1063 
   1064 Branch:		nick-csl-alignment
   1065 Description:	Provide correctly aligned __cpu_simple_lock_t for hppa
   1066 Status: 	Terminated; merged to -current
   1067 Start Date:	2007-07-18
   1068 End Date:
   1069 Base Tag:	nick-csl-alignment-base5
   1070 Maintainer:	Nick Hudson <skrll (a] NetBSD.org>
   1071 Scope:		sys, lib/libpthread, lib/libpthread_dbg
   1072 Notes:	
   1073 
   1074 Branch:		perseant-lfsv2
   1075 Description:	LFS incompatible on-disk data structure changes
   1076 Status:		Terminated
   1077 Start Date:	27 June 2001
   1078 End Date:	16 July 2001
   1079 Base Tag:	perseant-lfsv2-base
   1080 Maintainer:	Konrad Schroder <perseant (a] NetBSD.org>
   1081 Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
   1082 Notes:		This branch should be short-lived, I expect to merge as soon
   1083 		as the data structures required for unremove are in and tested.
   1084 
   1085 Branch:		ppcoea-renovation
   1086 Description:	General renovation and cleanup of all OEA PowerPC ports.
   1087 Status:		Terminated; merged to -current
   1088 Start Date:	30 April 2007
   1089 End Date:	15 October 2007
   1090 Base Tag:	ppcoea-renovation-base
   1091 Maintainer:	Tim Rightnour <garbled (a] netbsd.org>
   1092 Scope:		src/sys/arch
   1093 Notes:		This branch is for a general cleanup of all OEA-based PowerPC
   1094 		ports. OEA (Operating Environment Architecture) PowerPC refers
   1095 		to the 601, 603, 604, and similar chips.  Specifically, not the
   1096 		403/401 and other embedded chips. The general concept is to get
   1097 		them all compiling, and sharing as much code as possible.  All
   1098 		developers are welcome to commit to this branch.
   1099 
   1100 Branch:		thorpej-devvp
   1101 Description:	replace dev_t with struct vnode * in devsw entry points
   1102 Status:		Terminated
   1103 Start Date:	Sep 6 2001
   1104 End Date:	???
   1105 Base Tag:	thorpej-devvp-base
   1106 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
   1107 Scope:		syssrc
   1108 Notes:		Kernels built from this branch are not expected
   1109 		to function correctly at this time.
   1110 
   1111 		Ports known to compile on this branch:
   1112 			alpha
   1113 			i386
   1114 
   1115 Branch:		peter-altq
   1116 Description:	New ALTQ framework:
   1117 		- sync with KAME sources
   1118 		- share mtag/name mapping functions
   1119 		- separate altq + pf attachment
   1120 Status:		Terminated; merged to -current
   1121 Start Date:	March 16, 2006
   1122 End Date:	October 12, 2006
   1123 Base Tag:	peter-altq-base
   1124 Maintainer:	Peter Postma <peter (a] NetBSD.org>,
   1125 		Martin Husemann <martin (a] NetBSD.org>,
   1126 		Matthias Scheler <tron (a] NetBSD.org>
   1127 Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
   1128 Notes:		Only the first item in the description was finished
   1129 		in this branch.
   1130 
   1131 Branch:		sommerfeld_i386mp_1
   1132 Description:	Multiprocessor support for i386 using Intel MP BIOS.
   1133 Status:		Terminated; merged to -current
   1134 Start Date:	21 Feb 2000
   1135 End Date:	01 Oct 2002
   1136 Base Tag:	sommerfeld_i386mpbase_1
   1137 Maintainer:	Bill Sommerfeld <sommerfeld (a] NetBSD.org>
   1138 Scope:		sys/arch/i386
   1139 Notes:
   1140 		Code committed to the branch has booted to multiuser 
   1141 		on at least one system.
   1142 
   1143 		Not guaranteed to compile against mainline since -current
   1144 		may have changed incompatibly with the last branch update;
   1145 		use "cvs update -D" to roll-back the rest of the tree to match.
   1146 
   1147 		Please get explicit permission from the maintainer 
   1148 		before each commit, or your changes will be backed out.
   1149 		Other tags starting with sommerfeld_ are private to 
   1150 		the developer and are guaranteed to be unstable.
   1151 		Only the maintainer should move tags.
   1152 
   1153 		Note that this branch uses a DIFFERENT scheme for 
   1154 		syncing with the mainline.  the maintainer uses some private
   1155 		scripts for keeping them in sync; if you make commits 
   1156 		to the branch to "resynchronize" things, you'll
   1157 		probably do it wrong; instead, ask the maintainer to
   1158 		resynchronize things.
   1159 
   1160 		See sys/arch/i386/TODO on the branch for a list of known
   1161 		issues with the branch.
   1162 
   1163 Branch:		thorpej-mips-cache
   1164 Description:	overhaul MIPS cache support code
   1165 Status:		Terminated; merged to -current
   1166 Start Date:	Oct 23 2001
   1167 End Date:	Nov 14 2001
   1168 Base Tag:	thorpej-mips-cache-base
   1169 Scope:		syssrc
   1170 Notes:		This branch needs more debugging, testing, and more
   1171 		ports need to be converted to the new world order.
   1172 
   1173 		The following processors have had cache ops
   1174 		written:
   1175 
   1176 			* R2000/R3000 (cache_r3k) -- light testing,
   1177 			  needs to be beat on a lot more to make
   1178 			  sure it's working.
   1179 
   1180 			* R4000/R4400 (cache_r4k) -- mhitch (a] NetBSD.org
   1181 			  tracked down a bug, which has been fixed.
   1182 
   1183 			  Confirmed working on R4000-with-L2.
   1184 
   1185 			  Confirmed working on R4400-no-L2 and
   1186 			  R4400-with-L2.
   1187 
   1188 			* R4600/R5000 (cache_r5k) -- shin (a] NetBSD.org
   1189 			  has committed fixes to this code.
   1190 
   1191 			  Confirmed working on R4600 v2 (SGI IP-22 with
   1192 			  no SysAD L2 cache).
   1193 
   1194 			  Confirmed working on RM5260 (Algorithmics P-5064).
   1195 
   1196 			* TX39 (cache_tx39) -- uch (a] NetBSD.org has
   1197 			  committed fixes to this code.  Awaiting
   1198 			  confirmation that it is working properly.
   1199 
   1200 			* R5900 (cache_r5900) -- uch (a] NetBSD.org has
   1201 			  written this code and tested it on a
   1202 			  PlayStation 2.
   1203 
   1204 		The following ports have been updated to compile (and
   1205 		use optimized-for-processor bus_dma routines).  Those
   1206 		that have been tested and work are marked with [WORKING].
   1207 
   1208 			* algor		[WORKING]
   1209 
   1210 			* arc		[WORKING]
   1211 
   1212 			* pmax		[WORKING]
   1213 
   1214 			* playstation2	[WORKING]
   1215 					Needs optimized bus_dmamap_sync().
   1216 
   1217 			* hpcmips	[need verification that this is working]
   1218 					Needs optimized bus_dmamap_sync().
   1219 
   1220 			* sgimips	[WORKING]
   1221 					Needs optimized bus_dmamap_sync().
   1222 
   1223 			* cobalt	[need testing]
   1224 
   1225 			* mipsco	[need testing]
   1226 
   1227 			* newsmips	[need testing]
   1228 
   1229 Branch:		thorpej_scsipi
   1230 Description:	SCSI/ATAPI midlayer rewrite.
   1231 Status:		Terminated; merged to -current
   1232 Start Date:
   1233 End Date:	Apr 25 2001
   1234 Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
   1235 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>,
   1236 		Jason Thorpe <thorpej (a] NetBSD.org>
   1237 Scope:		syssrc
   1238 Notes:		When a change from -current is pulled up please move the
   1239 		thorpej_scsipi_base tag to the revision you're syncing with.
   1240 		thorpej_scsipi_nbase is private to maintainer (only
   1241 		used when syncing the whole branch with HEAD).
   1242 		Just before the merge, syssrc has been tagged with
   1243 		thorpej_scsipi_beforemerge
   1244 
   1245 Branch:		thorpej-signal
   1246 Description:	?
   1247 Status:		?
   1248 Start Date:
   1249 End Date:
   1250 Base Tag:	thorpej-signal-base
   1251 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
   1252 Scope:		kernel
   1253 Notes:
   1254 
   1255 Branch:		thorpej-setroot
   1256 Description:	?
   1257 Status:		Terminated; merged to -current
   1258 Start Date:
   1259 End Date:
   1260 Base Tag:
   1261 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
   1262 Scope:		kernel
   1263 Notes:
   1264 
   1265 Branch:		simonb-timecounters
   1266 Description:	Port FreeBSD timecounters to NetBSD
   1267 Status:		Terminated
   1268 Start Date:	Sat Feb 04 2006
   1269 End Date:	Wed Jun 07 2006
   1270 Base Tag:	simonb-timecounters-base
   1271 Maintainer:	Simon Burge <simonb (a] NetBSD.org>,
   1272 		Frank Kardel <kardel (a] NetBSD.org>
   1273 Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
   1274 Notes:		early (partial conversion) commit to -current
   1275 		ok'ed by core@ on 20060605 for testing and further
   1276 		simplified conversion
   1277 
   1278 Branch:		simonb-wapbl
   1279 Description:	Wasabi's journaling filesystem support
   1280 Status:		Terminated; merged to -current
   1281 Start Date:	Tue Jun 10 2008
   1282 End Date:	Thu Jul 31 2008
   1283 Base Tag:	simonb-wapbl-base
   1284 Maintainer:	Simon Burge <simonb (a] NetBSD.org>
   1285 Scope:		src/distrib/sets/lists/comp src/distrib/utils/sysinst
   1286 		src/include
   1287 		src/sbin/fsck_ffs src/sbin/fsdb src/sbin/mount_ffs
   1288 		src/sbin/tunefs src/usr.sbin/dumpfs src/sys
   1289 Notes:		Still has a number of issues:
   1290 		 - Some heavy workload performance issues on SMP machines.
   1291 		   Work around this issue by turning on WAPBL_DEBUG_SERIALIZE
   1292 		   in rev 1.1.2.11 of vfs_wapbl.c.
   1293 		 - Removing large files (sparse only?) takes a long time.
   1294 		   Eg, a file created with
   1295 		      dd if=/dev/zero of=foox bs=1 count=1 seek=11261748520550
   1296 		   takes 0:00.00 to remove on my test box without logging and
   1297 		   0:22.25 to remove with logging.  No disk IO during this...
   1298 		 - sysinst should use in-fs logs now, not end-of-partition logs.
   1299 
   1300 Branch:		vmlocking
   1301 Description:	Make VM and file system framework MP safe
   1302 Status:		Terminated
   1303 Start Date:	13 March 2007
   1304 End Date:	4 December 2007
   1305 Base Tag:	vmlocking-base
   1306 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
   1307 Scope:		kernel
   1308 Notes:		Superseded by vmlocking2 branch.
   1309 
   1310 Branch:		vmlocking2
   1311 Description:	Make VM and file system framework MP safe
   1312 Status:		Terminated
   1313 Start Date:	4 December 2007
   1314 End Date:	2 January 2008
   1315 Base Tag:	vmlocking2-base3
   1316 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
   1317 Scope:		kernel
   1318 Notes:		Goals:
   1319 
   1320 		- Make VM system / trap handling MP safe.
   1321 		- Replace simplelocks with mutexes.
   1322 		- Make file system framework MP safe.
   1323 
   1324 		Status by architecture:
   1325 
   1326 		  alpha		done
   1327 		  i386		done
   1328 		  amd64		done
   1329 		  mips		done
   1330 		  sparc		need pmap/trap locking changes	
   1331 		  sparc64	done
   1332 		  arm		done
   1333 		  powerpc	done
   1334 		  hppa		done
   1335 		  sh3		done
   1336 		  m68k		done
   1337 		  xen		need pmap/trap locking changes
   1338 
   1339 		Remaining MI work to do:
   1340 
   1341 		- Check aliased vnode handling. There may be problems.
   1342 
   1343 		Remaining problems:
   1344 
   1345 		- LFS stalls due to v_numoutput leak.
   1346 
   1347 Branch:		wrstuden-devbsize
   1348 Description:	Modify buffer cache to deal with different devices having
   1349 		different block sizes. Also DEV_BSIZE would go away.
   1350 Status:		Terminated
   1351 Start Date:	Aug or Sept 1999
   1352 End Date:	1 Apr 2000
   1353 Base tag:	wrstuden-devbsize-base
   1354 Maintainer:	Bill Studenmund <wrstuden (a] NetBSD.org>
   1355 Scope:		kernel
   1356 Notes:		No longer active due to lack of time, and introduction
   1357 		of UBC. In terms of UBC, the primary cache for
   1358 		file data is the VM cache, which needs to operate
   1359 		in terms of VM pages. As no existing device has native
   1360 		pages the same size as our VM pages, there already is
   1361 		a mapping going on between the VM system and the
   1362 		underlying blocks. So it would be easier and cleaner
   1363 		to adjust that to deal w/ different block sizes.
   1364 		Also with UBC, all i/o is in terms of bytes at an offset
   1365 		with a certain length, so the exact block size isn't a big
   1366 		deal.
   1367 
   1368 		Any other wrstuden-devbsize tag may (and should) go away.
   1369 
   1370 Branch:		yamt-idlelwp
   1371 Description:	idle lwp, and some changes depending on it.
   1372 
   1373 		1. separate context switching and thread scheduling.
   1374 		   (cf. gmcgarry_ctxsw)
   1375 		2. implement idle lwp.
   1376 		3. clean up related MD/MI interfaces.
   1377 		4. make scheduler(s) modular.
   1378 
   1379 Status:		Terminated; merged to -current
   1380 Start Date:	Fri Feb 17 2007
   1381 End Date:	Thu May 17 2007
   1382 Base Tag:	yamt-idlelwp-base8
   1383 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1384 Scope:		src/sys  (src/common is tagged but not branched)
   1385 Notes:		
   1386 		Status of ports:
   1387 		  alpha			[ Done, UP tested, MP not tested ]
   1388 		  i386			[ Done, tested ]
   1389 		  amd64			[ Done, tested ]
   1390 		  mips			[ Done, both MIPS1 and MIPS3 tested]
   1391 		  sparc			[ Done, UP tested, MP might have
   1392 					  some problem after newlock2 merge ]
   1393 		  sparc64		[ Done, tested ]
   1394 		  arm			[ Done, SA1 tested. See PR 36548 ]
   1395 		  macppc/powerpc	[ Done, OEA tested ]
   1396 		  hppa			[ Done, tested ]
   1397 		  sh3			[ Done, tested ]
   1398 		  vax			[ Done, UP tested, MP untested ]
   1399 		  m68k			[ Done, tested on several ports ]
   1400 		  ns32k			[ broken ]
   1401 		  ia64			[ broken ]
   1402 		  pdp10			[ broken ]
   1403 
   1404 		How to adapt a port?
   1405 
   1406 		- unify cpu_switch, cpu_exit, cpu_switchto into
   1407 		  a single cpu_switchto.  see cpu_switchto.9.
   1408 
   1409 		- implement cpu_idle.  see cpu_idle.9.
   1410 
   1411 		- add a flag argument to cpu_need_resched.
   1412 		  handle RESCHED_IMMED flag, which means "cause a preemption
   1413 		  as soon as possible."  eg. in the case of MULTIPROCESSOR,
   1414 		  send an IPI to the target cpu.
   1415 
   1416 		- "curlwp == NULL" is not a valid check for idle state anymore.
   1417 		  use "(curlwp->l_flag & LW_IDLE) != 0" instead.  curlwp is
   1418 		  almost always non-NULL, with exceptions like early on boot.
   1419 
   1420 		- remove idle pcbs.
   1421 
   1422 		- (if MULTIPROCESSOR) tweak processor trampoline code.
   1423 
   1424 		- (if MULTIPROCESSOR) call mi_cpu_attach when attaching
   1425 		  secondary processors.
   1426 
   1427 		- (if schedhz!=0) call schedclock regardless of the value of
   1428 		  curlwp.
   1429 
   1430 		- of course, update MD users of scheduler/switching API.
   1431 
   1432 Branch:		yamt-lazymbuf
   1433 Description:	change the way to share mbuf external storage so that
   1434 		it can work without kernel_lock.
   1435 Status:		Terminated; merged to -current
   1436 Start Date:	Wed Jul  6 2005
   1437 End Date:	Mon Mar 24 2008
   1438 Base Tag:	yamt-lazymbuf-base14
   1439 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1440 Scope:		src/sys  (src/common is tagged but not branched)
   1441 Notes:		
   1442 
   1443 Branch:		yamt-km, yamt-km-doc
   1444 Description:	simplify/improve kernel memory management and bootstrap
   1445 Status:		Terminated; merged to -current
   1446 Start Date:	Tue Jan 25 2005
   1447 End Date:	Fri Apr  1 2005
   1448 Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
   1449 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1450 Scope:		yamt-km: src/sys
   1451 		yamt-km-doc: src/share/man/man9/uvm.9
   1452 Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
   1453 
   1454 		the followings are per-port status.
   1455 		(account names mean "tested by".)
   1456 
   1457 		works enough to go to multiuser:
   1458 			alpha, i386, xen (yamt@)
   1459 			pc532 (simonb@)
   1460 			alpha, i386, mac68k, macppc, pmax, shark,
   1461 			    sparc, sparc64, sun3, x68k (chs@)
   1462 			cobalt, dreamcast, hp300, news68k, newsmips,
   1463 			    sun3x (tsutsui@)
   1464 			amiga (mhitch@)
   1465 			cats, hp700 (skrll@)
   1466 			xen (bouyer@)
   1467 
   1468 		known to have the same problem as trunk:
   1469 			vax (chs@, stuck while running kvm_mkdb)
   1470 
   1471 		known to have a problem:
   1472 			luna68k (and, if any, other m68k ports which use TTR)
   1473 			needs to be revisited.
   1474 			-> for luna68k, although not tested,
   1475 			   Sysmap has been moved to avoid kva conflict with
   1476 			   I/O ranges.
   1477 
   1478 		buildable:
   1479 			src/sys/arch/acorn26/conf/GENERIC
   1480 			src/sys/arch/acorn32/conf/GENERIC
   1481 			src/sys/arch/algor/conf/P6032
   1482 			src/sys/arch/alpha/conf/GENERIC
   1483 			src/sys/arch/alpha/conf/GENERIC.MP
   1484 			src/sys/arch/amd64/conf/GENERIC
   1485 			src/sys/arch/amd64/conf/GENERIC.MP
   1486 			src/sys/arch/amiga/conf/GENERIC
   1487 			src/sys/arch/arc/conf/GENERIC
   1488 			src/sys/arch/atari/conf/MILAN-PCIIDE
   1489 			src/sys/arch/bebox/conf/GENERIC
   1490 			src/sys/arch/cats/conf/GENERIC
   1491 			src/sys/arch/cesfic/conf/GENERIC
   1492 			src/sys/arch/cobalt/conf/GENERIC
   1493 			src/sys/arch/dreamcast/conf/GENERIC
   1494 			src/sys/arch/evbarm/conf/TS7200
   1495 			src/sys/arch/evbppc/conf/WALNUT
   1496 			src/sys/arch/evbsh3/conf/COMPUTEXEVB
   1497 			src/sys/arch/evbsh5/conf/CAYMAN64
   1498 			src/sys/arch/hp300/conf/GENERIC
   1499 			src/sys/arch/hp700/conf/GENERIC
   1500 			src/sys/arch/hpcarm/conf/JORNADA728
   1501 			src/sys/arch/hpcmips/conf/GENERIC
   1502 			src/sys/arch/hpcsh/conf/GENERIC
   1503 			src/sys/arch/hpcsh/conf/HPW650PA
   1504 			src/sys/arch/i386/conf/GENERIC
   1505 			src/sys/arch/i386/conf/GENERIC.MP
   1506 			src/sys/arch/i386/conf/XEN0
   1507 			src/sys/arch/i386/conf/XENU
   1508 			src/sys/arch/ibmnws/conf/GENERIC
   1509 			src/sys/arch/iyonix/conf/GENERIC
   1510 			src/sys/arch/luna68k/conf/GENERIC
   1511 			src/sys/arch/mac68k/conf/GENERIC
   1512 			src/sys/arch/macppc/conf/GENERIC
   1513 			src/sys/arch/macppc/conf/GENERIC.MP
   1514 			src/sys/arch/mipsco/conf/GENERIC
   1515 			src/sys/arch/mmeye/conf/GENERIC
   1516 			src/sys/arch/mvme68k/conf/GENERIC
   1517 			src/sys/arch/netwinder/conf/GENERIC
   1518 			src/sys/arch/news68k/conf/GENERIC
   1519 			src/sys/arch/newsmips/conf/GENERIC
   1520 			src/sys/arch/next68k/conf/GENERIC
   1521 			src/sys/arch/ofppc/conf/GENERIC
   1522 			src/sys/arch/pc532/conf/GENERIC
   1523 			src/sys/arch/pmax/conf/GENERIC
   1524 			src/sys/arch/prep/conf/GENERIC
   1525 			src/sys/arch/sandpoint/conf/GENERIC
   1526 			src/sys/arch/sbmips/conf/GENERIC
   1527 			src/sys/arch/sgimips/conf/GENERIC32_IP3x
   1528 			src/sys/arch/shark/conf/GENERIC
   1529 			src/sys/arch/sparc/conf/GENERIC
   1530 			src/sys/arch/sparc/conf/GENERIC.MP
   1531 			src/sys/arch/sparc64/conf/GENERIC
   1532 			src/sys/arch/sparc64/conf/GENERIC.MP
   1533 			src/sys/arch/sun2/conf/GENERIC
   1534 			src/sys/arch/sun3/conf/GENERIC
   1535 			src/sys/arch/vax/conf/GENERIC
   1536 			src/sys/arch/vax/conf/GENERIC.MP
   1537 			src/sys/arch/x68k/conf/GENERIC
   1538 
   1539 			src/sys/arch/playstation2/conf/GENERIC
   1540 
   1541 Branch:		yamt-pdpolicy
   1542 Description:	play with page replacement policy
   1543 		- separate page replacement policy from the rest of kernel
   1544 		- implement alternative replacement policy
   1545 		- related read-ahead adjustment?
   1546 Status:		Terminated; merged to -current
   1547 Start Date:	Sun Mar  5 2006
   1548 End Date:	Sat Sep 16 2006
   1549 Base Tag:	yamt-pdpolicy-base9
   1550 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1551 Scope:		src/sys  (src/common is tagged but not branched)
   1552 Notes:		
   1553 
   1554 Branch:		yamt-pf42
   1555 Description:	import newer pf from OpenBSD 4.2
   1556 Status:		Terminated; merged to -current
   1557 Start Date:	Sat Apr 19 2008
   1558 End Date:	Wed Jun 18 2008
   1559 Base Tag:	yamt-pf42-base4
   1560 Maintainer:	Peter Postma <peter (a] NetBSD.org>,
   1561 		YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1562 Scope:		src
   1563 Notes:		see sys/dist/pf/net/TODO
   1564 
   1565 Branch:		yamt-readahead
   1566 Description:	play with file readahead
   1567 Status:		Terminated; merged to -current
   1568 Start Date:	Mon Nov 14 2005
   1569 End Date:	Wed Nov 30 2005
   1570 Base Tag:	yamt-readahead-base3
   1571 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1572 Scope:		src/sys
   1573 Notes:		
   1574 
   1575 Branch:		yamt-uio_vmspace
   1576 Description:	uio_lwp/uio_segflg -> uio_vmspace
   1577 Status:		Terminated; merged to -current
   1578 Start Date:	Mon Dec 31 2005
   1579 End Date:	Wed Mar  1 2006
   1580 Base Tag:	yamt-uio_vmspace-base5
   1581 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1582 Scope:		src/sys
   1583 Notes:		
   1584 
   1585 Branch:		yamt-splraiseipl
   1586 Description:	finish implementing splraiseipl (and makeiplcookie).
   1587 		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
   1588 
   1589 		- completes workqueue(9) and netbt.
   1590 		- fix PR/33218.
   1591 
   1592 Status:		Terminated; merged to -current
   1593 Start Date:	Mon Sep 18 2006
   1594 End Date:	Fri Dec 22 2006
   1595 Base Tag:	yamt-splraiseipl-base5
   1596 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1597 Scope:		src/sys  (src/common is tagged but not branched)
   1598 Notes:		
   1599 		tested (by who):
   1600 			alpha		(yamt)
   1601 			alpha		(pavel)
   1602 			amd64		(reported privately)
   1603 			cobalt		(tsutsui)
   1604 			ews4800mips	(tsutsui)
   1605 			hp300		(tsutsui)
   1606 			hpcarm		(reported privately)
   1607 			i386		(yamt)
   1608 			macppc		(tsutsui)
   1609 			news68k		(tsutsui)
   1610 			sgimips(IP32)	(tsutsui)
   1611 			sparc(sun4c)	(tsutsui)
   1612 			sun2		(tsutsui)
   1613 			sun3		(tsutsui)
   1614 			sun3x		(tsutsui)
   1615 			xen		(yamt)
   1616 
   1617 		compile-tested:
   1618 			acorn26
   1619 			acorn32
   1620 			algor
   1621 			amiga
   1622 			arc
   1623 			atari
   1624 			bebox
   1625 			cats
   1626 			cesfic
   1627 			dreamcast
   1628 			evbarm
   1629 			evbmips
   1630 			evbppc(marvell)
   1631 			evbppc(ibm4xx)
   1632 			evbsh3
   1633 			hp700
   1634 			hpcmips
   1635 			hpcsh
   1636 			ia64
   1637 			ibmnws
   1638 			iyonix
   1639 			landisk
   1640 			luna68k
   1641 			mac68k
   1642 			mmeye
   1643 			mvme68k
   1644 			mvmeppc
   1645 			mipsco
   1646 			netwinder
   1647 			newsmips
   1648 			next68k
   1649 			ofppc
   1650 			pc532
   1651 			pmax
   1652 			pmppc
   1653 			prep
   1654 			sandpoint
   1655 			sbmips
   1656 			shark
   1657 			sparc
   1658 			sparc64
   1659 			vax
   1660 			x68k
   1661 			zaurus
   1662 
   1663 		not tested:
   1664 			pdp10 (i don't know how to build)
   1665 			sh5 (not buildable with an unrelated problem.)
   1666 
   1667     compile  CAYMAN64/netbsd32_sa.o
   1668     cc1: warnings being treated as errors
   1669     /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c: In function 'netbsd32_sa_ucsp':
   1670     /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c:126: warning: implicit declaration of function '_UC_MACHINE32_SP'
   1671     --- netbsd32_sa.o ---
   1672     *** [netbsd32_sa.o] Error code 1
   1673     1 error
   1674 
   1675 		notyet:
   1676 			amigappc
   1677 			playstation2
   1678 
   1679 Branch:		yamt-vop
   1680 Description:	remove several VOPs
   1681 Status:		Terminated; merged to -current
   1682 Start Date:	Wed Oct 19 2005
   1683 End Date:	Wed Nov  2 2005
   1684 Base Tag:	yamt-vop-base3
   1685 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1686 Scope:		src/sys
   1687 Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
   1688 
   1689 Branch:		yamt-x86pmap
   1690 Description:	merge i386 and amd64 pmap
   1691 Status:		Terminated; merged to -current
   1692 Start Date:	Mon Sep 24 2007
   1693 End Date:	Fri Oct 19 2007
   1694 Base Tag:	yamt-x86pmap-base4
   1695 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1696 Scope:		src/sys  (src/common is tagged but not branched)
   1697 Notes:		
   1698 
   1699 Branch:		gdamore-uart
   1700 Description:	Add register table support to com driver.
   1701 Status:		Active
   1702 Start Date:	14 June 2006
   1703 End Date:	13 July 2006
   1704 Base Tag:	gdamore-uart-base
   1705 Maintainer:	Garrett D'Amore <gdamore (a] NetBSD.org>
   1706 Scope:		kernel
   1707 Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
   1708 		com support, and also removes a nasty hack from Atheros com.
   1709 
   1710 Branch:		christos-time_t
   1711 Description:	Change time_t and dev_t to 64 bit quantities; fix timeval
   1712 		and timespec.
   1713 Status:		merged
   1714 Start Date:	29 March 2008
   1715 End Date:	10 January 2009
   1716 Base Tag:	christos-time_t-base
   1717 Maintainer:	Christos Zoulas <christos (a] NetBSD.org>
   1718 Scope:		kernel, libc, libutil, userland
   1719 Notes:		Requires a major bump of all libraries except libc, libutil.
   1720 ########################################################################
   1721 # Other:
   1722 ########################################################################
   1723 
   1724 Branch:		magnum
   1725 Description:	?
   1726 Status:		?
   1727 Start Date:
   1728 End Date:
   1729 Base Tag:	magnum-base
   1730 Maintainer:	?
   1731 Scope:		kernel
   1732 Notes:
   1733 
   1734