BRANCHES revision 1.59
11.59Sskrll#	$NetBSD: BRANCHES,v 1.59 2005/12/11 14:12:20 skrll Exp $
21.1Slukem#
31.1Slukem# This file contains a list of branches that exist in the NetBSD CVS
41.1Slukem# tree and their current state.
51.1Slukem#
61.1Slukem# This list is necessarily incomplete.
71.1Slukem# 
81.1Slukem# Within reason, developers may create branch and version tags at any
91.1Slukem# time for any purpose.  To avoid name collisions, private tags should
101.1Slukem# have names which begin with the developer's NetBSD login name
111.1Slukem# followed by a - or _ character (e.g., thorpej_scsipi,
121.1Slukem# thorpej-signal)
131.1Slukem# 
141.1Slukem# Any branch or version tag not listed here should be assumed to be
151.1Slukem# private to the developer who created it.  It is inappropriate for
161.1Slukem# anyone other than that developer to commit, move tags, or otherwise
171.1Slukem# modify the contents of the branch.
181.1Slukem#
191.1Slukem# Please update this file when a new branch is ready for consumption
201.1Slukem# by folks other than the maintainer, or when the use or status of an
211.1Slukem# existing branch changes significantly.
221.1Slukem#
231.1Slukem# Format:
241.1Slukem#   Branch:	  name of branch
251.1Slukem#   Description:  Purpose and intention of the branch
261.1Slukem#   Status:	  Active/Terminated/Dormant
271.1Slukem#   Start Date:	  date first instantiated
281.1Slukem#   End Date:	  date it was Terminated/made_Dormant, if any
291.1Slukem#   Base Tag:	  netbsd-1-5-base, etc.
301.1Slukem#   Maintainer:	  Somebody to blame.
311.1Slukem#   Scope:	  Portion of the tree covered.
321.1Slukem#   Notes:	  Various other info, perhaps explanation of special tags,
331.1Slukem#		  who-may-commit policies, etc.
341.1Slukem
351.1Slukem
361.1Slukem# Release branches:
371.1Slukem
381.1SlukemBranch:		comdex-fall-1999
391.1SlukemDescription:	Special release branch for pre-1.5 release at
401.1Slukem		Fall 1999 COMDEX.
411.1SlukemStatus:		Terminated
421.1SlukemStart Date:
431.1SlukemEnd Date:
441.1SlukemBase Tag:	comdex-fall-1999-base
451.1SlukemMaintainer:	?
461.1SlukemScope:		Entire tree.
471.1SlukemNotes:
481.1Slukem
491.1SlukemBranch:		netbsd-0-9
501.1SlukemDescription:	The NetBSD 0.9 release branch
511.1SlukemStatus:		Terminated
521.1SlukemStart Date:
531.1SlukemEnd Date:
541.1SlukemBase Tag:	netbsd-0-9-base
551.10SsaloMaintainer:	Release Engineering <releng@NetBSD.org>
561.1SlukemScope:		Entire tree.
571.1SlukemNotes:		Subsidiary tags of: netbsd-0-9-ALPHA, netbsd-0-9-ALPHA2,
581.1Slukem		netbsd-0-9-BETA, netbsd-0-9-RELEASE.
591.1Slukem		Commits restricted to release engineering.
601.1Slukem
611.1SlukemBranch:		netbsd-1-0
621.1SlukemDescription:	The NetBSD 1.0 release branch
631.1SlukemStatus:		Terminated
641.1SlukemStart Date:
651.1SlukemEnd Date:
661.1SlukemBase Tag:	netbsd-1-0-base
671.10SsaloMaintainer:	Release Engineering <releng@NetBSD.org>
681.1SlukemScope:		Entire tree.
691.1SlukemNotes:
701.1Slukem		Commits restricted to release engineering.
711.1Slukem
721.1SlukemBranch:		netbsd-1-1
731.1SlukemDescription:	The NetBSD 1.1 release branch
741.1SlukemStatus:		Terminated
751.1SlukemStart Date:
761.1SlukemEnd Date:
771.1SlukemBase Tag:	netbsd-1-1-base
781.10SsaloMaintainer:	Release Engineering <releng@NetBSD.org>
791.1SlukemScope:		Entire tree.
801.1SlukemNotes:
811.1Slukem		Commits restricted to release engineering.
821.1Slukem
831.1SlukemBranch:		netbsd-1-2
841.1SlukemDescription:	The NetBSD 1.2 release branch
851.1SlukemStatus:		Terminated
861.1SlukemStart Date:
871.1SlukemEnd Date:
881.1SlukemBase Tag:	netbsd-1-2-base
891.10SsaloMaintainer:	Release Engineering <releng@NetBSD.org>
901.1SlukemScope:		Entire tree.
911.1SlukemNotes:
921.1Slukem		Commits restricted to release engineering.
931.1Slukem
941.1SlukemBranch:		netbsd-1-3
951.1SlukemDescription:	The NetBSD 1.3 release branch
961.1SlukemStatus:		Terminated
971.1SlukemStart Date:
981.1SlukemEnd Date:
991.1SlukemBase Tag:	netbsd-1-3-base
1001.10SsaloMaintainer:	Release Engineering <releng@NetBSD.org>
1011.1SlukemScope:		Entire tree.
1021.1SlukemNotes:
1031.1Slukem		Commits restricted to release engineering.
1041.1Slukem
1051.1SlukemBranch:		netbsd-1-4
1061.1SlukemDescription:	The NetBSD 1.4 release branch
1071.13SjmcStatus:		Terminated
1081.1SlukemStart Date:	1 Apr 2000
1091.1SlukemEnd Date:
1101.1SlukemBase Tag:	netbsd-1-4-base
1111.10SsaloMaintainer:	1.4 Release Engineering <releng-1-4@NetBSD.org>
1121.1SlukemScope:		Entire tree.
1131.1SlukemNotes:
1141.1Slukem		Commits restricted to release engineering.
1151.1Slukem
1161.1SlukemBranch:		netbsd-1-5
1171.1SlukemDescription:	The NetBSD 1.5 release branch
1181.37SjmcStatus:		Terminated
1191.1SlukemStart Date:	20 Jun 2000
1201.37SjmcEnd Date:	26 Jan 2005
1211.1SlukemBase Tag:	netbsd-1-5-base
1221.10SsaloMaintainer:	1.5 Release Engineering <releng-1-5@NetBSD.org>
1231.1SlukemScope:		Entire tree.
1241.1SlukemNotes:
1251.1Slukem		Commits restricted to release engineering.
1261.6Slukem
1271.6SlukemBranch:		netbsd-1-6
1281.6SlukemDescription:	The NetBSD 1.6 release branch
1291.6SlukemStatus:		Active
1301.7SlukemStart Date:	22 May 2002
1311.6SlukemEnd Date:
1321.6SlukemBase Tag:	netbsd-1-6-base
1331.10SsaloMaintainer:	1.6 Release Engineering <releng-1-6@NetBSD.org>
1341.6SlukemScope:		Entire tree.
1351.6SlukemNotes:
1361.6Slukem		Commits restricted to Release Engineering.
1371.1Slukem
1381.13SjmcBranch:		netbsd-2-0
1391.37SjmcDescription:	Originally the NetBSD 2.0 release branch and now the branch 
1401.37Sjmc		tracking security/critical fixes for the NetBSD 2.0 series
1411.13SjmcStatus:		Active
1421.37SjmcStart Date:	28 Mar 2004 and changed for security/critical function on
1431.37Sjmc       		23 Dec 2004
1441.13SjmcEnd Date:
1451.13SjmcBase Tag:	netbsd-2-0-base
1461.13SjmcMaintainer:	2.0 Release Engineering <releng-2-0@NetBSD.org>
1471.13SjmcScope:		Entire tree. (src + xsrc)
1481.37SjmcNotes:		Branch was re-purposed to security/critical change function
1491.37Sjmc		once 2.0 released. See netbsd-2 for current branch to track
1501.37Sjmc		NetBSD 2 tree.
1511.37Sjmc		Commits restricted to Release Engineering.
1521.37Sjmc
1531.37SjmcBranch:		netbsd-2
1541.37SjmcDescription:    The NetBSD 2 release branch
1551.37SjmcStatus:		Active
1561.37SjmcStart Date:	23 Dec 2004
1571.37SjmcEnd Date:
1581.37SjmcBase Tag:	netbsd-2-base
1591.37SjmcMaintainer:	2 Release Engineering <releng-2@NetBSD.org>
1601.37SjmcScope:		Entire tree. (src + xsrc)
1611.13SjmcNotes:
1621.13Sjmc		Commits restricted to Release Engineering.
1631.13Sjmc
1641.36SjmcBranch:		netbsd-3
1651.36SjmcDescription:	The NetBSD 3 release branch
1661.36SjmcStatus:		Active
1671.36SjmcStart Date:	16 Mar 2005
1681.36SjmcEnd Date:
1691.36SjmcBase Tag:	netbsd-3-base
1701.37SjmcMaintainer:	3 Release Engineering <releng-3@NetBSD.org>
1711.36SjmcScope:		Entire tree. (src + xsrc)
1721.36SjmcNotes:
1731.36Sjmc		Commits restricted to Release Engineering.
1741.1Slukem
1751.51SrizBranch:		netbsd-2-1
1761.51SrizDescription:	Tracking security/critical fixes for NetBSD 2.1
1771.51SrizStatus:		Active
1781.51SrizStart Date:     26 Oct 2005 
1791.51SrizEnd Date:
1801.51SrizBase Tag:	netbsd-2-1-RELEASE
1811.51SrizMaintainer:	2 Release Engineering <releng-2@NetBSD.org>
1821.51SrizScope:		Entire tree. (src + xsrc)
1831.51SrizNotes:		Branch contains only security/critical fixes to
1841.51Sriz		NetBSD 2.1.  For new features, use netbsd-2 branch.
1851.51Sriz		Commits restricted to Release Engineering.
1861.51Sriz
1871.1Slukem# Individual developers' branches:
1881.1Slukem
1891.4Sbjh21
1901.4Sbjh21Branch:		bjh21-hydra
1911.4Sbjh21Description:	Simtec Hydra support and ARM SMP in general
1921.4Sbjh21Status:		Active
1931.4Sbjh21Start Date:	18 Oct 2002
1941.4Sbjh21End Date:
1951.4Sbjh21Base Tag:	bjh21-hydra-base
1961.10SsaloMaintainer:	Ben Harris <bjh21@NetBSD.org>
1971.4Sbjh21Scope:		sys/arch/arm sys/arch/acorn32
1981.4Sbjh21Notes:		This code is on a branch because it involves changes to
1991.4Sbjh21		cpuswitch.S which would otherwise make merging the
2001.4Sbjh21		nathanw_sa branch difficult.  This branch is expected
2011.4Sbjh21		to be merged to the trunk shortly after nathanw_sa.
2021.1Slukem
2031.1SlukemBranch:		bouyer-scsipi
2041.1SlukemDescription:	Integration of atapi support
2051.1SlukemStatus:		Terminated
2061.1SlukemStart Date:
2071.1SlukemEnd Date:
2081.1SlukemBase Tag:
2091.10SsaloMaintainer:	Manuel Bouyer <bouyer@NetBSD.org>
2101.1SlukemScope:		kernel
2111.1SlukemNotes:		Superseded by thorpej_scsipi
2121.1Slukem
2131.1SlukemBranch:		chs-ubc
2141.44SchsDescription:	Unified Buffer Cache
2151.44SchsStatus:		Terminated
2161.1SlukemStart Date:
2171.1SlukemEnd Date:
2181.1SlukemBase Tag:	chs-ubc-base
2191.10SsaloMaintainer:	Chuck Silvers <chs@NetBSD.org>
2201.1SlukemScope:		kernel
2211.1SlukemNotes:
2221.1Slukem
2231.1SlukemBranch:		chs-ubc2
2241.44SchsDescription:	 Unified Buffer Cache
2251.44SchsStatus:		Terminated; merged to -current
2261.1SlukemStart Date:
2271.1SlukemEnd Date:
2281.1SlukemBase Tag:	chs-ubc2-base, chs-ubc2-newbase
2291.10SsaloMaintainer:	Chuck Silvers <chs@NetBSD.org>
2301.1SlukemScope:		kernel
2311.1SlukemNotes:
2321.1Slukem
2331.1SlukemBranch:		cjs-build-against-obj-dir
2341.1SlukemDescription:	?
2351.1SlukemStatus:		?
2361.1SlukemStart Date:
2371.1SlukemEnd Date:
2381.1SlukemBase Tag:
2391.10SsaloMaintainer:	Curt Sampson <cjs@NetBSD.org>
2401.1SlukemScope:		Entire tree.
2411.1SlukemNotes:
2421.1Slukem
2431.1SlukemBranch:		eeh-paddr_t
2441.44SchsDescription:	use separate types for virtual vs. physical addresses
2451.44SchsStatus:		Terminated; merged to -current
2461.1SlukemStart Date:
2471.1SlukemEnd Date:
2481.1SlukemBase Tag:	eeh-paddr_t-base
2491.10SsaloMaintainer:	Eduardo Horvath <eeh@NetBSD.org>
2501.1SlukemScope:		kernel
2511.44SchsNotes:		This is needed to support 32-bit kernels on sparc64.
2521.1Slukem
2531.1SlukemBranch:		fvdl-softdep
2541.1SlukemDescription:	FFS soft dependencies
2551.44SchsStatus:		Terminated; merged to -current
2561.1SlukemStart Date:
2571.1SlukemEnd Date:
2581.1SlukemBase Tag:	fvdl-softdep-base
2591.10SsaloMaintainer:	Frank van der Linden <fvdl@NetBSD.org>
2601.1SlukemScope:		kernel
2611.1SlukemNotes:
2621.1Slukem
2631.1SlukemBranch:		gehenna-devsw
2641.1SlukemDescription:	auto-generation of devsw table
2651.1SlukemStatus:		Terminated
2661.1SlukemStart Date:	16 May 2002
2671.1SlukemEnd Date:	6 Sep 2002
2681.1SlukemBase Tag:	gehenna-devsw-base
2691.10SsaloMaintainer:	MAEKAWA Masahide <gehenna@NetBSD.org>
2701.1SlukemScope:		syssrc
2711.1SlukemNotes:		The goal is to get rid of the existing device switch tables in
2721.1Slukem		port-dependent conf.c and to generate them dynamically by
2731.1Slukem		config(8).
2741.8Sgmcgarry
2751.8SgmcgarryBranch:		gmcgarry_ctxsw
2761.8SgmcgarryDescription:	Separate scheduler from context-switch code
2771.8SgmcgarryStatus:		Active
2781.8SgmcgarryStart Date:	18 December 2002
2791.8SgmcgarryEnd Date:
2801.8SgmcgarryBase Tag:	gmcgarry_ctxsw_base
2811.10SsaloMaintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
2821.8SgmcgarryScope:		kernel
2831.8SgmcgarryNotes:		Removing knowledge of the schedular and its run queues
2841.8Sgmcgarry		from the machine-dependent context switch code is the
2851.8Sgmcgarry		first step in cleaning up the scheduler.  It is necessary
2861.8Sgmcgarry		for the newlock branch, making the scheduler SMP friendly,
2871.8Sgmcgarry		adding real-time scheduler extensions, and reducing the
2881.8Sgmcgarry		number of code paths for LWP and proc switching.
2891.8Sgmcgarry
2901.8SgmcgarryBranch:		gmcgarry_ucred
2911.8SgmcgarryDescription:	Integrate and encapsulate user credentials
2921.8SgmcgarryStatus:		Active
2931.8SgmcgarryStart Date:	18 December 2002
2941.8SgmcgarryEnd Date:
2951.8SgmcgarryBase Tag:	gmcgarry_ucred_base
2961.10SsaloMaintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
2971.8SgmcgarryScope:		kernel
2981.8SgmcgarryNotes:		merge pcred and ucred and poolify
2991.1Slukem
3001.1SlukemBranch:		is-newarp
3011.23SisDescription:	ARP for non-Ethernet
3021.23SisStatus:		Terminated; merged before NetBSD 1.3
3031.23SisStart Date:	1996/10/13
3041.23SisEnd Date:	1997/03/15
3051.1SlukemBase Tag:	is-newarp-base
3061.10SsaloMaintainer:	Ignatios Souvatzis <is@NetBSD.org>
3071.1SlukemScope:		kernel
3081.1SlukemNotes:
3091.1Slukem
3101.1Slukem
3111.1SlukemBranch:		kame
3121.1SlukemDescription:	KAME Project
3131.1SlukemStatus:		Dormant
3141.1SlukemStart Date:	28 Jun 1999
3151.1SlukemEnd Date:
3161.1SlukemBase Tag:
3171.10SsaloMaintainer:	Jun-ichiro itojun Hagino <itojun@NetBSD.org>
3181.1SlukemScope:		kernel
3191.1SlukemNotes:		http://www.kame.net
3201.1Slukem		Used for "reference" purposes for early part of KAME
3211.1Slukem		integration effort.  The branch is not actively used, as I
3221.1Slukem		(itojun) use patch(1) and diff(1) for the KAME syncs.
3231.1Slukem
3241.1SlukemBranch:		kenh-if-detach
3251.1SlukemDescription:	Interface detach support.
3261.1SlukemStatus:		?
3271.1SlukemStart Date:
3281.1SlukemEnd Date:
3291.1SlukemBase Tag:	kenh-if-detach-base
3301.10SsaloMaintainer:	Ken Hornstein <kenh@NetBSD.org>
3311.1SlukemScope:		kernel
3321.1SlukemNotes:
3331.1Slukem
3341.16SkentBranch:		kent-audio1
3351.16SkentDescription:	Audio converter pipeline
3361.18SkentStatus:		Terminated; merged to -current
3371.16SkentStart Date:	Tue Dec  7 2004
3381.17SkentEnd Date:	Tue Jan 11 2005
3391.17SkentBase Tag:	kent-audio1-base
3401.17SkentMaintainer:	TAMURA Kent <kent@NetBSD.org>
3411.17SkentScope:		kernel (audio device drivers)
3421.17SkentNotes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
3431.17Skent		Please consult with the maintainer before committing
3441.17Skent		to this branch.
3451.17Skent
3461.17SkentBranch:		kent-audio2
3471.17SkentDescription:	In-kernel audio mixer
3481.17SkentStatus:		Active
3491.17SkentStart Date:	Sun Jan 16 2005
3501.16SkentEnd Date:	
3511.17SkentBase Tag:	kent-audio2-base
3521.16SkentMaintainer:	TAMURA Kent <kent@NetBSD.org>
3531.16SkentScope:		kernel (audio device drivers)
3541.16SkentNotes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
3551.16Skent		Please consult with the maintainer before committing
3561.16Skent		to this branch.
3571.47Skent		This branch is not expected to be compilable yet.
3581.16Skent
3591.1SlukemBranch:		kqueue
3601.1SlukemDescription:	kqueue kernel event notification mechanism (from FreeBSD)
3611.5SjdolecekStatus:		Terminated; merged to -current
3621.1SlukemStart Date:	Tue Jul 10 23:08:38 EST 2001
3631.5SjdolecekEnd Date:	Tue Oct 24 09:14:14 GMT 2002
3641.1SlukemBase Tag:	kqueue-base
3651.1SlukemMaintainer:	Jaromir Dolecek <jdolecek@NetBSD.org>
3661.1SlukemScope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
3671.1SlukemNotes:		Integration of FreeBSD's kqueue(2) mechanism, with various
3681.1Slukem		local internal changes to better suit NetBSD, and
3691.1Slukem		enhancements such as looking up filters by name or
3701.1Slukem		number, and dynamic registration of "user" filters.
3711.1Slukem		The work is complete as is, but is awaiting more
3721.1Slukem		feedback from various kernel gurus before going mainline.
3731.11Sskrll
3741.11SskrllBranch:		ktrace-lwp
3751.11SskrllDescription:	ktrace support for lwp ids.
3761.59SskrllStatus:		Terminated; merged to -current
3771.11SskrllStart Date:	Wed Jul  2 15:27:30 UTC 2003
3781.59SskrllEnd Date:	Sun Dec 11 12:25:29 UTC 2005
3791.11SskrllBase Tag:	ktrace-lwp-base
3801.12SgrantMaintainer:	Darren Reed <darrenr@NetBSD.org>
3811.11SskrllScope:		sys
3821.11SskrllNotes:		
3831.1Slukem
3841.1SlukemBranch:		marc-pcmcia
3851.1SlukemDescription:	PCMCIA support
3861.1SlukemStatus:		Terminated; merged to -current
3871.1SlukemStart Date:
3881.1SlukemEnd Date:
3891.1SlukemBase Tag:	marc-pcmcia-base, marc-pcmcia-bp
3901.10SsaloMaintainer:	Marc Horowitz <marc@NetBSD.org>
3911.1SlukemScope:		kernel
3921.1SlukemNotes:
3931.1Slukem
3941.1SlukemBranch:		minoura_x68k_bus_h
3951.1SlukemDescription:	bus_space(9) and bus_dma(9) implementation for x68k
3961.1SlukemStatus:		Terminated; merged to -current
3971.1SlukemStart Date:	23 Dec 1998
3981.1SlukemEnd Date:	16 Mar 1999
3991.1SlukemBase Tag:	minoura_x68k_bus_h-base
4001.10SsaloMaintainer:	Minoura Makoto <minoura@NetBSD.org>
4011.1SlukemScope:		sys/arch/x68k
4021.1SlukemNotes:
4031.1Slukem
4041.1SlukemBranch:		minoura-xpg4dl
4051.1SlukemDescription:	Citrus Project locale subsystem
4061.1SlukemStatus:		Terminated; (partly) merged to -current
4071.1SlukemStart Date:	28 March 2000
4081.1SlukemEnd Date:
4091.1SlukemBase Tag:	minoura-xpg4dl-base
4101.10SsaloMaintainer:	Minoura Makoto <minoura@NetBSD.org>
4111.1SlukemScope:		basesrc, syssrc, sharesrc
4121.1SlukemNotes:		Citrus Project is developing dynamically-loadable, codeset-
4131.1Slukem		independent locale subsystem.  Part of the implementation
4141.1Slukem		(LC_CTYPE) called XPG4DL is now integrated to -current.
4151.1Slukem
4161.1SlukemBranch:		mrg-vm-swap
4171.49SmrgDescription:	dynamic swap allocation, swap-to-files support
4181.49SmrgStatus:		Terminated; abondoned for mrg-vm-swap2
4191.49SmrgStart Date:	12 February 1997
4201.49SmrgEnd Date:	15 March 1997
4211.49SmrgBase Tag:	[none]
4221.49SmrgMaintainer:	Matthew R. Green <mrg@NetBSD.org>
4231.49SmrgScope:		kernel
4241.49SmrgNotes:
4251.49Smrg
4261.49SmrgBranch:		mrg-vm-swap2
4271.49SmrgDescription:	dynamic swap allocation, swap-to-files support
4281.49SmrgStatus:		Terminated; merged to -current
4291.49SmrgStart Date:	4 May 1997
4301.49SmrgEnd Date:	12 June 1997
4311.49SmrgBase Tag:	mrg-vm-swap2-base
4321.10SsaloMaintainer:	Matthew R. Green <mrg@NetBSD.org>
4331.1SlukemScope:		kernel
4341.1SlukemNotes:
4351.1Slukem
4361.1SlukemBranch:		nathanw_sa
4371.1SlukemDescription:	Scheduler activations
4381.44SchsStatus:		Terminated; merged to -current
4391.1SlukemStart Date:	5 March 2001
4401.9SthorpejEnd Date:	18 January 2003
4411.1SlukemBase Tag:	nathanw_sa_base
4421.10SsaloMaintainer:	Nathan Williams <nathanw@NetBSD.org>
4431.1SlukemScope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
4441.1Slukem		bin/ps usr.bin/systat usr.bin/top usr.bin/w
4451.1Slukem		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
4461.1SlukemNotes:		The idea of scheduler activations is described in the
4471.1Slukem		classic paper by Anderson et al., in ACM Transactions
4481.1Slukem		a on Computer Systems volume 10 issue 1 (1992),which
4491.1Slukem		can be found at
4501.1Slukem		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
4511.1Slukem		Many ideas in the implementation are based on the
4521.1Slukem		implementation of scheduler activations added to Mach
4531.1Slukem		3.0 and described by Davis et al. in the University of
4541.1Slukem		Washington CS tech report 92-08-93, which can be found
4551.1Slukem		at
4561.1Slukem		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
4571.1Slukem
4581.1Slukem		My USENIX paper on the subject can be found at
4591.1Slukem		http://web.mit.edu/nathanw/www/usenix/
4601.1Slukem
4611.1Slukem		Please consult with the maintainer before committing
4621.1Slukem		to this branch.
4631.1Slukem		Other tags starting with nathanw_sa reserved for
4641.1Slukem		branch management and are not guaranteed to be stable.
4651.9Sthorpej
4661.9Sthorpej		Trunk tagged with "nathanw_sa_before_merge" prior to
4671.9Sthorpej		merging branch down to trunk.  Branch tagged with
4681.9Sthorpej		"nathanw_sa_end" to indicate the ending revision of
4691.9Sthorpej		the branch.
4701.1Slukem
4711.1SlukemBranch:		newlock
4721.1SlukemDescription:	New locking primitives, based on Solaris's
4731.1SlukemStatus:		Active
4741.1SlukemStart Date:	March 9, 2002
4751.1SlukemEnd Date:
4761.1SlukemBase Tag:	newlock-base
4771.10SsaloMaintainer:	Jason R. Thorpe <thorpej@NetBSD.org>
4781.1SlukemScope:		Kernel
4791.1SlukemNotes:		The goal is to replace the existing lockmgr() and
4801.1Slukem		simple_lock() based locking mechanisms with the
4811.1Slukem		primitives found in Solaris: mutexes and rwlocks.
4821.1Slukem
4831.1SlukemBranch:		perseant-lfsv2
4841.1SlukemDescription:	LFS incompatible on-disk data structure changes
4851.1SlukemStatus:		Terminated
4861.1SlukemStart Date:	27 June 2001
4871.1SlukemEnd Date:	16 July 2001
4881.1SlukemBase Tag:	perseant-lfsv2-base
4891.10SsaloMaintainer:	Konrad Schroder <perseant@NetBSD.org>
4901.1SlukemScope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
4911.1SlukemNotes:		This branch should be short-lived, I expect to merge as soon
4921.1Slukem		as the data structures required for unremove are in and tested.
4931.1Slukem
4941.1SlukemBranch:	  	pkgviews
4951.1SlukemDescription:  	package views, enabling multiple conflicting packages to co-exist
4961.1SlukemStatus:		Active
4971.1SlukemStart Date:	22 July 2002
4981.1SlukemEnd Date:
4991.1SlukemBase Tag:	pkgviews
5001.10SsaloMaintainer:	Alistair Crooks <agc@NetBSD.org>
5011.1SlukemScope:		pkgsrc, basesrc/usr.sbin/pkg_install
5021.1SlukemNotes:		A more flexible infrastructure for third-party packages by
5031.1Slukem		allowing multiple conflicting packages and versions to co-exist
5041.1Slukem		within the same tree
5051.1Slukem
5061.1SlukemBranch:		sommerfeld_i386mp_1
5071.1SlukemDescription:	Multiprocessor support for i386 using Intel MP BIOS.
5081.3SsommerfeStatus:		Terminated; merged to -current
5091.1SlukemStart Date:	21 Feb 2000
5101.2SfvdlEnd Date:	01 Oct 2002
5111.1SlukemBase Tag:	sommerfeld_i386mpbase_1
5121.10SsaloMaintainer:	Bill Sommerfeld <sommerfeld@NetBSD.org>
5131.1SlukemScope:		sys/arch/i386
5141.1SlukemNotes:
5151.1Slukem		Code committed to the branch has booted to multiuser 
5161.1Slukem		on at least one system.
5171.1Slukem
5181.1Slukem		Not guaranteed to compile against mainline since -current
5191.1Slukem		may have changed incompatibly with the last branch update;
5201.1Slukem		use "cvs update -D" to roll-back the rest of the tree to match.
5211.1Slukem
5221.1Slukem		Please get explicit permission from the maintainer 
5231.1Slukem		before each commit, or your changes will be backed out.
5241.1Slukem		Other tags starting with sommerfeld_ are private to 
5251.1Slukem		the developer and are guaranteed to be unstable.
5261.1Slukem		Only the maintainer should move tags.
5271.1Slukem
5281.1Slukem		Note that this branch uses a DIFFERENT scheme for 
5291.1Slukem		synching with the mainline.  the maintainer uses some private
5301.1Slukem		scripts for keeping them in synch; if you make commits 
5311.1Slukem		to the branch to "resynchronize" things, you'll
5321.1Slukem		probably do it wrong; instead, ask the maintainer to
5331.1Slukem		resynchronize things.
5341.1Slukem
5351.1Slukem		See sys/arch/i386/TODO on the branch for a list of known
5361.1Slukem		issues with the branch.
5371.1Slukem
5381.1SlukemBranch:		thorpej-devvp
5391.1SlukemDescription:	replace dev_t with struct vnode * in devsw entry points
5401.1SlukemStatus:		Active
5411.1SlukemStart Date:	Sep 6 2001
5421.1SlukemEnd Date:
5431.1SlukemBase Tag:	thorpej-devvp-base
5441.10SsaloMaintainer:	Jason Thorpe <thorpej@NetBSD.org>
5451.1SlukemScope:		syssrc
5461.1SlukemNotes:		Kernels built from this branch are not expected
5471.1Slukem		to function correctly at this time.
5481.1Slukem
5491.1Slukem		Ports known to compile on this branch:
5501.1Slukem			alpha
5511.1Slukem			i386
5521.1Slukem
5531.1SlukemBranch:		thorpej-mips-cache
5541.1SlukemDescription:	overhaul MIPS cache support code
5551.1SlukemStatus:		Terminated; merged to -current
5561.1SlukemStart Date:	Oct 23 2001
5571.1SlukemEnd Date:	Nov 14 2001
5581.1SlukemBase Tag:	thorpej-mips-cache-base
5591.1SlukemScope:		syssrc
5601.1SlukemNotes:		This branch needs more debugging, testing, and more
5611.1Slukem		ports need to be converted to the new world order.
5621.1Slukem
5631.1Slukem		The following processors have had cache ops
5641.1Slukem		written:
5651.1Slukem
5661.1Slukem			* R2000/R3000 (cache_r3k) -- light testing,
5671.1Slukem			  needs to be beat on a lot more to make
5681.1Slukem			  sure it's working.
5691.1Slukem
5701.10Ssalo			* R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org
5711.1Slukem			  tracked down a bug, which has been fixed.
5721.1Slukem
5731.1Slukem			  Confirmed working on R4000-with-L2.
5741.1Slukem
5751.1Slukem			  Confirmed working on R4400-no-L2 and
5761.1Slukem			  R4400-with-L2.
5771.1Slukem
5781.10Ssalo			* R4600/R5000 (cache_r5k) -- shin@NetBSD.org
5791.1Slukem			  has committed fixes to this code.
5801.1Slukem
5811.1Slukem			  Confirmed working on R4600 v2 (SGI IP-22 with
5821.1Slukem			  no SysAD L2 cache).
5831.1Slukem
5841.1Slukem			  Confirmed working on RM5260 (Algorithmics P-5064).
5851.1Slukem
5861.10Ssalo			* TX39 (cache_tx39) -- uch@NetBSD.org has
5871.1Slukem			  committed fixes to this code.  Awaiting
5881.1Slukem			  confirmation that it is working properly.
5891.1Slukem
5901.10Ssalo			* R5900 (cache_r5900) -- uch@NetBSD.org has
5911.1Slukem			  written this code and tested it on a
5921.1Slukem			  PlayStation 2.
5931.1Slukem
5941.1Slukem		The following ports have been updated to compile (and
5951.1Slukem		use optimized-for-processor bus_dma routines).  Those
5961.1Slukem		that have been tested and work are marked with [WORKING].
5971.1Slukem
5981.1Slukem			* algor		[WORKING]
5991.1Slukem
6001.1Slukem			* arc		[WORKING]
6011.1Slukem
6021.1Slukem			* pmax		[WORKING]
6031.1Slukem
6041.1Slukem			* playstation2	[WORKING]
6051.1Slukem					Needs optimized bus_dmamap_sync().
6061.1Slukem
6071.1Slukem			* hpcmips	[need verification that this is working]
6081.1Slukem					Needs optimized bus_dmamap_sync().
6091.1Slukem
6101.1Slukem			* sgimips	[WORKING]
6111.1Slukem					Needs optimized bus_dmamap_sync().
6121.1Slukem
6131.1Slukem			* cobalt	[need testing]
6141.1Slukem
6151.1Slukem			* mipsco	[need testing]
6161.1Slukem
6171.1Slukem			* newsmips	[need testing]
6181.1Slukem
6191.1SlukemBranch:		thorpej_scsipi
6201.1SlukemDescription:	SCSI/ATAPI midlayer rewrite.
6211.1SlukemStatus:		Terminated; merged to -current
6221.1SlukemStart Date:
6231.1SlukemEnd Date:	Apr 25 2001
6241.1SlukemBase Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
6251.10SsaloMaintainer:	Manuel Bouyer <bouyer@NetBSD.org>,
6261.10Ssalo		Jason Thorpe <thorpej@NetBSD.org>
6271.1SlukemScope:		syssrc
6281.1SlukemNotes:		When a change from -current is pulled up please move the
6291.1Slukem		thorpej_scsipi_base tag to the revision you're syncing with.
6301.1Slukem		thorpej_scsipi_nbase is private to maintainer (only
6311.1Slukem		used when syncing the whole branch with HEAD).
6321.1Slukem		Just before the merge, syssrc has been tagged with
6331.1Slukem		thorpej_scsipi_beforemerge
6341.1Slukem
6351.1SlukemBranch:		thorpej-signal
6361.1SlukemDescription:	?
6371.1SlukemStatus:		?
6381.1SlukemStart Date:
6391.1SlukemEnd Date:
6401.1SlukemBase Tag:	thorpej-signal-base
6411.10SsaloMaintainer:	Jason Thorpe <thorpej@NetBSD.org>
6421.1SlukemScope:		kernel
6431.1SlukemNotes:
6441.1Slukem
6451.1SlukemBranch:		thorpej-setroot
6461.1SlukemDescription:	?
6471.1SlukemStatus:		Terminated; merged to -current
6481.1SlukemStart Date:
6491.1SlukemEnd Date:
6501.1SlukemBase Tag:
6511.10SsaloMaintainer:	Jason Thorpe <thorpej@NetBSD.org>
6521.1SlukemScope:		kernel
6531.1SlukemNotes:
6541.1Slukem
6551.27SmattBranch:		matt-timespec
6561.27SmattDescription:	Convert the kernel to struct timespec as its primary time
6571.27Smatt		storage mechanism.
6581.27SmattStatus:		Active
6591.27SmattStart Date:	2005-02-19
6601.27SmattEnd Date:
6611.27SmattBase Tag:	
6621.27SmattMaintainer:	Matt Thomas <matt@NetBSD.org>
6631.27SmattScope:		kernel
6641.27SmattNotes:	
6651.1Slukem
6661.1SlukemBranch:		wrstuden-devbsize
6671.1SlukemDescription:	Modify buffer cache to deal with different devices having
6681.1Slukem		different block sizes. Also DEV_BSIZE would go away.
6691.1SlukemStatus:		Terminated
6701.1SlukemStart Date:	Aug or Sept 1999
6711.1SlukemEnd Date:	1 Apr 2000
6721.1SlukemBase tag:	wrstuden-devbsize-base
6731.10SsaloMaintainer:	Bill Studenmund <wrstuden@NetBSD.org>
6741.1SlukemScope:		kernel
6751.1SlukemNotes:		No longer active due to lack of time, and introduction
6761.1Slukem		of UBC. In terms of UBC, the primary cache for
6771.1Slukem		file data is the VM cache, which needs to operate
6781.1Slukem		in terms of VM pages. As no existing device has native
6791.1Slukem		pages the same size as our VM pages, there already is
6801.1Slukem		a mapping going on between the VM system and the
6811.1Slukem		underlying blocks. So it would be easier and cleaner
6821.1Slukem		to adjust that to deal w/ different block sizes.
6831.1Slukem		Also with UBC, all i/o is in terms of bytes at an offset
6841.1Slukem		with a certain length, so the exact block size isn't a big
6851.1Slukem		deal.
6861.1Slukem
6871.1Slukem		Any other wrstuden-devbsize tag may (and should) go away.
6881.1Slukem
6891.1Slukem
6901.14SrtrBranch:		rtr-xorg-branch
6911.14SrtrDescription:	xorg & static build alterations to src/x11
6921.14SrtrStatus:		Active
6931.14SrtrStart Date:	Nov 15 2004
6941.14SrtrEnd Date:	
6951.14SrtrBase tag:	rtr-xorg-branch-base
6961.14SrtrMaintainer:	Tyler R. Retzlaff <rtr@NetBSD.org>
6971.14SrtrScope:		x11
6981.14Srtr		distrib/sets/lists
6991.14Srtr		share/mk/bsd.x11.mk
7001.15Srtr		share/mk/bsd.own.mk
7011.14Srtr		etc/mtree/NetBSD.dist
7021.14SrtrNotes:		Requires parts of xsrc/xfree (HEAD)
7031.14Srtr		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
7041.14Srtr		Requires xorg (XORG-6_8_1)
7051.14Srtr
7061.1Slukem
7071.25SyamtBranch:		yamt-km, yamt-km-doc
7081.19SyamtDescription:	simplify/improve kernel memory management and bootstrap
7091.46SyamtStatus:		Terminated; merged to -current
7101.19SyamtStart Date:	Tue Jan 25 2005
7111.46SyamtEnd Date:	Fri Apr  1 2005
7121.45SyamtBase Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
7131.19SyamtMaintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
7141.25SyamtScope:		yamt-km: src/sys
7151.25Syamt		yamt-km-doc: src/share/man/man9/uvm.9
7161.19SyamtNotes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
7171.19Syamt
7181.24Syamt		the followings are per-port status.
7191.24Syamt		(account names mean "tested by".)
7201.24Syamt
7211.20Syamt		works enough to go to multiuser:
7221.45Syamt			alpha, i386, xen (yamt@)
7231.24Syamt			pc532 (simonb@)
7241.28Syamt			alpha, i386, mac68k, macppc, pmax, shark,
7251.34Syamt			    sparc, sparc64, sun3, x68k (chs@)
7261.39Syamt			cobalt, dreamcast, hp300, news68k, newsmips,
7271.39Syamt			    sun3x (tsutsui@)
7281.31Syamt			amiga (mhitch@)
7291.32Syamt			cats, hp700 (skrll@)
7301.45Syamt			xen (bouyer@)
7311.28Syamt
7321.28Syamt		known to have the same problem as trunk:
7331.28Syamt			vax (chs@, stuck while running kvm_mkdb)
7341.24Syamt
7351.24Syamt		known to have a problem:
7361.35Syamt			luna68k (and, if any, other m68k ports which use TTR)
7371.35Syamt			needs to be revisited.
7381.39Syamt			-> for luna68k, although not tested,
7391.39Syamt			   Sysmap has been moved to avoid kva conflict with
7401.39Syamt			   I/O ranges.
7411.20Syamt
7421.20Syamt		buildable:
7431.20Syamt			src/sys/arch/acorn26/conf/GENERIC
7441.20Syamt			src/sys/arch/acorn32/conf/GENERIC
7451.20Syamt			src/sys/arch/algor/conf/P6032
7461.20Syamt			src/sys/arch/alpha/conf/GENERIC
7471.20Syamt			src/sys/arch/alpha/conf/GENERIC.MP
7481.20Syamt			src/sys/arch/amd64/conf/GENERIC
7491.20Syamt			src/sys/arch/amd64/conf/GENERIC.MP
7501.20Syamt			src/sys/arch/amiga/conf/GENERIC
7511.20Syamt			src/sys/arch/arc/conf/GENERIC
7521.20Syamt			src/sys/arch/atari/conf/MILAN-PCIIDE
7531.20Syamt			src/sys/arch/bebox/conf/GENERIC
7541.20Syamt			src/sys/arch/cats/conf/GENERIC
7551.20Syamt			src/sys/arch/cesfic/conf/GENERIC
7561.20Syamt			src/sys/arch/cobalt/conf/GENERIC
7571.20Syamt			src/sys/arch/dreamcast/conf/GENERIC
7581.20Syamt			src/sys/arch/evbarm/conf/TS7200
7591.20Syamt			src/sys/arch/evbppc/conf/WALNUT
7601.20Syamt			src/sys/arch/evbsh3/conf/COMPUTEXEVB
7611.20Syamt			src/sys/arch/evbsh5/conf/CAYMAN64
7621.20Syamt			src/sys/arch/hp300/conf/GENERIC
7631.20Syamt			src/sys/arch/hp700/conf/GENERIC
7641.20Syamt			src/sys/arch/hpcarm/conf/JORNADA728
7651.20Syamt			src/sys/arch/hpcmips/conf/GENERIC
7661.20Syamt			src/sys/arch/hpcsh/conf/GENERIC
7671.20Syamt			src/sys/arch/hpcsh/conf/HPW650PA
7681.20Syamt			src/sys/arch/i386/conf/GENERIC
7691.20Syamt			src/sys/arch/i386/conf/GENERIC.MP
7701.40Syamt			src/sys/arch/i386/conf/XEN0
7711.40Syamt			src/sys/arch/i386/conf/XENU
7721.20Syamt			src/sys/arch/ibmnws/conf/GENERIC
7731.20Syamt			src/sys/arch/iyonix/conf/GENERIC
7741.20Syamt			src/sys/arch/luna68k/conf/GENERIC
7751.20Syamt			src/sys/arch/mac68k/conf/GENERIC
7761.20Syamt			src/sys/arch/macppc/conf/GENERIC
7771.20Syamt			src/sys/arch/macppc/conf/GENERIC.MP
7781.20Syamt			src/sys/arch/mipsco/conf/GENERIC
7791.40Syamt			src/sys/arch/mmeye/conf/GENERIC
7801.20Syamt			src/sys/arch/mvme68k/conf/GENERIC
7811.20Syamt			src/sys/arch/netwinder/conf/GENERIC
7821.20Syamt			src/sys/arch/news68k/conf/GENERIC
7831.20Syamt			src/sys/arch/newsmips/conf/GENERIC
7841.20Syamt			src/sys/arch/next68k/conf/GENERIC
7851.20Syamt			src/sys/arch/ofppc/conf/GENERIC
7861.20Syamt			src/sys/arch/pc532/conf/GENERIC
7871.20Syamt			src/sys/arch/pmax/conf/GENERIC
7881.20Syamt			src/sys/arch/prep/conf/GENERIC
7891.20Syamt			src/sys/arch/sandpoint/conf/GENERIC
7901.20Syamt			src/sys/arch/sbmips/conf/GENERIC
7911.20Syamt			src/sys/arch/sgimips/conf/GENERIC32_IP3x
7921.20Syamt			src/sys/arch/shark/conf/GENERIC
7931.20Syamt			src/sys/arch/sparc/conf/GENERIC
7941.20Syamt			src/sys/arch/sparc/conf/GENERIC.MP
7951.20Syamt			src/sys/arch/sparc64/conf/GENERIC
7961.20Syamt			src/sys/arch/sparc64/conf/GENERIC.MP
7971.20Syamt			src/sys/arch/sun2/conf/GENERIC
7981.20Syamt			src/sys/arch/sun3/conf/GENERIC
7991.20Syamt			src/sys/arch/vax/conf/GENERIC
8001.20Syamt			src/sys/arch/vax/conf/GENERIC.MP
8011.20Syamt			src/sys/arch/x68k/conf/GENERIC
8021.20Syamt
8031.42Syamt			src/sys/arch/playstation2/conf/GENERIC
8041.42Syamt
8051.19Syamt
8061.30StronBranch:		bouyer-xen2
8071.30StronDescription:	update xen port to xen 2.0, with support for domain0 operations
8081.33SbouyerStatus:		Terminated
8091.30StronStart Date:	Dec 13 2004
8101.33SbouyerEnd Date:	Mar 10 2005
8111.30StronBase Tag:	netbsd-2-base
8121.30StronMaintainer:	Manuel Bouyer <bouyer@NetBSD.org>
8131.30StronScope:		src/sys/arch/xen
8141.30StronNotes:
8151.30Stron
8161.48Syamt
8171.48SyamtBranch:		yamt-lazymbuf
8181.48SyamtDescription:	implement and evaluate lazy mapping of mbuf external data pages
8191.48SyamtStatus:		Active
8201.48SyamtStart Date:	Wed Jul  6 2005
8211.48SyamtEnd Date:	
8221.48SyamtBase Tag:	yamt-lazymbuf-base
8231.48SyamtMaintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
8241.48SyamtScope:		src/sys
8251.48SyamtNotes:		
8261.48Syamt
8271.48Syamt
8281.50SyamtBranch:		yamt-vop
8291.50SyamtDescription:	remove several VOPs
8301.53SyamtStatus:		Terminated; merged to -current
8311.50SyamtStart Date:	Wed Oct 19 2005
8321.53SyamtEnd Date:	Wed Nov  2 2005
8331.52SyamtBase Tag:	yamt-vop-base3
8341.50SyamtMaintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
8351.50SyamtScope:		src/sys
8361.50SyamtNotes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
8371.50Syamt
8381.50Syamt
8391.54SyamtBranch:		yamt-readahead
8401.54SyamtDescription:	play with file readahead
8411.58SyamtStatus:		Terminated; merged to -current
8421.54SyamtStart Date:	Mon Nov 14 2005
8431.58SyamtEnd Date:	Wed Nov 30 2005
8441.57SyamtBase Tag:	yamt-readahead-base3
8451.54SyamtMaintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
8461.54SyamtScope:		src/sys
8471.54SyamtNotes:		
8481.54Syamt
8491.54Syamt
8501.1Slukem# Other:
8511.1Slukem
8521.1SlukemBranch:		magnum
8531.1SlukemDescription:	?
8541.1SlukemStatus:		?
8551.1SlukemStart Date:
8561.1SlukemEnd Date:
8571.1SlukemBase Tag:	magnum-base
8581.1SlukemMaintainer:	?
8591.1SlukemScope:		kernel
8601.1SlukemNotes:
861