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