BRANCHES revision 1.50
11.50Syamt#	$NetBSD: BRANCHES,v 1.50 2005/10/20 00:42:40 yamt 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.1Slukem# Individual developers' branches:
1761.1Slukem
1771.4Sbjh21
1781.4Sbjh21Branch:		bjh21-hydra
1791.4Sbjh21Description:	Simtec Hydra support and ARM SMP in general
1801.4Sbjh21Status:		Active
1811.4Sbjh21Start Date:	18 Oct 2002
1821.4Sbjh21End Date:
1831.4Sbjh21Base Tag:	bjh21-hydra-base
1841.10SsaloMaintainer:	Ben Harris <bjh21@NetBSD.org>
1851.4Sbjh21Scope:		sys/arch/arm sys/arch/acorn32
1861.4Sbjh21Notes:		This code is on a branch because it involves changes to
1871.4Sbjh21		cpuswitch.S which would otherwise make merging the
1881.4Sbjh21		nathanw_sa branch difficult.  This branch is expected
1891.4Sbjh21		to be merged to the trunk shortly after nathanw_sa.
1901.1Slukem
1911.1SlukemBranch:		bouyer-scsipi
1921.1SlukemDescription:	Integration of atapi support
1931.1SlukemStatus:		Terminated
1941.1SlukemStart Date:
1951.1SlukemEnd Date:
1961.1SlukemBase Tag:
1971.10SsaloMaintainer:	Manuel Bouyer <bouyer@NetBSD.org>
1981.1SlukemScope:		kernel
1991.1SlukemNotes:		Superseded by thorpej_scsipi
2001.1Slukem
2011.1SlukemBranch:		chs-ubc
2021.44SchsDescription:	Unified Buffer Cache
2031.44SchsStatus:		Terminated
2041.1SlukemStart Date:
2051.1SlukemEnd Date:
2061.1SlukemBase Tag:	chs-ubc-base
2071.10SsaloMaintainer:	Chuck Silvers <chs@NetBSD.org>
2081.1SlukemScope:		kernel
2091.1SlukemNotes:
2101.1Slukem
2111.1SlukemBranch:		chs-ubc2
2121.44SchsDescription:	 Unified Buffer Cache
2131.44SchsStatus:		Terminated; merged to -current
2141.1SlukemStart Date:
2151.1SlukemEnd Date:
2161.1SlukemBase Tag:	chs-ubc2-base, chs-ubc2-newbase
2171.10SsaloMaintainer:	Chuck Silvers <chs@NetBSD.org>
2181.1SlukemScope:		kernel
2191.1SlukemNotes:
2201.1Slukem
2211.1SlukemBranch:		cjs-build-against-obj-dir
2221.1SlukemDescription:	?
2231.1SlukemStatus:		?
2241.1SlukemStart Date:
2251.1SlukemEnd Date:
2261.1SlukemBase Tag:
2271.10SsaloMaintainer:	Curt Sampson <cjs@NetBSD.org>
2281.1SlukemScope:		Entire tree.
2291.1SlukemNotes:
2301.1Slukem
2311.1SlukemBranch:		eeh-paddr_t
2321.44SchsDescription:	use separate types for virtual vs. physical addresses
2331.44SchsStatus:		Terminated; merged to -current
2341.1SlukemStart Date:
2351.1SlukemEnd Date:
2361.1SlukemBase Tag:	eeh-paddr_t-base
2371.10SsaloMaintainer:	Eduardo Horvath <eeh@NetBSD.org>
2381.1SlukemScope:		kernel
2391.44SchsNotes:		This is needed to support 32-bit kernels on sparc64.
2401.1Slukem
2411.1SlukemBranch:		fvdl-softdep
2421.1SlukemDescription:	FFS soft dependencies
2431.44SchsStatus:		Terminated; merged to -current
2441.1SlukemStart Date:
2451.1SlukemEnd Date:
2461.1SlukemBase Tag:	fvdl-softdep-base
2471.10SsaloMaintainer:	Frank van der Linden <fvdl@NetBSD.org>
2481.1SlukemScope:		kernel
2491.1SlukemNotes:
2501.1Slukem
2511.1SlukemBranch:		gehenna-devsw
2521.1SlukemDescription:	auto-generation of devsw table
2531.1SlukemStatus:		Terminated
2541.1SlukemStart Date:	16 May 2002
2551.1SlukemEnd Date:	6 Sep 2002
2561.1SlukemBase Tag:	gehenna-devsw-base
2571.10SsaloMaintainer:	MAEKAWA Masahide <gehenna@NetBSD.org>
2581.1SlukemScope:		syssrc
2591.1SlukemNotes:		The goal is to get rid of the existing device switch tables in
2601.1Slukem		port-dependent conf.c and to generate them dynamically by
2611.1Slukem		config(8).
2621.8Sgmcgarry
2631.8SgmcgarryBranch:		gmcgarry_ctxsw
2641.8SgmcgarryDescription:	Separate scheduler from context-switch code
2651.8SgmcgarryStatus:		Active
2661.8SgmcgarryStart Date:	18 December 2002
2671.8SgmcgarryEnd Date:
2681.8SgmcgarryBase Tag:	gmcgarry_ctxsw_base
2691.10SsaloMaintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
2701.8SgmcgarryScope:		kernel
2711.8SgmcgarryNotes:		Removing knowledge of the schedular and its run queues
2721.8Sgmcgarry		from the machine-dependent context switch code is the
2731.8Sgmcgarry		first step in cleaning up the scheduler.  It is necessary
2741.8Sgmcgarry		for the newlock branch, making the scheduler SMP friendly,
2751.8Sgmcgarry		adding real-time scheduler extensions, and reducing the
2761.8Sgmcgarry		number of code paths for LWP and proc switching.
2771.8Sgmcgarry
2781.8SgmcgarryBranch:		gmcgarry_ucred
2791.8SgmcgarryDescription:	Integrate and encapsulate user credentials
2801.8SgmcgarryStatus:		Active
2811.8SgmcgarryStart Date:	18 December 2002
2821.8SgmcgarryEnd Date:
2831.8SgmcgarryBase Tag:	gmcgarry_ucred_base
2841.10SsaloMaintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
2851.8SgmcgarryScope:		kernel
2861.8SgmcgarryNotes:		merge pcred and ucred and poolify
2871.1Slukem
2881.1SlukemBranch:		is-newarp
2891.23SisDescription:	ARP for non-Ethernet
2901.23SisStatus:		Terminated; merged before NetBSD 1.3
2911.23SisStart Date:	1996/10/13
2921.23SisEnd Date:	1997/03/15
2931.1SlukemBase Tag:	is-newarp-base
2941.10SsaloMaintainer:	Ignatios Souvatzis <is@NetBSD.org>
2951.1SlukemScope:		kernel
2961.1SlukemNotes:
2971.1Slukem
2981.1Slukem
2991.1SlukemBranch:		kame
3001.1SlukemDescription:	KAME Project
3011.1SlukemStatus:		Dormant
3021.1SlukemStart Date:	28 Jun 1999
3031.1SlukemEnd Date:
3041.1SlukemBase Tag:
3051.10SsaloMaintainer:	Jun-ichiro itojun Hagino <itojun@NetBSD.org>
3061.1SlukemScope:		kernel
3071.1SlukemNotes:		http://www.kame.net
3081.1Slukem		Used for "reference" purposes for early part of KAME
3091.1Slukem		integration effort.  The branch is not actively used, as I
3101.1Slukem		(itojun) use patch(1) and diff(1) for the KAME syncs.
3111.1Slukem
3121.1SlukemBranch:		kenh-if-detach
3131.1SlukemDescription:	Interface detach support.
3141.1SlukemStatus:		?
3151.1SlukemStart Date:
3161.1SlukemEnd Date:
3171.1SlukemBase Tag:	kenh-if-detach-base
3181.10SsaloMaintainer:	Ken Hornstein <kenh@NetBSD.org>
3191.1SlukemScope:		kernel
3201.1SlukemNotes:
3211.1Slukem
3221.16SkentBranch:		kent-audio1
3231.16SkentDescription:	Audio converter pipeline
3241.18SkentStatus:		Terminated; merged to -current
3251.16SkentStart Date:	Tue Dec  7 2004
3261.17SkentEnd Date:	Tue Jan 11 2005
3271.17SkentBase Tag:	kent-audio1-base
3281.17SkentMaintainer:	TAMURA Kent <kent@NetBSD.org>
3291.17SkentScope:		kernel (audio device drivers)
3301.17SkentNotes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
3311.17Skent		Please consult with the maintainer before committing
3321.17Skent		to this branch.
3331.17Skent
3341.17SkentBranch:		kent-audio2
3351.17SkentDescription:	In-kernel audio mixer
3361.17SkentStatus:		Active
3371.17SkentStart Date:	Sun Jan 16 2005
3381.16SkentEnd Date:	
3391.17SkentBase Tag:	kent-audio2-base
3401.16SkentMaintainer:	TAMURA Kent <kent@NetBSD.org>
3411.16SkentScope:		kernel (audio device drivers)
3421.16SkentNotes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
3431.16Skent		Please consult with the maintainer before committing
3441.16Skent		to this branch.
3451.47Skent		This branch is not expected to be compilable yet.
3461.16Skent
3471.1SlukemBranch:		kqueue
3481.1SlukemDescription:	kqueue kernel event notification mechanism (from FreeBSD)
3491.5SjdolecekStatus:		Terminated; merged to -current
3501.1SlukemStart Date:	Tue Jul 10 23:08:38 EST 2001
3511.5SjdolecekEnd Date:	Tue Oct 24 09:14:14 GMT 2002
3521.1SlukemBase Tag:	kqueue-base
3531.1SlukemMaintainer:	Jaromir Dolecek <jdolecek@NetBSD.org>
3541.1SlukemScope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
3551.1SlukemNotes:		Integration of FreeBSD's kqueue(2) mechanism, with various
3561.1Slukem		local internal changes to better suit NetBSD, and
3571.1Slukem		enhancements such as looking up filters by name or
3581.1Slukem		number, and dynamic registration of "user" filters.
3591.1Slukem		The work is complete as is, but is awaiting more
3601.1Slukem		feedback from various kernel gurus before going mainline.
3611.11Sskrll
3621.11SskrllBranch:		ktrace-lwp
3631.11SskrllDescription:	ktrace support for lwp ids.
3641.11SskrllStatus:		Active
3651.11SskrllStart Date:	Wed Jul  2 15:27:30 UTC 2003
3661.11SskrllEnd Date:	
3671.11SskrllBase Tag:	ktrace-lwp-base
3681.12SgrantMaintainer:	Darren Reed <darrenr@NetBSD.org>
3691.11SskrllScope:		sys
3701.11SskrllNotes:		
3711.1Slukem
3721.1SlukemBranch:		marc-pcmcia
3731.1SlukemDescription:	PCMCIA support
3741.1SlukemStatus:		Terminated; merged to -current
3751.1SlukemStart Date:
3761.1SlukemEnd Date:
3771.1SlukemBase Tag:	marc-pcmcia-base, marc-pcmcia-bp
3781.10SsaloMaintainer:	Marc Horowitz <marc@NetBSD.org>
3791.1SlukemScope:		kernel
3801.1SlukemNotes:
3811.1Slukem
3821.1SlukemBranch:		minoura_x68k_bus_h
3831.1SlukemDescription:	bus_space(9) and bus_dma(9) implementation for x68k
3841.1SlukemStatus:		Terminated; merged to -current
3851.1SlukemStart Date:	23 Dec 1998
3861.1SlukemEnd Date:	16 Mar 1999
3871.1SlukemBase Tag:	minoura_x68k_bus_h-base
3881.10SsaloMaintainer:	Minoura Makoto <minoura@NetBSD.org>
3891.1SlukemScope:		sys/arch/x68k
3901.1SlukemNotes:
3911.1Slukem
3921.1SlukemBranch:		minoura-xpg4dl
3931.1SlukemDescription:	Citrus Project locale subsystem
3941.1SlukemStatus:		Terminated; (partly) merged to -current
3951.1SlukemStart Date:	28 March 2000
3961.1SlukemEnd Date:
3971.1SlukemBase Tag:	minoura-xpg4dl-base
3981.10SsaloMaintainer:	Minoura Makoto <minoura@NetBSD.org>
3991.1SlukemScope:		basesrc, syssrc, sharesrc
4001.1SlukemNotes:		Citrus Project is developing dynamically-loadable, codeset-
4011.1Slukem		independent locale subsystem.  Part of the implementation
4021.1Slukem		(LC_CTYPE) called XPG4DL is now integrated to -current.
4031.1Slukem
4041.1SlukemBranch:		mrg-vm-swap
4051.49SmrgDescription:	dynamic swap allocation, swap-to-files support
4061.49SmrgStatus:		Terminated; abondoned for mrg-vm-swap2
4071.49SmrgStart Date:	12 February 1997
4081.49SmrgEnd Date:	15 March 1997
4091.49SmrgBase Tag:	[none]
4101.49SmrgMaintainer:	Matthew R. Green <mrg@NetBSD.org>
4111.49SmrgScope:		kernel
4121.49SmrgNotes:
4131.49Smrg
4141.49SmrgBranch:		mrg-vm-swap2
4151.49SmrgDescription:	dynamic swap allocation, swap-to-files support
4161.49SmrgStatus:		Terminated; merged to -current
4171.49SmrgStart Date:	4 May 1997
4181.49SmrgEnd Date:	12 June 1997
4191.49SmrgBase Tag:	mrg-vm-swap2-base
4201.10SsaloMaintainer:	Matthew R. Green <mrg@NetBSD.org>
4211.1SlukemScope:		kernel
4221.1SlukemNotes:
4231.1Slukem
4241.1SlukemBranch:		nathanw_sa
4251.1SlukemDescription:	Scheduler activations
4261.44SchsStatus:		Terminated; merged to -current
4271.1SlukemStart Date:	5 March 2001
4281.9SthorpejEnd Date:	18 January 2003
4291.1SlukemBase Tag:	nathanw_sa_base
4301.10SsaloMaintainer:	Nathan Williams <nathanw@NetBSD.org>
4311.1SlukemScope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
4321.1Slukem		bin/ps usr.bin/systat usr.bin/top usr.bin/w
4331.1Slukem		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
4341.1SlukemNotes:		The idea of scheduler activations is described in the
4351.1Slukem		classic paper by Anderson et al., in ACM Transactions
4361.1Slukem		a on Computer Systems volume 10 issue 1 (1992),which
4371.1Slukem		can be found at
4381.1Slukem		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
4391.1Slukem		Many ideas in the implementation are based on the
4401.1Slukem		implementation of scheduler activations added to Mach
4411.1Slukem		3.0 and described by Davis et al. in the University of
4421.1Slukem		Washington CS tech report 92-08-93, which can be found
4431.1Slukem		at
4441.1Slukem		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
4451.1Slukem
4461.1Slukem		My USENIX paper on the subject can be found at
4471.1Slukem		http://web.mit.edu/nathanw/www/usenix/
4481.1Slukem
4491.1Slukem		Please consult with the maintainer before committing
4501.1Slukem		to this branch.
4511.1Slukem		Other tags starting with nathanw_sa reserved for
4521.1Slukem		branch management and are not guaranteed to be stable.
4531.9Sthorpej
4541.9Sthorpej		Trunk tagged with "nathanw_sa_before_merge" prior to
4551.9Sthorpej		merging branch down to trunk.  Branch tagged with
4561.9Sthorpej		"nathanw_sa_end" to indicate the ending revision of
4571.9Sthorpej		the branch.
4581.1Slukem
4591.1SlukemBranch:		newlock
4601.1SlukemDescription:	New locking primitives, based on Solaris's
4611.1SlukemStatus:		Active
4621.1SlukemStart Date:	March 9, 2002
4631.1SlukemEnd Date:
4641.1SlukemBase Tag:	newlock-base
4651.10SsaloMaintainer:	Jason R. Thorpe <thorpej@NetBSD.org>
4661.1SlukemScope:		Kernel
4671.1SlukemNotes:		The goal is to replace the existing lockmgr() and
4681.1Slukem		simple_lock() based locking mechanisms with the
4691.1Slukem		primitives found in Solaris: mutexes and rwlocks.
4701.1Slukem
4711.1SlukemBranch:		perseant-lfsv2
4721.1SlukemDescription:	LFS incompatible on-disk data structure changes
4731.1SlukemStatus:		Terminated
4741.1SlukemStart Date:	27 June 2001
4751.1SlukemEnd Date:	16 July 2001
4761.1SlukemBase Tag:	perseant-lfsv2-base
4771.10SsaloMaintainer:	Konrad Schroder <perseant@NetBSD.org>
4781.1SlukemScope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
4791.1SlukemNotes:		This branch should be short-lived, I expect to merge as soon
4801.1Slukem		as the data structures required for unremove are in and tested.
4811.1Slukem
4821.1SlukemBranch:	  	pkgviews
4831.1SlukemDescription:  	package views, enabling multiple conflicting packages to co-exist
4841.1SlukemStatus:		Active
4851.1SlukemStart Date:	22 July 2002
4861.1SlukemEnd Date:
4871.1SlukemBase Tag:	pkgviews
4881.10SsaloMaintainer:	Alistair Crooks <agc@NetBSD.org>
4891.1SlukemScope:		pkgsrc, basesrc/usr.sbin/pkg_install
4901.1SlukemNotes:		A more flexible infrastructure for third-party packages by
4911.1Slukem		allowing multiple conflicting packages and versions to co-exist
4921.1Slukem		within the same tree
4931.1Slukem
4941.1SlukemBranch:		sommerfeld_i386mp_1
4951.1SlukemDescription:	Multiprocessor support for i386 using Intel MP BIOS.
4961.3SsommerfeStatus:		Terminated; merged to -current
4971.1SlukemStart Date:	21 Feb 2000
4981.2SfvdlEnd Date:	01 Oct 2002
4991.1SlukemBase Tag:	sommerfeld_i386mpbase_1
5001.10SsaloMaintainer:	Bill Sommerfeld <sommerfeld@NetBSD.org>
5011.1SlukemScope:		sys/arch/i386
5021.1SlukemNotes:
5031.1Slukem		Code committed to the branch has booted to multiuser 
5041.1Slukem		on at least one system.
5051.1Slukem
5061.1Slukem		Not guaranteed to compile against mainline since -current
5071.1Slukem		may have changed incompatibly with the last branch update;
5081.1Slukem		use "cvs update -D" to roll-back the rest of the tree to match.
5091.1Slukem
5101.1Slukem		Please get explicit permission from the maintainer 
5111.1Slukem		before each commit, or your changes will be backed out.
5121.1Slukem		Other tags starting with sommerfeld_ are private to 
5131.1Slukem		the developer and are guaranteed to be unstable.
5141.1Slukem		Only the maintainer should move tags.
5151.1Slukem
5161.1Slukem		Note that this branch uses a DIFFERENT scheme for 
5171.1Slukem		synching with the mainline.  the maintainer uses some private
5181.1Slukem		scripts for keeping them in synch; if you make commits 
5191.1Slukem		to the branch to "resynchronize" things, you'll
5201.1Slukem		probably do it wrong; instead, ask the maintainer to
5211.1Slukem		resynchronize things.
5221.1Slukem
5231.1Slukem		See sys/arch/i386/TODO on the branch for a list of known
5241.1Slukem		issues with the branch.
5251.1Slukem
5261.1SlukemBranch:		thorpej-devvp
5271.1SlukemDescription:	replace dev_t with struct vnode * in devsw entry points
5281.1SlukemStatus:		Active
5291.1SlukemStart Date:	Sep 6 2001
5301.1SlukemEnd Date:
5311.1SlukemBase Tag:	thorpej-devvp-base
5321.10SsaloMaintainer:	Jason Thorpe <thorpej@NetBSD.org>
5331.1SlukemScope:		syssrc
5341.1SlukemNotes:		Kernels built from this branch are not expected
5351.1Slukem		to function correctly at this time.
5361.1Slukem
5371.1Slukem		Ports known to compile on this branch:
5381.1Slukem			alpha
5391.1Slukem			i386
5401.1Slukem
5411.1SlukemBranch:		thorpej-mips-cache
5421.1SlukemDescription:	overhaul MIPS cache support code
5431.1SlukemStatus:		Terminated; merged to -current
5441.1SlukemStart Date:	Oct 23 2001
5451.1SlukemEnd Date:	Nov 14 2001
5461.1SlukemBase Tag:	thorpej-mips-cache-base
5471.1SlukemScope:		syssrc
5481.1SlukemNotes:		This branch needs more debugging, testing, and more
5491.1Slukem		ports need to be converted to the new world order.
5501.1Slukem
5511.1Slukem		The following processors have had cache ops
5521.1Slukem		written:
5531.1Slukem
5541.1Slukem			* R2000/R3000 (cache_r3k) -- light testing,
5551.1Slukem			  needs to be beat on a lot more to make
5561.1Slukem			  sure it's working.
5571.1Slukem
5581.10Ssalo			* R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org
5591.1Slukem			  tracked down a bug, which has been fixed.
5601.1Slukem
5611.1Slukem			  Confirmed working on R4000-with-L2.
5621.1Slukem
5631.1Slukem			  Confirmed working on R4400-no-L2 and
5641.1Slukem			  R4400-with-L2.
5651.1Slukem
5661.10Ssalo			* R4600/R5000 (cache_r5k) -- shin@NetBSD.org
5671.1Slukem			  has committed fixes to this code.
5681.1Slukem
5691.1Slukem			  Confirmed working on R4600 v2 (SGI IP-22 with
5701.1Slukem			  no SysAD L2 cache).
5711.1Slukem
5721.1Slukem			  Confirmed working on RM5260 (Algorithmics P-5064).
5731.1Slukem
5741.10Ssalo			* TX39 (cache_tx39) -- uch@NetBSD.org has
5751.1Slukem			  committed fixes to this code.  Awaiting
5761.1Slukem			  confirmation that it is working properly.
5771.1Slukem
5781.10Ssalo			* R5900 (cache_r5900) -- uch@NetBSD.org has
5791.1Slukem			  written this code and tested it on a
5801.1Slukem			  PlayStation 2.
5811.1Slukem
5821.1Slukem		The following ports have been updated to compile (and
5831.1Slukem		use optimized-for-processor bus_dma routines).  Those
5841.1Slukem		that have been tested and work are marked with [WORKING].
5851.1Slukem
5861.1Slukem			* algor		[WORKING]
5871.1Slukem
5881.1Slukem			* arc		[WORKING]
5891.1Slukem
5901.1Slukem			* pmax		[WORKING]
5911.1Slukem
5921.1Slukem			* playstation2	[WORKING]
5931.1Slukem					Needs optimized bus_dmamap_sync().
5941.1Slukem
5951.1Slukem			* hpcmips	[need verification that this is working]
5961.1Slukem					Needs optimized bus_dmamap_sync().
5971.1Slukem
5981.1Slukem			* sgimips	[WORKING]
5991.1Slukem					Needs optimized bus_dmamap_sync().
6001.1Slukem
6011.1Slukem			* cobalt	[need testing]
6021.1Slukem
6031.1Slukem			* mipsco	[need testing]
6041.1Slukem
6051.1Slukem			* newsmips	[need testing]
6061.1Slukem
6071.1SlukemBranch:		thorpej_scsipi
6081.1SlukemDescription:	SCSI/ATAPI midlayer rewrite.
6091.1SlukemStatus:		Terminated; merged to -current
6101.1SlukemStart Date:
6111.1SlukemEnd Date:	Apr 25 2001
6121.1SlukemBase Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
6131.10SsaloMaintainer:	Manuel Bouyer <bouyer@NetBSD.org>,
6141.10Ssalo		Jason Thorpe <thorpej@NetBSD.org>
6151.1SlukemScope:		syssrc
6161.1SlukemNotes:		When a change from -current is pulled up please move the
6171.1Slukem		thorpej_scsipi_base tag to the revision you're syncing with.
6181.1Slukem		thorpej_scsipi_nbase is private to maintainer (only
6191.1Slukem		used when syncing the whole branch with HEAD).
6201.1Slukem		Just before the merge, syssrc has been tagged with
6211.1Slukem		thorpej_scsipi_beforemerge
6221.1Slukem
6231.1SlukemBranch:		thorpej-signal
6241.1SlukemDescription:	?
6251.1SlukemStatus:		?
6261.1SlukemStart Date:
6271.1SlukemEnd Date:
6281.1SlukemBase Tag:	thorpej-signal-base
6291.10SsaloMaintainer:	Jason Thorpe <thorpej@NetBSD.org>
6301.1SlukemScope:		kernel
6311.1SlukemNotes:
6321.1Slukem
6331.1SlukemBranch:		thorpej-setroot
6341.1SlukemDescription:	?
6351.1SlukemStatus:		Terminated; merged to -current
6361.1SlukemStart Date:
6371.1SlukemEnd Date:
6381.1SlukemBase Tag:
6391.10SsaloMaintainer:	Jason Thorpe <thorpej@NetBSD.org>
6401.1SlukemScope:		kernel
6411.1SlukemNotes:
6421.1Slukem
6431.27SmattBranch:		matt-timespec
6441.27SmattDescription:	Convert the kernel to struct timespec as its primary time
6451.27Smatt		storage mechanism.
6461.27SmattStatus:		Active
6471.27SmattStart Date:	2005-02-19
6481.27SmattEnd Date:
6491.27SmattBase Tag:	
6501.27SmattMaintainer:	Matt Thomas <matt@NetBSD.org>
6511.27SmattScope:		kernel
6521.27SmattNotes:	
6531.1Slukem
6541.1SlukemBranch:		wrstuden-devbsize
6551.1SlukemDescription:	Modify buffer cache to deal with different devices having
6561.1Slukem		different block sizes. Also DEV_BSIZE would go away.
6571.1SlukemStatus:		Terminated
6581.1SlukemStart Date:	Aug or Sept 1999
6591.1SlukemEnd Date:	1 Apr 2000
6601.1SlukemBase tag:	wrstuden-devbsize-base
6611.10SsaloMaintainer:	Bill Studenmund <wrstuden@NetBSD.org>
6621.1SlukemScope:		kernel
6631.1SlukemNotes:		No longer active due to lack of time, and introduction
6641.1Slukem		of UBC. In terms of UBC, the primary cache for
6651.1Slukem		file data is the VM cache, which needs to operate
6661.1Slukem		in terms of VM pages. As no existing device has native
6671.1Slukem		pages the same size as our VM pages, there already is
6681.1Slukem		a mapping going on between the VM system and the
6691.1Slukem		underlying blocks. So it would be easier and cleaner
6701.1Slukem		to adjust that to deal w/ different block sizes.
6711.1Slukem		Also with UBC, all i/o is in terms of bytes at an offset
6721.1Slukem		with a certain length, so the exact block size isn't a big
6731.1Slukem		deal.
6741.1Slukem
6751.1Slukem		Any other wrstuden-devbsize tag may (and should) go away.
6761.1Slukem
6771.1Slukem
6781.14SrtrBranch:		rtr-xorg-branch
6791.14SrtrDescription:	xorg & static build alterations to src/x11
6801.14SrtrStatus:		Active
6811.14SrtrStart Date:	Nov 15 2004
6821.14SrtrEnd Date:	
6831.14SrtrBase tag:	rtr-xorg-branch-base
6841.14SrtrMaintainer:	Tyler R. Retzlaff <rtr@NetBSD.org>
6851.14SrtrScope:		x11
6861.14Srtr		distrib/sets/lists
6871.14Srtr		share/mk/bsd.x11.mk
6881.15Srtr		share/mk/bsd.own.mk
6891.14Srtr		etc/mtree/NetBSD.dist
6901.14SrtrNotes:		Requires parts of xsrc/xfree (HEAD)
6911.14Srtr		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
6921.14Srtr		Requires xorg (XORG-6_8_1)
6931.14Srtr
6941.1Slukem
6951.25SyamtBranch:		yamt-km, yamt-km-doc
6961.19SyamtDescription:	simplify/improve kernel memory management and bootstrap
6971.46SyamtStatus:		Terminated; merged to -current
6981.19SyamtStart Date:	Tue Jan 25 2005
6991.46SyamtEnd Date:	Fri Apr  1 2005
7001.45SyamtBase Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
7011.19SyamtMaintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
7021.25SyamtScope:		yamt-km: src/sys
7031.25Syamt		yamt-km-doc: src/share/man/man9/uvm.9
7041.19SyamtNotes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
7051.19Syamt
7061.24Syamt		the followings are per-port status.
7071.24Syamt		(account names mean "tested by".)
7081.24Syamt
7091.20Syamt		works enough to go to multiuser:
7101.45Syamt			alpha, i386, xen (yamt@)
7111.24Syamt			pc532 (simonb@)
7121.28Syamt			alpha, i386, mac68k, macppc, pmax, shark,
7131.34Syamt			    sparc, sparc64, sun3, x68k (chs@)
7141.39Syamt			cobalt, dreamcast, hp300, news68k, newsmips,
7151.39Syamt			    sun3x (tsutsui@)
7161.31Syamt			amiga (mhitch@)
7171.32Syamt			cats, hp700 (skrll@)
7181.45Syamt			xen (bouyer@)
7191.28Syamt
7201.28Syamt		known to have the same problem as trunk:
7211.28Syamt			vax (chs@, stuck while running kvm_mkdb)
7221.24Syamt
7231.24Syamt		known to have a problem:
7241.35Syamt			luna68k (and, if any, other m68k ports which use TTR)
7251.35Syamt			needs to be revisited.
7261.39Syamt			-> for luna68k, although not tested,
7271.39Syamt			   Sysmap has been moved to avoid kva conflict with
7281.39Syamt			   I/O ranges.
7291.20Syamt
7301.20Syamt		buildable:
7311.20Syamt			src/sys/arch/acorn26/conf/GENERIC
7321.20Syamt			src/sys/arch/acorn32/conf/GENERIC
7331.20Syamt			src/sys/arch/algor/conf/P6032
7341.20Syamt			src/sys/arch/alpha/conf/GENERIC
7351.20Syamt			src/sys/arch/alpha/conf/GENERIC.MP
7361.20Syamt			src/sys/arch/amd64/conf/GENERIC
7371.20Syamt			src/sys/arch/amd64/conf/GENERIC.MP
7381.20Syamt			src/sys/arch/amiga/conf/GENERIC
7391.20Syamt			src/sys/arch/arc/conf/GENERIC
7401.20Syamt			src/sys/arch/atari/conf/MILAN-PCIIDE
7411.20Syamt			src/sys/arch/bebox/conf/GENERIC
7421.20Syamt			src/sys/arch/cats/conf/GENERIC
7431.20Syamt			src/sys/arch/cesfic/conf/GENERIC
7441.20Syamt			src/sys/arch/cobalt/conf/GENERIC
7451.20Syamt			src/sys/arch/dreamcast/conf/GENERIC
7461.20Syamt			src/sys/arch/evbarm/conf/TS7200
7471.20Syamt			src/sys/arch/evbppc/conf/WALNUT
7481.20Syamt			src/sys/arch/evbsh3/conf/COMPUTEXEVB
7491.20Syamt			src/sys/arch/evbsh5/conf/CAYMAN64
7501.20Syamt			src/sys/arch/hp300/conf/GENERIC
7511.20Syamt			src/sys/arch/hp700/conf/GENERIC
7521.20Syamt			src/sys/arch/hpcarm/conf/JORNADA728
7531.20Syamt			src/sys/arch/hpcmips/conf/GENERIC
7541.20Syamt			src/sys/arch/hpcsh/conf/GENERIC
7551.20Syamt			src/sys/arch/hpcsh/conf/HPW650PA
7561.20Syamt			src/sys/arch/i386/conf/GENERIC
7571.20Syamt			src/sys/arch/i386/conf/GENERIC.MP
7581.40Syamt			src/sys/arch/i386/conf/XEN0
7591.40Syamt			src/sys/arch/i386/conf/XENU
7601.20Syamt			src/sys/arch/ibmnws/conf/GENERIC
7611.20Syamt			src/sys/arch/iyonix/conf/GENERIC
7621.20Syamt			src/sys/arch/luna68k/conf/GENERIC
7631.20Syamt			src/sys/arch/mac68k/conf/GENERIC
7641.20Syamt			src/sys/arch/macppc/conf/GENERIC
7651.20Syamt			src/sys/arch/macppc/conf/GENERIC.MP
7661.20Syamt			src/sys/arch/mipsco/conf/GENERIC
7671.40Syamt			src/sys/arch/mmeye/conf/GENERIC
7681.20Syamt			src/sys/arch/mvme68k/conf/GENERIC
7691.20Syamt			src/sys/arch/netwinder/conf/GENERIC
7701.20Syamt			src/sys/arch/news68k/conf/GENERIC
7711.20Syamt			src/sys/arch/newsmips/conf/GENERIC
7721.20Syamt			src/sys/arch/next68k/conf/GENERIC
7731.20Syamt			src/sys/arch/ofppc/conf/GENERIC
7741.20Syamt			src/sys/arch/pc532/conf/GENERIC
7751.20Syamt			src/sys/arch/pmax/conf/GENERIC
7761.20Syamt			src/sys/arch/prep/conf/GENERIC
7771.20Syamt			src/sys/arch/sandpoint/conf/GENERIC
7781.20Syamt			src/sys/arch/sbmips/conf/GENERIC
7791.20Syamt			src/sys/arch/sgimips/conf/GENERIC32_IP3x
7801.20Syamt			src/sys/arch/shark/conf/GENERIC
7811.20Syamt			src/sys/arch/sparc/conf/GENERIC
7821.20Syamt			src/sys/arch/sparc/conf/GENERIC.MP
7831.20Syamt			src/sys/arch/sparc64/conf/GENERIC
7841.20Syamt			src/sys/arch/sparc64/conf/GENERIC.MP
7851.20Syamt			src/sys/arch/sun2/conf/GENERIC
7861.20Syamt			src/sys/arch/sun3/conf/GENERIC
7871.20Syamt			src/sys/arch/vax/conf/GENERIC
7881.20Syamt			src/sys/arch/vax/conf/GENERIC.MP
7891.20Syamt			src/sys/arch/x68k/conf/GENERIC
7901.20Syamt
7911.42Syamt			src/sys/arch/playstation2/conf/GENERIC
7921.42Syamt
7931.19Syamt
7941.30StronBranch:		bouyer-xen2
7951.30StronDescription:	update xen port to xen 2.0, with support for domain0 operations
7961.33SbouyerStatus:		Terminated
7971.30StronStart Date:	Dec 13 2004
7981.33SbouyerEnd Date:	Mar 10 2005
7991.30StronBase Tag:	netbsd-2-base
8001.30StronMaintainer:	Manuel Bouyer <bouyer@NetBSD.org>
8011.30StronScope:		src/sys/arch/xen
8021.30StronNotes:
8031.30Stron
8041.48Syamt
8051.48SyamtBranch:		yamt-lazymbuf
8061.48SyamtDescription:	implement and evaluate lazy mapping of mbuf external data pages
8071.48SyamtStatus:		Active
8081.48SyamtStart Date:	Wed Jul  6 2005
8091.48SyamtEnd Date:	
8101.48SyamtBase Tag:	yamt-lazymbuf-base
8111.48SyamtMaintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
8121.48SyamtScope:		src/sys
8131.48SyamtNotes:		
8141.48Syamt
8151.48Syamt
8161.50SyamtBranch:		yamt-vop
8171.50SyamtDescription:	remove several VOPs
8181.50SyamtStatus:		Active
8191.50SyamtStart Date:	Wed Oct 19 2005
8201.50SyamtEnd Date:	
8211.50SyamtBase Tag:	yamt-vop-base
8221.50SyamtMaintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
8231.50SyamtScope:		src/sys
8241.50SyamtNotes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
8251.50Syamt
8261.50Syamt
8271.1Slukem# Other:
8281.1Slukem
8291.1SlukemBranch:		magnum
8301.1SlukemDescription:	?
8311.1SlukemStatus:		?
8321.1SlukemStart Date:
8331.1SlukemEnd Date:
8341.1SlukemBase Tag:	magnum-base
8351.1SlukemMaintainer:	?
8361.1SlukemScope:		kernel
8371.1SlukemNotes:
838