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