Home | History | Annotate | Line # | Download | only in doc
BRANCHES revision 1.327
      1 #	$NetBSD: BRANCHES,v 1.327 2013/01/28 15:05:51 yamt Exp $
      2 #
      3 # This file contains a list of branches that exist in the NetBSD CVS
      4 # tree and their current state.
      5 #
      6 # This list is necessarily incomplete.
      7 # 
      8 # Within reason, developers may create branch and version tags at any
      9 # time for any purpose.  To avoid name collisions, private tags should
     10 # have names which begin with the developer's NetBSD login name
     11 # followed by a - or _ character (e.g., thorpej_scsipi,
     12 # thorpej-signal)
     13 # 
     14 # Any branch or version tag not listed here should be assumed to be
     15 # private to the developer who created it.  It is inappropriate for
     16 # anyone other than that developer to commit, move tags, or otherwise
     17 # modify the contents of the branch.
     18 #
     19 # Please update this file when a new branch is ready for consumption
     20 # by folks other than the maintainer, or when the use or status of an
     21 # existing branch changes significantly.
     22 #
     23 # Format:
     24 #   Branch:	  name of branch
     25 #   Description:  Purpose and intention of the branch
     26 #   Status:	  Active/Terminated/Dormant
     27 #   Start Date:	  date first instantiated
     28 #   End Date:	  date it was Terminated/made_Dormant, if any
     29 #   Base Tag:	  netbsd-1-5-base, etc.
     30 #   Maintainer:	  Somebody to blame.
     31 #   Scope:	  Portion of the tree covered.
     32 #   Notes:	  Various other info, perhaps explanation of special tags,
     33 #		  who-may-commit policies, etc.
     34 #
     35 # There are four sections to this file:
     36 #   Release branches
     37 #   Individual developers' branches (Active/Dormant)
     38 #   Individual developers' branches (Terminated), and
     39 #   other
     40 #
     41 # Entries within each section should be alphabetized.
     42 #
     43 
     44 
     45 # Release branches:
     46 
     47 Branch:		comdex-fall-1999
     48 Description:	Special release branch for pre-1.5 release at
     49 		Fall 1999 COMDEX.
     50 Status:		Terminated
     51 Start Date:
     52 End Date:
     53 Base Tag:	comdex-fall-1999-base
     54 Maintainer:	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-base8
    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 		- fix A->O loaning
    633 		- write radixtree(9) man page
    634 
    635 		TODO:
    636 			- benchmark
    637 			- test
    638 			- make the write clustering fix less kludgy
    639 			- fix or disable the ad-hoc per-cpu statistic
    640 			- disable A->O loan as its benefit is unclear at best
    641 
    642 		tested: i386, amd64, nfs, ffs
    643 
    644 		have good chances to be broken: lfs, sparc64, hp700
    645 
    646 		the following is kernel build test results.
    647 		most of NG seem unrelated to the changes in the branch.
    648 
    649 			acorn26  GENERIC    OK      
    650 			acorn32  GENERIC    OK      
    651 			algor    P6032      NG      
    652 			alpha    GENERIC    OK      
    653 			alpha    GENERIC.MP OK      
    654 			amd64    GENERIC    OK      
    655 			amd64    XEN3_DOM0  OK      
    656 			amd64    XEN3_DOMU  OK      
    657 			amiga    GENERIC    OK      
    658 			amigappc GENERIC    OK      
    659 			arc      GENERIC    OK      
    660 			atari    MILAN-PCIIDE OK      
    661 			bebox    GENERIC    OK      
    662 			cats     GENERIC    OK      
    663 			cesfic   GENERIC    OK      
    664 			cobalt   GENERIC    OK      
    665 			dreamcast GENERIC    NG      
    666 			emips    GENERIC    OK      
    667 			evbarm   NSLU2      NG      
    668 			evbarm   TS7200     NG      
    669 			evbmips  P6032      NG      
    670 			evbmips  MALTA      NG      
    671 			evbppc   WALNUT     NG      
    672 			evbppc   EXPLORA451 NG      
    673 			evbppc   PMPPC      NG      
    674 			evbsh3   COMPUTEXEVB OK      
    675 			ews4800mips GENERIC    OK      
    676 			hp300    GENERIC    OK      
    677 			hp700    GENERIC    OK      
    678 			hpcarm   JORNADA720 OK      
    679 			hpcarm   JORNADA728 OK      
    680 			hpcmips  GENERIC    OK      
    681 			hpcsh    GENERIC    OK      
    682 			hpcsh    HPW650PA   OK      
    683 			i386     MONOLITHIC OK      
    684 			i386     GENERIC    OK      
    685 			i386     XEN3_DOM0  OK      
    686 			i386     XEN3_DOMU  OK      
    687 			i386     ALL        NG      
    688 			ia64     GENERIC    OK      
    689 			ia64     GENERIC.SKI NG      
    690 			ibmnws   GENERIC    OK      
    691 			iyonix   GENERIC    NG      
    692 			landisk  GENERIC    OK      
    693 			luna68k  GENERIC    OK      
    694 			mac68k   GENERIC    OK      
    695 			macppc   GENERIC    OK      
    696 			macppc   GENERIC.MP OK      
    697 			mipsco   GENERIC    OK      
    698 			mmeye    GENERIC    OK      
    699 			mvme68k  GENERIC    OK      
    700 			mvmeppc  GENERIC    OK      
    701 			netwinder GENERIC    NG      
    702 			news68k  GENERIC    OK      
    703 			newsmips GENERIC    OK      
    704 			next68k  GENERIC    OK      
    705 			ofppc    GENERIC    OK      
    706 			ofppc    GENERIC.MP NG      
    707 			pmax     GENERIC    OK      
    708 			prep     GENERIC    OK      
    709 			rs6000   GENERIC    NG      
    710 			sandpoint GENERIC    OK      
    711 			sbmips   GENERIC    NG      
    712 			sbmips   GENERIC.MP NG      
    713 			sgimips  GENERIC32_IP3x OK      
    714 			shark    GENERIC    NG      
    715 			sparc    GENERIC    OK      
    716 			sparc    GENERIC.MP OK      
    717 			sparc64  GENERIC    OK      
    718 			sun2     GENERIC    OK      
    719 			sun3     GENERIC    OK      
    720 			usermode GENERIC    NG      
    721 			vax      GENERIC    OK      
    722 			vax      GENERIC.MP OK      
    723 			x68k     GENERIC    OK      
    724 			zaurus   GENERIC    NG      
    725 
    726 Branch:		reinoud-bufcleanup
    727 Description:	implement and evaluate struct buf usage cleanup strategies.
    728 		Ideas currently in mind (preference for b):
    729 		a)
    730 			1. use of bio_ops per buffer.
    731 			2. allow chaining/overloading of functions in bio_ops
    732 			   and provide some private context.
    733 			3. extend the bio_ops with commonly used functionality
    734 			   like pending action counting, custom context passing,
    735 			   last minute processing of buffer data, buffer cache
    736 			   etc.
    737 			4. investigate the use of the kcont()
    738 			   continuation-passing framework for async io
    739 			   completion notification for bufs
    740 			...
    741 		b)
    742 			1. all sequencing use of B_CALL replaced by
    743 			   device-threads, if possible generic code around BUFQ
    744 			2. possibly use kcont() for async IO finished signaling
    745 			3. counter of pending and queued actions requestable
    746 			   by IOCTL interface?
    747 			4. implement `last minute buffer fixup' calls and maybe
    748 			   even finished I/O calls as vnode operations
    749 			...
    750 Status:		Active
    751 Start Date:	Thu Mar 15 2007
    752 End Date:
    753 Base Tag:	reinoud-bufcleanup-base
    754 Maintainer:	Reinoud Zandijk <reinoud (a] NetBSD.org>
    755 Scope:		src/sys and src/common
    756 Notes:		Used as experiment sandbox and if successful hopefully one day
    757 		to be integrated.
    758 
    759 Branch:		bouyer-quota2
    760 Description:	modernise disk quotas
    761 Status:		Active
    762 Start Date:	Thu Jan 20 2011
    763 End Date:
    764 Base Tag:	bouyer-quota2-base
    765 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    766 Scope:		src/
    767 Notes:
    768 
    769 ########################################################################
    770 # Individual developers' branches (Terminated):
    771 ########################################################################
    772 
    773 Branch:		bouyer-scsipi
    774 Description:	Integration of atapi support
    775 Status:		Terminated
    776 Start Date:
    777 End Date:
    778 Base Tag:
    779 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    780 Scope:		kernel
    781 Notes:		Superseded by thorpej_scsipi
    782 
    783 Branch:		bouyer-xen2
    784 Description:	update xen port to xen 2.0, with support for domain0 operations
    785 Status:		Terminated
    786 Start Date:	Dec 13 2004
    787 End Date:	Mar 10 2005
    788 Base Tag:	netbsd-2-base
    789 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    790 Scope:		src/sys/arch/xen
    791 Notes:
    792 
    793 Branch:		bouyer-xenamd64
    794 Description:	add amd64 support to Xen and rework some parts to share more code between Xen and others
    795 Status:		Terminated
    796 Start Date:	18 Oct 2007
    797 End Date:	22 Nov 2007
    798 Base Tag:	bouyer-xenamd64-base
    799 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    800 Scope:		kernel
    801 Notes:		
    802 
    803 Branch:		bouyer-xeni386
    804 Description:	switch xen on i386 to the x86 pmap and the xen/x86/x86_xpmap.c bootstrap, and add i386 PAE support
    805 Status:		Terminated
    806 Start Date:	10 Dec 2007
    807 End Date:	23 Jan 2008
    808 Base Tag:	bouyer-xeni386-base
    809 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    810 Scope:		kernel
    811 Notes:		
    812 
    813 Branch: 	chap-midi
    814 Description:	Renovation of MIDI support
    815 Status: 	Terminated; merged to -current
    816 Start Date:	19 May 2006
    817 End Date:	30 Jun 2006
    818 Base Tag:	chap-midi-base
    819 Maintainer:	Chapman Flack <chap (a] NetBSD.org>
    820 Scope:		sys, share/man, usr.bin
    821 Notes:
    822 
    823 Branch:		chs-ubc
    824 Description:	Unified Buffer Cache
    825 Status:		Terminated
    826 Start Date:
    827 End Date:
    828 Base Tag:	chs-ubc-base
    829 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    830 Scope:		kernel
    831 Notes:
    832 
    833 Branch:		chs-ubc2
    834 Description:	 Unified Buffer Cache
    835 Status:		Terminated; merged to -current
    836 Start Date:
    837 End Date:
    838 Base Tag:	chs-ubc2-base, chs-ubc2-newbase
    839 Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    840 Scope:		kernel
    841 Notes:
    842 
    843 Branch:		cjs-build-against-obj-dir
    844 Description:	?
    845 Status:		?
    846 Start Date:
    847 End Date:
    848 Base Tag:
    849 Maintainer:	Curt Sampson <cjs (a] NetBSD.org>
    850 Scope:		Entire tree.
    851 Notes:
    852 
    853 Branch:		cube-autoconf
    854 Description:	Renovate autoconf(9) API
    855 Status:		Terminated; abandoned
    856 Start Date:	11 Dec 2007
    857 End Date:
    858 Base Tag:	cube-autoconf-base
    859 Maintainer:	Quentin Garnier <cube (a] NetBSD.org>
    860 Scope:		kernel usr.bin/config (and some other userland bits)
    861 Notes:		Address a number of issues the current autoconf(9) API has.
    862 
    863 Branch:		eeh-paddr_t
    864 Description:	use separate types for virtual vs. physical addresses
    865 Status:		Terminated; merged to -current
    866 Start Date:
    867 End Date:
    868 Base Tag:	eeh-paddr_t-base
    869 Maintainer:	Eduardo Horvath <eeh (a] NetBSD.org>
    870 Scope:		kernel
    871 Notes:		This is needed to support 32-bit kernels on sparc64.
    872 
    873 Branch:		elad-kernelauth
    874 Description:	Native NetBSD implementation of Apple's kernel authorization
    875 		based on TN2127. This is a "clean-room" implementation to
    876 		avoid any licensing issues.
    877 Status:		Terminated; merged to -current
    878 Start Date:	Tue Mar	 7 2006
    879 End Date:	Mon May 15 2006
    880 Base Tag:	elad-kernelauth-base
    881 Maintainer:	Elad Efrat <elad (a] NetBSD.org>
    882 Scope:		src/sys, src/share/man/man9/Makefile,
    883 		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
    884 Notes:
    885 
    886 Branch:		fvdl-softdep
    887 Description:	FFS soft dependencies
    888 Status:		Terminated; merged to -current
    889 Start Date:
    890 End Date:
    891 Base Tag:	fvdl-softdep-base
    892 Maintainer:	Frank van der Linden <fvdl (a] NetBSD.org>
    893 Scope:		kernel
    894 Notes:
    895 
    896 Branch:		gehenna-devsw
    897 Description:	auto-generation of devsw table
    898 Status:		Terminated
    899 Start Date:	16 May 2002
    900 End Date:	6 Sep 2002
    901 Base Tag:	gehenna-devsw-base
    902 Maintainer:	MAEKAWA Masahide <gehenna (a] NetBSD.org>
    903 Scope:		syssrc
    904 Notes:		The goal is to get rid of the existing device switch tables in
    905 		port-dependent conf.c and to generate them dynamically by
    906 		config(8).
    907 
    908 Branch:         haad-dm
    909 Description:    Add support for LVM to NetBSD
    910 Status:         Terminated; merged with -current
    911 Start Date:     7 July 2008
    912 End Date:	19 December 2008
    913 Base Tag:       haad-dm-base
    914 Maintainer:     Adam Hamsik <haad (a] NetBSD.org>
    915 Scope:          kernel
    916 Notes:          LVM support is based on Linux lvm2tools, 
    917                 libdevmapper library and NetBSD device-mapper
    918                 driver. 
    919 
    920 Branch:		is-newarp
    921 Description:	ARP for non-Ethernet
    922 Status:		Terminated; merged before NetBSD 1.3
    923 Start Date:	1996/10/13
    924 End Date:	1997/03/15
    925 Base Tag:	is-newarp-base
    926 Maintainer:	Ignatios Souvatzis <is (a] NetBSD.org>
    927 Scope:		kernel
    928 Notes:
    929 
    930 Branch:		jmcneill-pm
    931 Description:	Power management framework overhaul, ACPI improvements
    932 Status:		Terminated; merged before NetBSD 5.0
    933 Start Date:	3 Aug 2007
    934 End Date:	9 Dec 2007
    935 Base Tag:	jmcneill-pm-base
    936 Maintainer:	Jared D. McNeill <jmcneill (a] NetBSD.org>
    937 Scope:		kernel
    938 Notes:		
    939 
    940 Branch:		jmcneill-audiomp3
    941 Description:	Add MP locking to the audio drivers
    942 Status:		Terminated; merged before NetBSD 6.0
    943 Start Date:	19 Nov 2011
    944 End Date:	23 Nov 2011
    945 Base Tag:	jmcneill-audiomp3-base
    946 Maintainer:	Jared D. McNeill <jmcneill (a] NetBSD.org>
    947 Scope:		kernel
    948 Notes:		Resurrect ad-audiomp2, make the audio drivers MP safe.
    949 
    950 Branch:		kenh-if-detach
    951 Description:	Interface detach support.
    952 Status:		?
    953 Start Date:
    954 End Date:
    955 Base Tag:	kenh-if-detach-base
    956 Maintainer:	Ken Hornstein <kenh (a] NetBSD.org>
    957 Scope:		kernel
    958 Notes:
    959 
    960 Branch:		kent-audio1
    961 Description:	Audio converter pipeline
    962 Status:		Terminated; merged to -current
    963 Start Date:	Tue Dec  7 2004
    964 End Date:	Tue Jan 11 2005
    965 Base Tag:	kent-audio1-base
    966 Maintainer:	TAMURA Kent <kent (a] NetBSD.org>
    967 Scope:		kernel (audio device drivers)
    968 Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
    969 		Please consult with the maintainer before committing
    970 		to this branch.
    971 
    972 Branch:		kqueue
    973 Description:	kqueue kernel event notification mechanism (from FreeBSD)
    974 Status:		Terminated; merged to -current
    975 Start Date:	Tue Jul 10 23:08:38 EST 2001
    976 End Date:	Tue Oct 24 09:14:14 GMT 2002
    977 Base Tag:	kqueue-base
    978 Maintainer:	Jaromir Dolecek <jdolecek (a] NetBSD.org>
    979 Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
    980 Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
    981 		local internal changes to better suit NetBSD, and
    982 		enhancements such as looking up filters by name or
    983 		number, and dynamic registration of "user" filters.
    984 		The work is complete as is, but is awaiting more
    985 		feedback from various kernel gurus before going mainline.
    986 
    987 Branch:		ktrace-lwp
    988 Description:	ktrace support for lwp ids.
    989 Status:		Terminated; merged to -current
    990 Start Date:	Wed Jul  2 15:27:30 UTC 2003
    991 End Date:	Sun Dec 11 12:25:29 UTC 2005
    992 Base Tag:	ktrace-lwp-base
    993 Maintainer:	Darren Reed <darrenr (a] NetBSD.org>
    994 Scope:		sys
    995 Notes:		
    996 
    997 Branch:		marc-pcmcia
    998 Description:	PCMCIA support
    999 Status:		Terminated; merged to -current
   1000 Start Date:
   1001 End Date:
   1002 Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
   1003 Maintainer:	Marc Horowitz <marc (a] NetBSD.org>
   1004 Scope:		kernel
   1005 Notes:
   1006 
   1007 Branch:		matt-armv6
   1008 Description:	Rototill the arm code to support features present in the
   1009 		v6 of the ARM Architecture.  Additionally, clean up things
   1010 		along the way to use common practices.
   1011 Status:		Terminated; merged to -current
   1012 Start Date:	2007-08-27
   1013 End Date:	2008-04-27
   1014 Base Tag:	matt-armv6-base
   1015 Maintainer:	Matt Thomas <matt (a] NetBSD.org>
   1016 Scope:		kernel & userland
   1017 Notes:	
   1018 
   1019 Branch:		minoura_x68k_bus_h
   1020 Description:	bus_space(9) and bus_dma(9) implementation for x68k
   1021 Status:		Terminated; merged to -current
   1022 Start Date:	23 Dec 1998
   1023 End Date:	16 Mar 1999
   1024 Base Tag:	minoura_x68k_bus_h-base
   1025 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
   1026 Scope:		sys/arch/x68k
   1027 Notes:
   1028 
   1029 Branch:		minoura-xpg4dl
   1030 Description:	Citrus Project locale subsystem
   1031 Status:		Terminated; (partly) merged to -current
   1032 Start Date:	28 March 2000
   1033 End Date:
   1034 Base Tag:	minoura-xpg4dl-base
   1035 Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
   1036 Scope:		basesrc, syssrc, sharesrc
   1037 Notes:		Citrus Project is developing dynamically-loadable, codeset-
   1038 		independent locale subsystem.  Part of the implementation
   1039 		(LC_CTYPE) called XPG4DL is now integrated to -current.
   1040 
   1041 Branch:		mjf-devfs
   1042 Description:	device file system supporting dynamic device nodes
   1043 Status:		Terminated
   1044 Start Date:	12 November 2007
   1045 End Date:	21 February 2008
   1046 Base Tag:	mjf-devfs-base
   1047 Maintainer:	Matt Fleming <mjf (a] NetBSD.org>
   1048 Scope:		kernel and userland
   1049 Notes:		This branch will move away from the static device nodes that
   1050 		are created with MAKEDEV scripts and allow nodes to be created
   1051 		and removed dynamically as devices are attached and detached
   1052 		from the machine.
   1053 
   1054 Branch:		mrg-vm-swap
   1055 Description:	dynamic swap allocation, swap-to-files support
   1056 Status:		Terminated; abandoned for mrg-vm-swap2
   1057 Start Date:	12 February 1997
   1058 End Date:	15 March 1997
   1059 Base Tag:	[none]
   1060 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
   1061 Scope:		kernel
   1062 Notes:
   1063 
   1064 Branch:		mrg-vm-swap2
   1065 Description:	dynamic swap allocation, swap-to-files support
   1066 Status:		Terminated; merged to -current
   1067 Start Date:	4 May 1997
   1068 End Date:	12 June 1997
   1069 Base Tag:	mrg-vm-swap2-base
   1070 Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
   1071 Scope:		kernel
   1072 Notes:
   1073 
   1074 Branch:		nathanw_sa
   1075 Description:	Scheduler activations
   1076 Status:		Terminated; merged to -current
   1077 Start Date:	5 March 2001
   1078 End Date:	18 January 2003
   1079 Base Tag:	nathanw_sa_base
   1080 Maintainer:	Nathan Williams <nathanw (a] NetBSD.org>
   1081 Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
   1082 		bin/ps usr.bin/systat usr.bin/top usr.bin/w
   1083 		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
   1084 Notes:		The idea of scheduler activations is described in the
   1085 		classic paper by Anderson et al., in ACM Transactions
   1086 		a on Computer Systems volume 10 issue 1 (1992),which
   1087 		can be found at
   1088 		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
   1089 		Many ideas in the implementation are based on the
   1090 		implementation of scheduler activations added to Mach
   1091 		3.0 and described by Davis et al. in the University of
   1092 		Washington CS tech report 92-08-93, which can be found
   1093 		at
   1094 		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
   1095 
   1096 		My USENIX paper on the subject can be found at
   1097 		http://web.mit.edu/nathanw/www/usenix/
   1098 
   1099 		Please consult with the maintainer before committing
   1100 		to this branch.
   1101 		Other tags starting with nathanw_sa reserved for
   1102 		branch management and are not guaranteed to be stable.
   1103 
   1104 		Trunk tagged with "nathanw_sa_before_merge" prior to
   1105 		merging branch down to trunk.  Branch tagged with
   1106 		"nathanw_sa_end" to indicate the ending revision of
   1107 		the branch.
   1108 
   1109 Branch:		newlock
   1110 Description:	New locking primitives, based on Solaris's
   1111 Status:		Terminated
   1112 Start Date:	March 9, 2002
   1113 End Date:	February 12, 2007
   1114 Base Tag:	newlock-base
   1115 Maintainer:	Jason R. Thorpe <thorpej (a] NetBSD.org>
   1116 Scope:		Kernel
   1117 Notes:		The goal is to replace the existing lockmgr() and
   1118 		simple_lock() based locking mechanisms with the
   1119 		primitives found in Solaris: mutexes and rwlocks.
   1120 		Superseded by the newlock2 branch.
   1121 
   1122 Branch:		newlock2
   1123 Description:	New locking primitives, based on Solaris's
   1124 Status:		Terminated
   1125 Start Date:	September 9, 2006
   1126 End Date:	February 12, 2007
   1127 Base Tag:	newlock2-base
   1128 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
   1129 Scope:		Kernel
   1130 Notes:		As per the newlock branch, however given the amount of time
   1131 		the original branch has lain dormant, a new one has been
   1132 		created.  Goals:
   1133 		- Implement new locking primitives on most-used ports.
   1134 		- Minor locking improvements.
   1135 		- Remove spinlockmgr().
   1136 
   1137 Branch:		nick-csl-alignment
   1138 Description:	Provide correctly aligned __cpu_simple_lock_t for hppa
   1139 Status: 	Terminated; merged to -current
   1140 Start Date:	2007-07-18
   1141 End Date:
   1142 Base Tag:	nick-csl-alignment-base5
   1143 Maintainer:	Nick Hudson <skrll (a] NetBSD.org>
   1144 Scope:		sys, lib/libpthread, lib/libpthread_dbg
   1145 Notes:	
   1146 
   1147 Branch:		perseant-lfsv2
   1148 Description:	LFS incompatible on-disk data structure changes
   1149 Status:		Terminated
   1150 Start Date:	27 June 2001
   1151 End Date:	16 July 2001
   1152 Base Tag:	perseant-lfsv2-base
   1153 Maintainer:	Konrad Schroder <perseant (a] NetBSD.org>
   1154 Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
   1155 Notes:		This branch should be short-lived, I expect to merge as soon
   1156 		as the data structures required for unremove are in and tested.
   1157 
   1158 Branch:		ppcoea-renovation
   1159 Description:	General renovation and cleanup of all OEA PowerPC ports.
   1160 Status:		Terminated; merged to -current
   1161 Start Date:	30 April 2007
   1162 End Date:	15 October 2007
   1163 Base Tag:	ppcoea-renovation-base
   1164 Maintainer:	Tim Rightnour <garbled (a] netbsd.org>
   1165 Scope:		src/sys/arch
   1166 Notes:		This branch is for a general cleanup of all OEA-based PowerPC
   1167 		ports. OEA (Operating Environment Architecture) PowerPC refers
   1168 		to the 601, 603, 604, and similar chips.  Specifically, not the
   1169 		403/401 and other embedded chips. The general concept is to get
   1170 		them all compiling, and sharing as much code as possible.  All
   1171 		developers are welcome to commit to this branch.
   1172 
   1173 Branch:		thorpej-devvp
   1174 Description:	replace dev_t with struct vnode * in devsw entry points
   1175 Status:		Terminated
   1176 Start Date:	Sep 6 2001
   1177 End Date:	???
   1178 Base Tag:	thorpej-devvp-base
   1179 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
   1180 Scope:		syssrc
   1181 Notes:		Kernels built from this branch are not expected
   1182 		to function correctly at this time.
   1183 
   1184 		Ports known to compile on this branch:
   1185 			alpha
   1186 			i386
   1187 
   1188 Branch:		peter-altq
   1189 Description:	New ALTQ framework:
   1190 		- sync with KAME sources
   1191 		- share mtag/name mapping functions
   1192 		- separate altq + pf attachment
   1193 Status:		Terminated; merged to -current
   1194 Start Date:	March 16, 2006
   1195 End Date:	October 12, 2006
   1196 Base Tag:	peter-altq-base
   1197 Maintainer:	Peter Postma <peter (a] NetBSD.org>,
   1198 		Martin Husemann <martin (a] NetBSD.org>,
   1199 		Matthias Scheler <tron (a] NetBSD.org>
   1200 Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
   1201 Notes:		Only the first item in the description was finished
   1202 		in this branch.
   1203 
   1204 Branch:		rmind-uvmplock
   1205 Description:	Reorganize locking in UVM and improve x86 pmap(9)
   1206 Status:		Terminated; merged to -current
   1207 Start Date:	15 March 2010
   1208 End Date:	12 June 2011
   1209 Base Tag:	rmind-uvmplock-base
   1210 Maintainer:	Mindaugas Rasiukevicius <rmind (a] netbsd.org>
   1211 Scope:		Kernel
   1212 Notes:		Goals:
   1213 
   1214 		- Reorganize locking in UVM and serialize pmap(9) operations
   1215 		  on same page(s).  New lock order: [vmpage-lock] -> pmap-lock.
   1216 		  Based on the patch from ad@.
   1217 		- Simplify locking in pmap(9) modules by removing P->V locking.
   1218 		- Use mutex_obj(9) on vmobjlock (and thus vnode_t::v_interlock)
   1219 		  to share locks among UVM objects where necessary.
   1220 		- Rewrite and optimize x86 TLB shootdown code.
   1221 		- Unify /dev/mem et al in MI code and provide required locking.
   1222 
   1223 		Future work:
   1224 
   1225 		- Optimize pmap_remove() with tracking in struct vm_map_entry.
   1226 
   1227 Branch:		sommerfeld_i386mp_1
   1228 Description:	Multiprocessor support for i386 using Intel MP BIOS.
   1229 Status:		Terminated; merged to -current
   1230 Start Date:	21 Feb 2000
   1231 End Date:	01 Oct 2002
   1232 Base Tag:	sommerfeld_i386mpbase_1
   1233 Maintainer:	Bill Sommerfeld <sommerfeld (a] NetBSD.org>
   1234 Scope:		sys/arch/i386
   1235 Notes:
   1236 		Code committed to the branch has booted to multiuser 
   1237 		on at least one system.
   1238 
   1239 		Not guaranteed to compile against mainline since -current
   1240 		may have changed incompatibly with the last branch update;
   1241 		use "cvs update -D" to roll-back the rest of the tree to match.
   1242 
   1243 		Please get explicit permission from the maintainer 
   1244 		before each commit, or your changes will be backed out.
   1245 		Other tags starting with sommerfeld_ are private to 
   1246 		the developer and are guaranteed to be unstable.
   1247 		Only the maintainer should move tags.
   1248 
   1249 		Note that this branch uses a DIFFERENT scheme for 
   1250 		syncing with the mainline.  the maintainer uses some private
   1251 		scripts for keeping them in sync; if you make commits 
   1252 		to the branch to "resynchronize" things, you'll
   1253 		probably do it wrong; instead, ask the maintainer to
   1254 		resynchronize things.
   1255 
   1256 		See sys/arch/i386/TODO on the branch for a list of known
   1257 		issues with the branch.
   1258 
   1259 Branch:		thorpej-mips-cache
   1260 Description:	overhaul MIPS cache support code
   1261 Status:		Terminated; merged to -current
   1262 Start Date:	Oct 23 2001
   1263 End Date:	Nov 14 2001
   1264 Base Tag:	thorpej-mips-cache-base
   1265 Scope:		syssrc
   1266 Notes:		This branch needs more debugging, testing, and more
   1267 		ports need to be converted to the new world order.
   1268 
   1269 		The following processors have had cache ops
   1270 		written:
   1271 
   1272 			* R2000/R3000 (cache_r3k) -- light testing,
   1273 			  needs to be beat on a lot more to make
   1274 			  sure it's working.
   1275 
   1276 			* R4000/R4400 (cache_r4k) -- mhitch (a] NetBSD.org
   1277 			  tracked down a bug, which has been fixed.
   1278 
   1279 			  Confirmed working on R4000-with-L2.
   1280 
   1281 			  Confirmed working on R4400-no-L2 and
   1282 			  R4400-with-L2.
   1283 
   1284 			* R4600/R5000 (cache_r5k) -- shin (a] NetBSD.org
   1285 			  has committed fixes to this code.
   1286 
   1287 			  Confirmed working on R4600 v2 (SGI IP-22 with
   1288 			  no SysAD L2 cache).
   1289 
   1290 			  Confirmed working on RM5260 (Algorithmics P-5064).
   1291 
   1292 			* TX39 (cache_tx39) -- uch (a] NetBSD.org has
   1293 			  committed fixes to this code.  Awaiting
   1294 			  confirmation that it is working properly.
   1295 
   1296 			* R5900 (cache_r5900) -- uch (a] NetBSD.org has
   1297 			  written this code and tested it on a
   1298 			  PlayStation 2.
   1299 
   1300 		The following ports have been updated to compile (and
   1301 		use optimized-for-processor bus_dma routines).  Those
   1302 		that have been tested and work are marked with [WORKING].
   1303 
   1304 			* algor		[WORKING]
   1305 
   1306 			* arc		[WORKING]
   1307 
   1308 			* pmax		[WORKING]
   1309 
   1310 			* playstation2	[WORKING]
   1311 					Needs optimized bus_dmamap_sync().
   1312 
   1313 			* hpcmips	[need verification that this is working]
   1314 					Needs optimized bus_dmamap_sync().
   1315 
   1316 			* sgimips	[WORKING]
   1317 					Needs optimized bus_dmamap_sync().
   1318 
   1319 			* cobalt	[need testing]
   1320 
   1321 			* mipsco	[need testing]
   1322 
   1323 			* newsmips	[need testing]
   1324 
   1325 Branch:		thorpej_scsipi
   1326 Description:	SCSI/ATAPI midlayer rewrite.
   1327 Status:		Terminated; merged to -current
   1328 Start Date:
   1329 End Date:	Apr 25 2001
   1330 Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
   1331 Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>,
   1332 		Jason Thorpe <thorpej (a] NetBSD.org>
   1333 Scope:		syssrc
   1334 Notes:		When a change from -current is pulled up please move the
   1335 		thorpej_scsipi_base tag to the revision you're syncing with.
   1336 		thorpej_scsipi_nbase is private to maintainer (only
   1337 		used when syncing the whole branch with HEAD).
   1338 		Just before the merge, syssrc has been tagged with
   1339 		thorpej_scsipi_beforemerge
   1340 
   1341 Branch:		thorpej-signal
   1342 Description:	?
   1343 Status:		?
   1344 Start Date:
   1345 End Date:
   1346 Base Tag:	thorpej-signal-base
   1347 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
   1348 Scope:		kernel
   1349 Notes:
   1350 
   1351 Branch:		thorpej-setroot
   1352 Description:	?
   1353 Status:		Terminated; merged to -current
   1354 Start Date:
   1355 End Date:
   1356 Base Tag:
   1357 Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
   1358 Scope:		kernel
   1359 Notes:
   1360 
   1361 Branch:		simonb-timecounters
   1362 Description:	Port FreeBSD timecounters to NetBSD
   1363 Status:		Terminated
   1364 Start Date:	Sat Feb 04 2006
   1365 End Date:	Wed Jun 07 2006
   1366 Base Tag:	simonb-timecounters-base
   1367 Maintainer:	Simon Burge <simonb (a] NetBSD.org>,
   1368 		Frank Kardel <kardel (a] NetBSD.org>
   1369 Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
   1370 Notes:		early (partial conversion) commit to -current
   1371 		ok'ed by core@ on 20060605 for testing and further
   1372 		simplified conversion
   1373 
   1374 Branch:		simonb-wapbl
   1375 Description:	Wasabi's journaling filesystem support
   1376 Status:		Terminated; merged to -current
   1377 Start Date:	Tue Jun 10 2008
   1378 End Date:	Thu Jul 31 2008
   1379 Base Tag:	simonb-wapbl-base
   1380 Maintainer:	Simon Burge <simonb (a] NetBSD.org>
   1381 Scope:		src/distrib/sets/lists/comp src/distrib/utils/sysinst
   1382 		src/include
   1383 		src/sbin/fsck_ffs src/sbin/fsdb src/sbin/mount_ffs
   1384 		src/sbin/tunefs src/usr.sbin/dumpfs src/sys
   1385 Notes:		Still has a number of issues:
   1386 		 - Some heavy workload performance issues on SMP machines.
   1387 		   Work around this issue by turning on WAPBL_DEBUG_SERIALIZE
   1388 		   in rev 1.1.2.11 of vfs_wapbl.c.
   1389 		 - Removing large files (sparse only?) takes a long time.
   1390 		   Eg, a file created with
   1391 		      dd if=/dev/zero of=foox bs=1 count=1 seek=11261748520550
   1392 		   takes 0:00.00 to remove on my test box without logging and
   1393 		   0:22.25 to remove with logging.  No disk IO during this...
   1394 		 - sysinst should use in-fs logs now, not end-of-partition logs.
   1395 
   1396 Branch:		uebayasi-xip
   1397 Description:	Support eXecute-In-Place (XIP)
   1398 Status:		Active
   1399 Start Date:	8 February 2010
   1400 End Date:	
   1401 Base Tag:	uebayasi-xip-base6 (2010-11-15 UTC)
   1402 Maintainer:	Masao Uebayashi <uebayasi (a] NetBSD.org>
   1403 Scope:		src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.8
   1404 		src/include
   1405 		src/sbin/mount
   1406 		src/sbin/mount_ffs
   1407 		src/share/man/man4
   1408 		src/share/man/man5/statvfs.5
   1409 		src/share/man/man9
   1410 		src/sys/arch
   1411 		src/sys/common/pmap
   1412 		src/sys/conf
   1413 		src/sys/dev/flash.c
   1414 		src/sys/dev/flashvar.h
   1415 		src/sys/dev/md.c
   1416 		src/sys/dev/md.h
   1417 		src/sys/dev/md_root.c
   1418 		src/sys/dev/xmd.c
   1419 		src/sys/kern/vfs_syscalls.c
   1420 		src/sys/miscfs/genfs/genfs_io.c
   1421 		src/sys/miscfs/specfs/specdev.h
   1422 		src/sys/sys
   1423 		src/sys/ufs/ffs/ffs_vfsops.c
   1424 		src/sys/uvm
   1425 		src/usr.sbin/mdsetimage/mdsetimage.8
   1426 Notes:		Goals:
   1427 		- Clean up oddities in fault handler
   1428 		- Add a notion of device page
   1429 		- Teach XIP vnode VOP_GETPAGES
   1430 		- Hook XIP mount option
   1431 		- Teach some pmaps to handle device page
   1432 
   1433 Branch:		vmlocking
   1434 Description:	Make VM and file system framework MP safe
   1435 Status:		Terminated
   1436 Start Date:	13 March 2007
   1437 End Date:	4 December 2007
   1438 Base Tag:	vmlocking-base
   1439 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
   1440 Scope:		kernel
   1441 Notes:		Superseded by vmlocking2 branch.
   1442 
   1443 Branch:		vmlocking2
   1444 Description:	Make VM and file system framework MP safe
   1445 Status:		Terminated
   1446 Start Date:	4 December 2007
   1447 End Date:	2 January 2008
   1448 Base Tag:	vmlocking2-base3
   1449 Maintainer:	Andrew Doran <ad (a] NetBSD.org>
   1450 Scope:		kernel
   1451 Notes:		Goals:
   1452 
   1453 		- Make VM system / trap handling MP safe.
   1454 		- Replace simplelocks with mutexes.
   1455 		- Make file system framework MP safe.
   1456 
   1457 		Status by architecture:
   1458 
   1459 		  alpha		done
   1460 		  i386		done
   1461 		  amd64		done
   1462 		  mips		done
   1463 		  sparc		need pmap/trap locking changes	
   1464 		  sparc64	done
   1465 		  arm		done
   1466 		  powerpc	done
   1467 		  hppa		done
   1468 		  sh3		done
   1469 		  m68k		done
   1470 		  xen		need pmap/trap locking changes
   1471 
   1472 		Remaining MI work to do:
   1473 
   1474 		- Check aliased vnode handling. There may be problems.
   1475 
   1476 		Remaining problems:
   1477 
   1478 		- LFS stalls due to v_numoutput leak.
   1479 
   1480 Branch:		wrstuden-devbsize
   1481 Description:	Modify buffer cache to deal with different devices having
   1482 		different block sizes. Also DEV_BSIZE would go away.
   1483 Status:		Terminated
   1484 Start Date:	Aug or Sept 1999
   1485 End Date:	1 Apr 2000
   1486 Base tag:	wrstuden-devbsize-base
   1487 Maintainer:	Bill Studenmund <wrstuden (a] NetBSD.org>
   1488 Scope:		kernel
   1489 Notes:		No longer active due to lack of time, and introduction
   1490 		of UBC. In terms of UBC, the primary cache for
   1491 		file data is the VM cache, which needs to operate
   1492 		in terms of VM pages. As no existing device has native
   1493 		pages the same size as our VM pages, there already is
   1494 		a mapping going on between the VM system and the
   1495 		underlying blocks. So it would be easier and cleaner
   1496 		to adjust that to deal w/ different block sizes.
   1497 		Also with UBC, all i/o is in terms of bytes at an offset
   1498 		with a certain length, so the exact block size isn't a big
   1499 		deal.
   1500 
   1501 		Any other wrstuden-devbsize tag may (and should) go away.
   1502 
   1503 Branch:		yamt-idlelwp
   1504 Description:	idle lwp, and some changes depending on it.
   1505 
   1506 		1. separate context switching and thread scheduling.
   1507 		   (cf. gmcgarry_ctxsw)
   1508 		2. implement idle lwp.
   1509 		3. clean up related MD/MI interfaces.
   1510 		4. make scheduler(s) modular.
   1511 
   1512 Status:		Terminated; merged to -current
   1513 Start Date:	Fri Feb 17 2007
   1514 End Date:	Thu May 17 2007
   1515 Base Tag:	yamt-idlelwp-base8
   1516 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1517 Scope:		src/sys  (src/common is tagged but not branched)
   1518 Notes:		
   1519 		Status of ports:
   1520 		  alpha			[ Done, UP tested, MP not tested ]
   1521 		  i386			[ Done, tested ]
   1522 		  amd64			[ Done, tested ]
   1523 		  mips			[ Done, both MIPS1 and MIPS3 tested]
   1524 		  sparc			[ Done, UP tested, MP might have
   1525 					  some problem after newlock2 merge ]
   1526 		  sparc64		[ Done, tested ]
   1527 		  arm			[ Done, SA1 tested. See PR 36548 ]
   1528 		  macppc/powerpc	[ Done, OEA tested ]
   1529 		  hppa			[ Done, tested ]
   1530 		  sh3			[ Done, tested ]
   1531 		  vax			[ Done, UP tested, MP untested ]
   1532 		  m68k			[ Done, tested on several ports ]
   1533 		  ns32k			[ broken ]
   1534 		  ia64			[ broken ]
   1535 		  pdp10			[ broken ]
   1536 
   1537 		How to adapt a port?
   1538 
   1539 		- unify cpu_switch, cpu_exit, cpu_switchto into
   1540 		  a single cpu_switchto.  see cpu_switchto.9.
   1541 
   1542 		- implement cpu_idle.  see cpu_idle.9.
   1543 
   1544 		- add a flag argument to cpu_need_resched.
   1545 		  handle RESCHED_IMMED flag, which means "cause a preemption
   1546 		  as soon as possible."  eg. in the case of MULTIPROCESSOR,
   1547 		  send an IPI to the target cpu.
   1548 
   1549 		- "curlwp == NULL" is not a valid check for idle state anymore.
   1550 		  use "(curlwp->l_flag & LW_IDLE) != 0" instead.  curlwp is
   1551 		  almost always non-NULL, with exceptions like early on boot.
   1552 
   1553 		- remove idle pcbs.
   1554 
   1555 		- (if MULTIPROCESSOR) tweak processor trampoline code.
   1556 
   1557 		- (if MULTIPROCESSOR) call mi_cpu_attach when attaching
   1558 		  secondary processors.
   1559 
   1560 		- (if schedhz!=0) call schedclock regardless of the value of
   1561 		  curlwp.
   1562 
   1563 		- of course, update MD users of scheduler/switching API.
   1564 
   1565 Branch:		yamt-lazymbuf
   1566 Description:	change the way to share mbuf external storage so that
   1567 		it can work without kernel_lock.
   1568 Status:		Terminated; merged to -current
   1569 Start Date:	Wed Jul  6 2005
   1570 End Date:	Mon Mar 24 2008
   1571 Base Tag:	yamt-lazymbuf-base14
   1572 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1573 Scope:		src/sys  (src/common is tagged but not branched)
   1574 Notes:		
   1575 
   1576 Branch:		yamt-km, yamt-km-doc
   1577 Description:	simplify/improve kernel memory management and bootstrap
   1578 Status:		Terminated; merged to -current
   1579 Start Date:	Tue Jan 25 2005
   1580 End Date:	Fri Apr  1 2005
   1581 Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
   1582 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1583 Scope:		yamt-km: src/sys
   1584 		yamt-km-doc: src/share/man/man9/uvm.9
   1585 Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
   1586 
   1587 		the followings are per-port status.
   1588 		(account names mean "tested by".)
   1589 
   1590 		works enough to go to multiuser:
   1591 			alpha, i386, xen (yamt@)
   1592 			pc532 (simonb@)
   1593 			alpha, i386, mac68k, macppc, pmax, shark,
   1594 			    sparc, sparc64, sun3, x68k (chs@)
   1595 			cobalt, dreamcast, hp300, news68k, newsmips,
   1596 			    sun3x (tsutsui@)
   1597 			amiga (mhitch@)
   1598 			cats, hp700 (skrll@)
   1599 			xen (bouyer@)
   1600 
   1601 		known to have the same problem as trunk:
   1602 			vax (chs@, stuck while running kvm_mkdb)
   1603 
   1604 		known to have a problem:
   1605 			luna68k (and, if any, other m68k ports which use TTR)
   1606 			needs to be revisited.
   1607 			-> for luna68k, although not tested,
   1608 			   Sysmap has been moved to avoid kva conflict with
   1609 			   I/O ranges.
   1610 
   1611 		buildable:
   1612 			src/sys/arch/acorn26/conf/GENERIC
   1613 			src/sys/arch/acorn32/conf/GENERIC
   1614 			src/sys/arch/algor/conf/P6032
   1615 			src/sys/arch/alpha/conf/GENERIC
   1616 			src/sys/arch/alpha/conf/GENERIC.MP
   1617 			src/sys/arch/amd64/conf/GENERIC
   1618 			src/sys/arch/amd64/conf/GENERIC.MP
   1619 			src/sys/arch/amiga/conf/GENERIC
   1620 			src/sys/arch/arc/conf/GENERIC
   1621 			src/sys/arch/atari/conf/MILAN-PCIIDE
   1622 			src/sys/arch/bebox/conf/GENERIC
   1623 			src/sys/arch/cats/conf/GENERIC
   1624 			src/sys/arch/cesfic/conf/GENERIC
   1625 			src/sys/arch/cobalt/conf/GENERIC
   1626 			src/sys/arch/dreamcast/conf/GENERIC
   1627 			src/sys/arch/evbarm/conf/TS7200
   1628 			src/sys/arch/evbppc/conf/WALNUT
   1629 			src/sys/arch/evbsh3/conf/COMPUTEXEVB
   1630 			src/sys/arch/evbsh5/conf/CAYMAN64
   1631 			src/sys/arch/hp300/conf/GENERIC
   1632 			src/sys/arch/hp700/conf/GENERIC
   1633 			src/sys/arch/hpcarm/conf/JORNADA728
   1634 			src/sys/arch/hpcmips/conf/GENERIC
   1635 			src/sys/arch/hpcsh/conf/GENERIC
   1636 			src/sys/arch/hpcsh/conf/HPW650PA
   1637 			src/sys/arch/i386/conf/GENERIC
   1638 			src/sys/arch/i386/conf/GENERIC.MP
   1639 			src/sys/arch/i386/conf/XEN0
   1640 			src/sys/arch/i386/conf/XENU
   1641 			src/sys/arch/ibmnws/conf/GENERIC
   1642 			src/sys/arch/iyonix/conf/GENERIC
   1643 			src/sys/arch/luna68k/conf/GENERIC
   1644 			src/sys/arch/mac68k/conf/GENERIC
   1645 			src/sys/arch/macppc/conf/GENERIC
   1646 			src/sys/arch/macppc/conf/GENERIC.MP
   1647 			src/sys/arch/mipsco/conf/GENERIC
   1648 			src/sys/arch/mmeye/conf/GENERIC
   1649 			src/sys/arch/mvme68k/conf/GENERIC
   1650 			src/sys/arch/netwinder/conf/GENERIC
   1651 			src/sys/arch/news68k/conf/GENERIC
   1652 			src/sys/arch/newsmips/conf/GENERIC
   1653 			src/sys/arch/next68k/conf/GENERIC
   1654 			src/sys/arch/ofppc/conf/GENERIC
   1655 			src/sys/arch/pc532/conf/GENERIC
   1656 			src/sys/arch/pmax/conf/GENERIC
   1657 			src/sys/arch/prep/conf/GENERIC
   1658 			src/sys/arch/sandpoint/conf/GENERIC
   1659 			src/sys/arch/sbmips/conf/GENERIC
   1660 			src/sys/arch/sgimips/conf/GENERIC32_IP3x
   1661 			src/sys/arch/shark/conf/GENERIC
   1662 			src/sys/arch/sparc/conf/GENERIC
   1663 			src/sys/arch/sparc/conf/GENERIC.MP
   1664 			src/sys/arch/sparc64/conf/GENERIC
   1665 			src/sys/arch/sparc64/conf/GENERIC.MP
   1666 			src/sys/arch/sun2/conf/GENERIC
   1667 			src/sys/arch/sun3/conf/GENERIC
   1668 			src/sys/arch/vax/conf/GENERIC
   1669 			src/sys/arch/vax/conf/GENERIC.MP
   1670 			src/sys/arch/x68k/conf/GENERIC
   1671 
   1672 			src/sys/arch/playstation2/conf/GENERIC
   1673 
   1674 Branch:		yamt-pdpolicy
   1675 Description:	play with page replacement policy
   1676 		- separate page replacement policy from the rest of kernel
   1677 		- implement alternative replacement policy
   1678 		- related read-ahead adjustment?
   1679 Status:		Terminated; merged to -current
   1680 Start Date:	Sun Mar  5 2006
   1681 End Date:	Sat Sep 16 2006
   1682 Base Tag:	yamt-pdpolicy-base9
   1683 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1684 Scope:		src/sys  (src/common is tagged but not branched)
   1685 Notes:		
   1686 
   1687 Branch:		yamt-pf42
   1688 Description:	import newer pf from OpenBSD 4.2
   1689 Status:		Terminated; merged to -current
   1690 Start Date:	Sat Apr 19 2008
   1691 End Date:	Wed Jun 18 2008
   1692 Base Tag:	yamt-pf42-base4
   1693 Maintainer:	Peter Postma <peter (a] NetBSD.org>,
   1694 		YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1695 Scope:		src
   1696 Notes:		see sys/dist/pf/net/TODO
   1697 
   1698 Branch:		yamt-readahead
   1699 Description:	play with file readahead
   1700 Status:		Terminated; merged to -current
   1701 Start Date:	Mon Nov 14 2005
   1702 End Date:	Wed Nov 30 2005
   1703 Base Tag:	yamt-readahead-base3
   1704 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1705 Scope:		src/sys
   1706 Notes:		
   1707 
   1708 Branch:		yamt-uio_vmspace
   1709 Description:	uio_lwp/uio_segflg -> uio_vmspace
   1710 Status:		Terminated; merged to -current
   1711 Start Date:	Mon Dec 31 2005
   1712 End Date:	Wed Mar  1 2006
   1713 Base Tag:	yamt-uio_vmspace-base5
   1714 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1715 Scope:		src/sys
   1716 Notes:		
   1717 
   1718 Branch:		yamt-splraiseipl
   1719 Description:	finish implementing splraiseipl (and makeiplcookie).
   1720 		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
   1721 
   1722 		- completes workqueue(9) and netbt.
   1723 		- fix PR/33218.
   1724 
   1725 Status:		Terminated; merged to -current
   1726 Start Date:	Mon Sep 18 2006
   1727 End Date:	Fri Dec 22 2006
   1728 Base Tag:	yamt-splraiseipl-base5
   1729 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1730 Scope:		src/sys  (src/common is tagged but not branched)
   1731 Notes:		
   1732 		tested (by who):
   1733 			alpha		(yamt)
   1734 			alpha		(pavel)
   1735 			amd64		(reported privately)
   1736 			cobalt		(tsutsui)
   1737 			ews4800mips	(tsutsui)
   1738 			hp300		(tsutsui)
   1739 			hpcarm		(reported privately)
   1740 			i386		(yamt)
   1741 			macppc		(tsutsui)
   1742 			news68k		(tsutsui)
   1743 			sgimips(IP32)	(tsutsui)
   1744 			sparc(sun4c)	(tsutsui)
   1745 			sun2		(tsutsui)
   1746 			sun3		(tsutsui)
   1747 			sun3x		(tsutsui)
   1748 			xen		(yamt)
   1749 
   1750 		compile-tested:
   1751 			acorn26
   1752 			acorn32
   1753 			algor
   1754 			amiga
   1755 			arc
   1756 			atari
   1757 			bebox
   1758 			cats
   1759 			cesfic
   1760 			dreamcast
   1761 			evbarm
   1762 			evbmips
   1763 			evbppc(marvell)
   1764 			evbppc(ibm4xx)
   1765 			evbsh3
   1766 			hp700
   1767 			hpcmips
   1768 			hpcsh
   1769 			ia64
   1770 			ibmnws
   1771 			iyonix
   1772 			landisk
   1773 			luna68k
   1774 			mac68k
   1775 			mmeye
   1776 			mvme68k
   1777 			mvmeppc
   1778 			mipsco
   1779 			netwinder
   1780 			newsmips
   1781 			next68k
   1782 			ofppc
   1783 			pc532
   1784 			pmax
   1785 			pmppc
   1786 			prep
   1787 			sandpoint
   1788 			sbmips
   1789 			shark
   1790 			sparc
   1791 			sparc64
   1792 			vax
   1793 			x68k
   1794 			zaurus
   1795 
   1796 		not tested:
   1797 			pdp10 (i don't know how to build)
   1798 			sh5 (not buildable with an unrelated problem.)
   1799 
   1800     compile  CAYMAN64/netbsd32_sa.o
   1801     cc1: warnings being treated as errors
   1802     /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c: In function 'netbsd32_sa_ucsp':
   1803     /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c:126: warning: implicit declaration of function '_UC_MACHINE32_SP'
   1804     --- netbsd32_sa.o ---
   1805     *** [netbsd32_sa.o] Error code 1
   1806     1 error
   1807 
   1808 		notyet:
   1809 			amigappc
   1810 			playstation2
   1811 
   1812 Branch:		yamt-vop
   1813 Description:	remove several VOPs
   1814 Status:		Terminated; merged to -current
   1815 Start Date:	Wed Oct 19 2005
   1816 End Date:	Wed Nov  2 2005
   1817 Base Tag:	yamt-vop-base3
   1818 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1819 Scope:		src/sys
   1820 Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
   1821 
   1822 Branch:		yamt-x86pmap
   1823 Description:	merge i386 and amd64 pmap
   1824 Status:		Terminated; merged to -current
   1825 Start Date:	Mon Sep 24 2007
   1826 End Date:	Fri Oct 19 2007
   1827 Base Tag:	yamt-x86pmap-base4
   1828 Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
   1829 Scope:		src/sys  (src/common is tagged but not branched)
   1830 Notes:		
   1831 
   1832 Branch:		gdamore-uart
   1833 Description:	Add register table support to com driver.
   1834 Status:		Active
   1835 Start Date:	14 June 2006
   1836 End Date:	13 July 2006
   1837 Base Tag:	gdamore-uart-base
   1838 Maintainer:	Garrett D'Amore <gdamore (a] NetBSD.org>
   1839 Scope:		kernel
   1840 Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
   1841 		com support, and also removes a nasty hack from Atheros com.
   1842 
   1843 Branch:		christos-time_t
   1844 Description:	Change time_t and dev_t to 64 bit quantities; fix timeval
   1845 		and timespec.
   1846 Status:		merged
   1847 Start Date:	29 March 2008
   1848 End Date:	10 January 2009
   1849 Base Tag:	christos-time_t-base
   1850 Maintainer:	Christos Zoulas <christos (a] NetBSD.org>
   1851 Scope:		kernel, libc, libutil, userland
   1852 Notes:		Requires a major bump of all libraries except libc, libutil.
   1853 
   1854 Branch:		rtr-xorg-branch
   1855 Description:	xorg & static build alterations to src/x11
   1856 Status:		Dead; replaced by src/external/mit/xorg
   1857 Start Date:	Nov 15 2004
   1858 End Date:	?
   1859 Base tag:	rtr-xorg-branch-base
   1860 Maintainer:	Tyler R. Retzlaff <rtr (a] NetBSD.org>
   1861 Scope:		x11
   1862 		distrib/sets/lists
   1863 		share/mk/bsd.x11.mk
   1864 		share/mk/bsd.own.mk
   1865 		etc/mtree/NetBSD.dist
   1866 Notes:		Requires parts of xsrc/xfree (HEAD)
   1867 		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
   1868 		Requires xorg (XORG-6_8_1)
   1869 
   1870 Branch:		gmcgarry_ctxsw
   1871 Description:	Separate scheduler from context-switch code
   1872 Status:		Dead; replaced by cpu_switchto / yamt-idlelwp branch
   1873 Start Date:	18 December 2002
   1874 End Date:
   1875 Base Tag:	gmcgarry_ctxsw_base
   1876 Maintainer:	Gregory McGarry <gmcgarry (a] NetBSD.org>
   1877 Scope:		kernel
   1878 Notes:		Removing knowledge of the scheduler and its run queues
   1879 		from the machine-dependent context switch code is the
   1880 		first step in cleaning up the scheduler.  It is necessary
   1881 		for the newlock branch, making the scheduler SMP friendly,
   1882 		adding real-time scheduler extensions, and reducing the
   1883 		number of code paths for LWP and proc switching.
   1884 
   1885 Branch:		nick-hppapmap
   1886 Description:	Update of hppa pmap with OpenBSD code.
   1887 Status: 	Terminated; merged to -current
   1888 Start Date:	27 October 2008
   1889 End Date:	30 April 2009
   1890 Base Tag:	nick-hppapmap-base3
   1891 Maintainer:	Nick Hudson <skrll (a] NetBSD.org>
   1892 Scope:		sys/
   1893 Notes:		Port of the OpenBSD pmap including support for PA2.0 CPUs in
   1894 		32-bit mode.
   1895 
   1896 Branch:		thorpej-atomic
   1897 Description:	Implementation of an atomic memory operations API modeled
   1898 		after the one in Solaris 10.
   1899 Status:		Terminated; merged to -current
   1900 Start Date:	Apr 11 2007
   1901 End Date:	Nov 18 2007
   1902 Base tag:	thorpej-atomic-base
   1903 Maintainer:	Jason Thorpe <thorpej (a] netbsd.org>
   1904 Scope:		src/common
   1905 		src/sys
   1906 Notes:		Base atomic primitives need to be implemented for
   1907 		all of the supported architectures:
   1908 
   1909 		alpha		DONE
   1910 		arm		DONE
   1911 		hppa
   1912 		i386		DONE
   1913 		ia64
   1914 		m68k		DONE (except for 68010)
   1915 		mips
   1916 		ns32k
   1917 		powerpc		DONE except for membar_*()
   1918 		powerpc64	DONE except for membar_*()
   1919 		sh3
   1920 		sparc		DONE except for membar_*()
   1921 		sparc64		DONE except for membar_*()
   1922 		vax
   1923 		x86_64		DONE
   1924 
   1925 		Tested:
   1926 
   1927 		alpha		NO
   1928 		arm		NO
   1929 		hppa		NO
   1930 		i386		NO
   1931 		ia64		NO
   1932 		m68k		NO
   1933 		mips		NO
   1934 		ns32k		NO
   1935 		powerpc		NO
   1936 		powerpc64	NO
   1937 		sh3		NO
   1938 		sparc		NO
   1939 		sparc64		NO
   1940 		vax		NO
   1941 		x86_64		NO
   1942 
   1943 		TODO:
   1944 
   1945 		all		- Need to replace mb_*() with membar_*().
   1946 
   1947 				- Audit MUTEX_CAS() and RWLOCK_CAS() uses
   1948 				  to see of membar_enter() is required here.
   1949 
   1950 				- Talk to ad@ -- figure out of non-atomic
   1951 				  mutex / rwlock release is actually safe.
   1952 
   1953 		arm		- Consider using a RAS technique like
   1954 				  MIPS uses for _lock_cas() and the mutex
   1955 				  stubs.  Possibly do more than one atomic
   1956 				  op as a RAS.  Possibly implement mutex
   1957 				  stubs using the technique.
   1958 
   1959 		m68k		- Need to do 68010 support.
   1960 		
   1961 		i386		- Need to change when x86_patch() is called
   1962 				  so we can test ncpus.
   1963 
   1964 		powerpc		- Figure out if we need barriers in the
   1965 				  atomic ops themselves (hopefully not!)
   1966 
   1967 		x86_64		- Need to change when x86_patch() is called
   1968 				  so we can test ncpus.
   1969 
   1970 ########################################################################
   1971 # Other:
   1972 ########################################################################
   1973 
   1974 Branch:		magnum
   1975 Description:	?
   1976 Status:		?
   1977 Start Date:
   1978 End Date:
   1979 Base Tag:	magnum-base
   1980 Maintainer:	?
   1981 Scope:		kernel
   1982 Notes:
   1983 
   1984