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