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