BRANCHES revision 1.31
11.31Syamt#	$NetBSD: BRANCHES,v 1.31 2005/03/05 07:54:19 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.1SlukemStatus:		Active
1191.1SlukemStart Date:	20 Jun 2000
1201.1SlukemEnd Date:
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.13SjmcDescription:	The NetBSD 2.0 release branch
1401.13SjmcStatus:		Active
1411.13SjmcStart Date:	28 Mar 2004
1421.13SjmcEnd Date:
1431.13SjmcBase Tag:	netbsd-2-0-base
1441.13SjmcMaintainer:	2.0 Release Engineering <releng-2-0@NetBSD.org>
1451.13SjmcScope:		Entire tree. (src + xsrc)
1461.13SjmcNotes:
1471.13Sjmc		Commits restricted to Release Engineering.
1481.13Sjmc
1491.1Slukem
1501.1Slukem# Individual developers' branches:
1511.1Slukem
1521.4Sbjh21
1531.4Sbjh21Branch:		bjh21-hydra
1541.4Sbjh21Description:	Simtec Hydra support and ARM SMP in general
1551.4Sbjh21Status:		Active
1561.4Sbjh21Start Date:	18 Oct 2002
1571.4Sbjh21End Date:
1581.4Sbjh21Base Tag:	bjh21-hydra-base
1591.10SsaloMaintainer:	Ben Harris <bjh21@NetBSD.org>
1601.4Sbjh21Scope:		sys/arch/arm sys/arch/acorn32
1611.4Sbjh21Notes:		This code is on a branch because it involves changes to
1621.4Sbjh21		cpuswitch.S which would otherwise make merging the
1631.4Sbjh21		nathanw_sa branch difficult.  This branch is expected
1641.4Sbjh21		to be merged to the trunk shortly after nathanw_sa.
1651.1Slukem
1661.1SlukemBranch:		bouyer-scsipi
1671.1SlukemDescription:	Integration of atapi support
1681.1SlukemStatus:		Terminated
1691.1SlukemStart Date:
1701.1SlukemEnd Date:
1711.1SlukemBase Tag:
1721.10SsaloMaintainer:	Manuel Bouyer <bouyer@NetBSD.org>
1731.1SlukemScope:		kernel
1741.1SlukemNotes:		Superseded by thorpej_scsipi
1751.1Slukem
1761.1SlukemBranch:		chs-ubc
1771.1SlukemDescription:	? Unified Buffer Cache
1781.1SlukemStatus:		?
1791.1SlukemStart Date:
1801.1SlukemEnd Date:
1811.1SlukemBase Tag:	chs-ubc-base
1821.10SsaloMaintainer:	Chuck Silvers <chs@NetBSD.org>
1831.1SlukemScope:		kernel
1841.1SlukemNotes:
1851.1Slukem
1861.1SlukemBranch:		chs-ubc2
1871.1SlukemDescription:	? Unified Buffer Cache
1881.1SlukemStatus:		?
1891.1SlukemStart Date:
1901.1SlukemEnd Date:
1911.1SlukemBase Tag:	chs-ubc2-base, chs-ubc2-newbase
1921.10SsaloMaintainer:	Chuck Silvers <chs@NetBSD.org>
1931.1SlukemScope:		kernel
1941.1SlukemNotes:
1951.1Slukem
1961.1SlukemBranch:		cjs-build-against-obj-dir
1971.1SlukemDescription:	?
1981.1SlukemStatus:		?
1991.1SlukemStart Date:
2001.1SlukemEnd Date:
2011.1SlukemBase Tag:
2021.10SsaloMaintainer:	Curt Sampson <cjs@NetBSD.org>
2031.1SlukemScope:		Entire tree.
2041.1SlukemNotes:
2051.1Slukem
2061.1SlukemBranch:		eeh-paddr_t
2071.1SlukemDescription:	?
2081.1SlukemStatus:		?
2091.1SlukemStart Date:
2101.1SlukemEnd Date:
2111.1SlukemBase Tag:	eeh-paddr_t-base
2121.10SsaloMaintainer:	Eduardo Horvath <eeh@NetBSD.org>
2131.1SlukemScope:		kernel
2141.1SlukemNotes:
2151.1Slukem
2161.1SlukemBranch:		fvdl-softdep
2171.1SlukemDescription:	FFS soft dependencies
2181.1SlukemStatus:		?Terminated
2191.1SlukemStart Date:
2201.1SlukemEnd Date:
2211.1SlukemBase Tag:	fvdl-softdep-base
2221.10SsaloMaintainer:	Frank van der Linden <fvdl@NetBSD.org>
2231.1SlukemScope:		kernel
2241.1SlukemNotes:
2251.1Slukem
2261.1SlukemBranch:		gehenna-devsw
2271.1SlukemDescription:	auto-generation of devsw table
2281.1SlukemStatus:		Terminated
2291.1SlukemStart Date:	16 May 2002
2301.1SlukemEnd Date:	6 Sep 2002
2311.1SlukemBase Tag:	gehenna-devsw-base
2321.10SsaloMaintainer:	MAEKAWA Masahide <gehenna@NetBSD.org>
2331.1SlukemScope:		syssrc
2341.1SlukemNotes:		The goal is to get rid of the existing device switch tables in
2351.1Slukem		port-dependent conf.c and to generate them dynamically by
2361.1Slukem		config(8).
2371.8Sgmcgarry
2381.8SgmcgarryBranch:		gmcgarry_ctxsw
2391.8SgmcgarryDescription:	Separate scheduler from context-switch code
2401.8SgmcgarryStatus:		Active
2411.8SgmcgarryStart Date:	18 December 2002
2421.8SgmcgarryEnd Date:
2431.8SgmcgarryBase Tag:	gmcgarry_ctxsw_base
2441.10SsaloMaintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
2451.8SgmcgarryScope:		kernel
2461.8SgmcgarryNotes:		Removing knowledge of the schedular and its run queues
2471.8Sgmcgarry		from the machine-dependent context switch code is the
2481.8Sgmcgarry		first step in cleaning up the scheduler.  It is necessary
2491.8Sgmcgarry		for the newlock branch, making the scheduler SMP friendly,
2501.8Sgmcgarry		adding real-time scheduler extensions, and reducing the
2511.8Sgmcgarry		number of code paths for LWP and proc switching.
2521.8Sgmcgarry
2531.8SgmcgarryBranch:		gmcgarry_ucred
2541.8SgmcgarryDescription:	Integrate and encapsulate user credentials
2551.8SgmcgarryStatus:		Active
2561.8SgmcgarryStart Date:	18 December 2002
2571.8SgmcgarryEnd Date:
2581.8SgmcgarryBase Tag:	gmcgarry_ucred_base
2591.10SsaloMaintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
2601.8SgmcgarryScope:		kernel
2611.8SgmcgarryNotes:		merge pcred and ucred and poolify
2621.1Slukem
2631.1SlukemBranch:		is-newarp
2641.23SisDescription:	ARP for non-Ethernet
2651.23SisStatus:		Terminated; merged before NetBSD 1.3
2661.23SisStart Date:	1996/10/13
2671.23SisEnd Date:	1997/03/15
2681.1SlukemBase Tag:	is-newarp-base
2691.10SsaloMaintainer:	Ignatios Souvatzis <is@NetBSD.org>
2701.1SlukemScope:		kernel
2711.1SlukemNotes:
2721.1Slukem
2731.1Slukem
2741.1SlukemBranch:		kame
2751.1SlukemDescription:	KAME Project
2761.1SlukemStatus:		Dormant
2771.1SlukemStart Date:	28 Jun 1999
2781.1SlukemEnd Date:
2791.1SlukemBase Tag:
2801.10SsaloMaintainer:	Jun-ichiro itojun Hagino <itojun@NetBSD.org>
2811.1SlukemScope:		kernel
2821.1SlukemNotes:		http://www.kame.net
2831.1Slukem		Used for "reference" purposes for early part of KAME
2841.1Slukem		integration effort.  The branch is not actively used, as I
2851.1Slukem		(itojun) use patch(1) and diff(1) for the KAME syncs.
2861.1Slukem
2871.1SlukemBranch:		kenh-if-detach
2881.1SlukemDescription:	Interface detach support.
2891.1SlukemStatus:		?
2901.1SlukemStart Date:
2911.1SlukemEnd Date:
2921.1SlukemBase Tag:	kenh-if-detach-base
2931.10SsaloMaintainer:	Ken Hornstein <kenh@NetBSD.org>
2941.1SlukemScope:		kernel
2951.1SlukemNotes:
2961.1Slukem
2971.16SkentBranch:		kent-audio1
2981.16SkentDescription:	Audio converter pipeline
2991.18SkentStatus:		Terminated; merged to -current
3001.16SkentStart Date:	Tue Dec  7 2004
3011.17SkentEnd Date:	Tue Jan 11 2005
3021.17SkentBase Tag:	kent-audio1-base
3031.17SkentMaintainer:	TAMURA Kent <kent@NetBSD.org>
3041.17SkentScope:		kernel (audio device drivers)
3051.17SkentNotes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
3061.17Skent		Please consult with the maintainer before committing
3071.17Skent		to this branch.
3081.17Skent
3091.17SkentBranch:		kent-audio2
3101.17SkentDescription:	In-kernel audio mixer
3111.17SkentStatus:		Active
3121.17SkentStart Date:	Sun Jan 16 2005
3131.16SkentEnd Date:	
3141.17SkentBase Tag:	kent-audio2-base
3151.16SkentMaintainer:	TAMURA Kent <kent@NetBSD.org>
3161.16SkentScope:		kernel (audio device drivers)
3171.16SkentNotes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
3181.16Skent		Please consult with the maintainer before committing
3191.16Skent		to this branch.
3201.16Skent
3211.1SlukemBranch:		kqueue
3221.1SlukemDescription:	kqueue kernel event notification mechanism (from FreeBSD)
3231.5SjdolecekStatus:		Terminated; merged to -current
3241.1SlukemStart Date:	Tue Jul 10 23:08:38 EST 2001
3251.5SjdolecekEnd Date:	Tue Oct 24 09:14:14 GMT 2002
3261.1SlukemBase Tag:	kqueue-base
3271.1SlukemMaintainer:	Jaromir Dolecek <jdolecek@NetBSD.org>
3281.1SlukemScope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
3291.1SlukemNotes:		Integration of FreeBSD's kqueue(2) mechanism, with various
3301.1Slukem		local internal changes to better suit NetBSD, and
3311.1Slukem		enhancements such as looking up filters by name or
3321.1Slukem		number, and dynamic registration of "user" filters.
3331.1Slukem		The work is complete as is, but is awaiting more
3341.1Slukem		feedback from various kernel gurus before going mainline.
3351.11Sskrll
3361.11SskrllBranch:		ktrace-lwp
3371.11SskrllDescription:	ktrace support for lwp ids.
3381.11SskrllStatus:		Active
3391.11SskrllStart Date:	Wed Jul  2 15:27:30 UTC 2003
3401.11SskrllEnd Date:	
3411.11SskrllBase Tag:	ktrace-lwp-base
3421.12SgrantMaintainer:	Darren Reed <darrenr@NetBSD.org>
3431.11SskrllScope:		sys
3441.11SskrllNotes:		
3451.1Slukem
3461.1SlukemBranch:		marc-pcmcia
3471.1SlukemDescription:	PCMCIA support
3481.1SlukemStatus:		Terminated; merged to -current
3491.1SlukemStart Date:
3501.1SlukemEnd Date:
3511.1SlukemBase Tag:	marc-pcmcia-base, marc-pcmcia-bp
3521.10SsaloMaintainer:	Marc Horowitz <marc@NetBSD.org>
3531.1SlukemScope:		kernel
3541.1SlukemNotes:
3551.1Slukem
3561.1SlukemBranch:		minoura_x68k_bus_h
3571.1SlukemDescription:	bus_space(9) and bus_dma(9) implementation for x68k
3581.1SlukemStatus:		Terminated; merged to -current
3591.1SlukemStart Date:	23 Dec 1998
3601.1SlukemEnd Date:	16 Mar 1999
3611.1SlukemBase Tag:	minoura_x68k_bus_h-base
3621.10SsaloMaintainer:	Minoura Makoto <minoura@NetBSD.org>
3631.1SlukemScope:		sys/arch/x68k
3641.1SlukemNotes:
3651.1Slukem
3661.1SlukemBranch:		minoura-xpg4dl
3671.1SlukemDescription:	Citrus Project locale subsystem
3681.1SlukemStatus:		Terminated; (partly) merged to -current
3691.1SlukemStart Date:	28 March 2000
3701.1SlukemEnd Date:
3711.1SlukemBase Tag:	minoura-xpg4dl-base
3721.10SsaloMaintainer:	Minoura Makoto <minoura@NetBSD.org>
3731.1SlukemScope:		basesrc, syssrc, sharesrc
3741.1SlukemNotes:		Citrus Project is developing dynamically-loadable, codeset-
3751.1Slukem		independent locale subsystem.  Part of the implementation
3761.1Slukem		(LC_CTYPE) called XPG4DL is now integrated to -current.
3771.1Slukem
3781.1SlukemBranch:		mrg-vm-swap
3791.1SlukemDescription:	?
3801.1SlukemStatus:		?
3811.1SlukemStart Date:
3821.1SlukemEnd Date:
3831.1SlukemBase Tag:	?
3841.10SsaloMaintainer:	Matthew R. Green <mrg@NetBSD.org>
3851.1SlukemScope:		kernel
3861.1SlukemNotes:
3871.1Slukem
3881.1SlukemBranch:		nathanw_sa
3891.1SlukemDescription:	Scheduler activations
3901.1SlukemStatus:		Active
3911.1SlukemStart Date:	5 March 2001
3921.9SthorpejEnd Date:	18 January 2003
3931.1SlukemBase Tag:	nathanw_sa_base
3941.10SsaloMaintainer:	Nathan Williams <nathanw@NetBSD.org>
3951.1SlukemScope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
3961.1Slukem		bin/ps usr.bin/systat usr.bin/top usr.bin/w
3971.1Slukem		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
3981.1Slukem
3991.1SlukemNotes:		The idea of scheduler activations is described in the
4001.1Slukem		classic paper by Anderson et al., in ACM Transactions
4011.1Slukem		a on Computer Systems volume 10 issue 1 (1992),which
4021.1Slukem		can be found at
4031.1Slukem		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
4041.1Slukem		Many ideas in the implementation are based on the
4051.1Slukem		implementation of scheduler activations added to Mach
4061.1Slukem		3.0 and described by Davis et al. in the University of
4071.1Slukem		Washington CS tech report 92-08-93, which can be found
4081.1Slukem		at
4091.1Slukem		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
4101.1Slukem
4111.1Slukem		My USENIX paper on the subject can be found at
4121.1Slukem		http://web.mit.edu/nathanw/www/usenix/
4131.1Slukem
4141.1Slukem		Please consult with the maintainer before committing
4151.1Slukem		to this branch.
4161.1Slukem		Other tags starting with nathanw_sa reserved for
4171.1Slukem		branch management and are not guaranteed to be stable.
4181.9Sthorpej
4191.9Sthorpej		Trunk tagged with "nathanw_sa_before_merge" prior to
4201.9Sthorpej		merging branch down to trunk.  Branch tagged with
4211.9Sthorpej		"nathanw_sa_end" to indicate the ending revision of
4221.9Sthorpej		the branch.
4231.1Slukem
4241.1SlukemBranch:		newlock
4251.1SlukemDescription:	New locking primitives, based on Solaris's
4261.1SlukemStatus:		Active
4271.1SlukemStart Date:	March 9, 2002
4281.1SlukemEnd Date:
4291.1SlukemBase Tag:	newlock-base
4301.10SsaloMaintainer:	Jason R. Thorpe <thorpej@NetBSD.org>
4311.1SlukemScope:		Kernel
4321.1Slukem
4331.1SlukemNotes:		The goal is to replace the existing lockmgr() and
4341.1Slukem		simple_lock() based locking mechanisms with the
4351.1Slukem		primitives found in Solaris: mutexes and rwlocks.
4361.1Slukem
4371.1SlukemBranch:		perseant-lfsv2
4381.1SlukemDescription:	LFS incompatible on-disk data structure changes
4391.1SlukemStatus:		Terminated
4401.1SlukemStart Date:	27 June 2001
4411.1SlukemEnd Date:	16 July 2001
4421.1SlukemBase Tag:	perseant-lfsv2-base
4431.10SsaloMaintainer:	Konrad Schroder <perseant@NetBSD.org>
4441.1SlukemScope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
4451.1SlukemNotes:		This branch should be short-lived, I expect to merge as soon
4461.1Slukem		as the data structures required for unremove are in and tested.
4471.1Slukem
4481.1SlukemBranch:	  	pkgviews
4491.1SlukemDescription:  	package views, enabling multiple conflicting packages to co-exist
4501.1SlukemStatus:		Active
4511.1SlukemStart Date:	22 July 2002
4521.1SlukemEnd Date:
4531.1SlukemBase Tag:	pkgviews
4541.10SsaloMaintainer:	Alistair Crooks <agc@NetBSD.org>
4551.1SlukemScope:		pkgsrc, basesrc/usr.sbin/pkg_install
4561.1SlukemNotes:		A more flexible infrastructure for third-party packages by
4571.1Slukem		allowing multiple conflicting packages and versions to co-exist
4581.1Slukem		within the same tree
4591.1Slukem
4601.1SlukemBranch:		sommerfeld_i386mp_1
4611.1SlukemDescription:	Multiprocessor support for i386 using Intel MP BIOS.
4621.3SsommerfeStatus:		Terminated; merged to -current
4631.1SlukemStart Date:	21 Feb 2000
4641.2SfvdlEnd Date:	01 Oct 2002
4651.1SlukemBase Tag:	sommerfeld_i386mpbase_1
4661.10SsaloMaintainer:	Bill Sommerfeld <sommerfeld@NetBSD.org>
4671.1SlukemScope:		sys/arch/i386
4681.1SlukemNotes:
4691.1Slukem		Code committed to the branch has booted to multiuser 
4701.1Slukem		on at least one system.
4711.1Slukem
4721.1Slukem		Not guaranteed to compile against mainline since -current
4731.1Slukem		may have changed incompatibly with the last branch update;
4741.1Slukem		use "cvs update -D" to roll-back the rest of the tree to match.
4751.1Slukem
4761.1Slukem		Please get explicit permission from the maintainer 
4771.1Slukem		before each commit, or your changes will be backed out.
4781.1Slukem		Other tags starting with sommerfeld_ are private to 
4791.1Slukem		the developer and are guaranteed to be unstable.
4801.1Slukem		Only the maintainer should move tags.
4811.1Slukem
4821.1Slukem		Note that this branch uses a DIFFERENT scheme for 
4831.1Slukem		synching with the mainline.  the maintainer uses some private
4841.1Slukem		scripts for keeping them in synch; if you make commits 
4851.1Slukem		to the branch to "resynchronize" things, you'll
4861.1Slukem		probably do it wrong; instead, ask the maintainer to
4871.1Slukem		resynchronize things.
4881.1Slukem
4891.1Slukem		See sys/arch/i386/TODO on the branch for a list of known
4901.1Slukem		issues with the branch.
4911.1Slukem
4921.1SlukemBranch:		thorpej-devvp
4931.1SlukemDescription:	replace dev_t with struct vnode * in devsw entry points
4941.1SlukemStatus:		Active
4951.1SlukemStart Date:	Sep 6 2001
4961.1SlukemEnd Date:
4971.1SlukemBase Tag:	thorpej-devvp-base
4981.10SsaloMaintainer:	Jason Thorpe <thorpej@NetBSD.org>
4991.1SlukemScope:		syssrc
5001.1SlukemNotes:		Kernels built from this branch are not expected
5011.1Slukem		to function correctly at this time.
5021.1Slukem
5031.1Slukem		Ports known to compile on this branch:
5041.1Slukem			alpha
5051.1Slukem			i386
5061.1Slukem
5071.1SlukemBranch:		thorpej-mips-cache
5081.1SlukemDescription:	overhaul MIPS cache support code
5091.1SlukemStatus:		Terminated; merged to -current
5101.1SlukemStart Date:	Oct 23 2001
5111.1SlukemEnd Date:	Nov 14 2001
5121.1SlukemBase Tag:	thorpej-mips-cache-base
5131.1SlukemScope:		syssrc
5141.1SlukemNotes:		This branch needs more debugging, testing, and more
5151.1Slukem		ports need to be converted to the new world order.
5161.1Slukem
5171.1Slukem		The following processors have had cache ops
5181.1Slukem		written:
5191.1Slukem
5201.1Slukem			* R2000/R3000 (cache_r3k) -- light testing,
5211.1Slukem			  needs to be beat on a lot more to make
5221.1Slukem			  sure it's working.
5231.1Slukem
5241.10Ssalo			* R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org
5251.1Slukem			  tracked down a bug, which has been fixed.
5261.1Slukem
5271.1Slukem			  Confirmed working on R4000-with-L2.
5281.1Slukem
5291.1Slukem			  Confirmed working on R4400-no-L2 and
5301.1Slukem			  R4400-with-L2.
5311.1Slukem
5321.10Ssalo			* R4600/R5000 (cache_r5k) -- shin@NetBSD.org
5331.1Slukem			  has committed fixes to this code.
5341.1Slukem
5351.1Slukem			  Confirmed working on R4600 v2 (SGI IP-22 with
5361.1Slukem			  no SysAD L2 cache).
5371.1Slukem
5381.1Slukem			  Confirmed working on RM5260 (Algorithmics P-5064).
5391.1Slukem
5401.10Ssalo			* TX39 (cache_tx39) -- uch@NetBSD.org has
5411.1Slukem			  committed fixes to this code.  Awaiting
5421.1Slukem			  confirmation that it is working properly.
5431.1Slukem
5441.10Ssalo			* R5900 (cache_r5900) -- uch@NetBSD.org has
5451.1Slukem			  written this code and tested it on a
5461.1Slukem			  PlayStation 2.
5471.1Slukem
5481.1Slukem		The following ports have been updated to compile (and
5491.1Slukem		use optimized-for-processor bus_dma routines).  Those
5501.1Slukem		that have been tested and work are marked with [WORKING].
5511.1Slukem
5521.1Slukem			* algor		[WORKING]
5531.1Slukem
5541.1Slukem			* arc		[WORKING]
5551.1Slukem
5561.1Slukem			* pmax		[WORKING]
5571.1Slukem
5581.1Slukem			* playstation2	[WORKING]
5591.1Slukem					Needs optimized bus_dmamap_sync().
5601.1Slukem
5611.1Slukem			* hpcmips	[need verification that this is working]
5621.1Slukem					Needs optimized bus_dmamap_sync().
5631.1Slukem
5641.1Slukem			* sgimips	[WORKING]
5651.1Slukem					Needs optimized bus_dmamap_sync().
5661.1Slukem
5671.1Slukem			* cobalt	[need testing]
5681.1Slukem
5691.1Slukem			* mipsco	[need testing]
5701.1Slukem
5711.1Slukem			* newsmips	[need testing]
5721.1Slukem
5731.1SlukemBranch:		thorpej_scsipi
5741.1SlukemDescription:	SCSI/ATAPI midlayer rewrite.
5751.1SlukemStatus:		Terminated; merged to -current
5761.1SlukemStart Date:
5771.1SlukemEnd Date:	Apr 25 2001
5781.1SlukemBase Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
5791.10SsaloMaintainer:	Manuel Bouyer <bouyer@NetBSD.org>,
5801.10Ssalo		Jason Thorpe <thorpej@NetBSD.org>
5811.1SlukemScope:		syssrc
5821.1SlukemNotes:		When a change from -current is pulled up please move the
5831.1Slukem		thorpej_scsipi_base tag to the revision you're syncing with.
5841.1Slukem		thorpej_scsipi_nbase is private to maintainer (only
5851.1Slukem		used when syncing the whole branch with HEAD).
5861.1Slukem		Just before the merge, syssrc has been tagged with
5871.1Slukem		thorpej_scsipi_beforemerge
5881.1Slukem
5891.1SlukemBranch:		thorpej-signal
5901.1SlukemDescription:	?
5911.1SlukemStatus:		?
5921.1SlukemStart Date:
5931.1SlukemEnd Date:
5941.1SlukemBase Tag:	thorpej-signal-base
5951.10SsaloMaintainer:	Jason Thorpe <thorpej@NetBSD.org>
5961.1SlukemScope:		kernel
5971.1SlukemNotes:
5981.1Slukem
5991.1SlukemBranch:		thorpej-setroot
6001.1SlukemDescription:	?
6011.1SlukemStatus:		Terminated; merged to -current
6021.1SlukemStart Date:
6031.1SlukemEnd Date:
6041.1SlukemBase Tag:
6051.10SsaloMaintainer:	Jason Thorpe <thorpej@NetBSD.org>
6061.1SlukemScope:		kernel
6071.1SlukemNotes:
6081.1Slukem
6091.27SmattBranch:		matt-timespec
6101.27SmattDescription:	Convert the kernel to struct timespec as its primary time
6111.27Smatt		storage mechanism.
6121.27SmattStatus:		Active
6131.27SmattStart Date:	2005-02-19
6141.27SmattEnd Date:
6151.27SmattBase Tag:	
6161.27SmattMaintainer:	Matt Thomas <matt@NetBSD.org>
6171.27SmattScope:		kernel
6181.27SmattNotes:	
6191.1Slukem
6201.1SlukemBranch:		wrstuden-devbsize
6211.1SlukemDescription:	Modify buffer cache to deal with different devices having
6221.1Slukem		different block sizes. Also DEV_BSIZE would go away.
6231.1SlukemStatus:		Terminated
6241.1SlukemStart Date:	Aug or Sept 1999
6251.1SlukemEnd Date:	1 Apr 2000
6261.1SlukemBase tag:	wrstuden-devbsize-base
6271.10SsaloMaintainer:	Bill Studenmund <wrstuden@NetBSD.org>
6281.1SlukemScope:		kernel
6291.1SlukemNotes:		No longer active due to lack of time, and introduction
6301.1Slukem		of UBC. In terms of UBC, the primary cache for
6311.1Slukem		file data is the VM cache, which needs to operate
6321.1Slukem		in terms of VM pages. As no existing device has native
6331.1Slukem		pages the same size as our VM pages, there already is
6341.1Slukem		a mapping going on between the VM system and the
6351.1Slukem		underlying blocks. So it would be easier and cleaner
6361.1Slukem		to adjust that to deal w/ different block sizes.
6371.1Slukem		Also with UBC, all i/o is in terms of bytes at an offset
6381.1Slukem		with a certain length, so the exact block size isn't a big
6391.1Slukem		deal.
6401.1Slukem
6411.1Slukem		Any other wrstuden-devbsize tag may (and should) go away.
6421.1Slukem
6431.1Slukem
6441.14SrtrBranch:		rtr-xorg-branch
6451.14SrtrDescription:	xorg & static build alterations to src/x11
6461.14SrtrStatus:		Active
6471.14SrtrStart Date:	Nov 15 2004
6481.14SrtrEnd Date:	
6491.14SrtrBase tag:	rtr-xorg-branch-base
6501.14SrtrMaintainer:	Tyler R. Retzlaff <rtr@NetBSD.org>
6511.14SrtrScope:		x11
6521.14Srtr		distrib/sets/lists
6531.14Srtr		share/mk/bsd.x11.mk
6541.15Srtr		share/mk/bsd.own.mk
6551.14Srtr		etc/mtree/NetBSD.dist
6561.14SrtrNotes:		Requires parts of xsrc/xfree (HEAD)
6571.14Srtr		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
6581.14Srtr		Requires xorg (XORG-6_8_1)
6591.14Srtr
6601.1Slukem
6611.25SyamtBranch:		yamt-km, yamt-km-doc
6621.19SyamtDescription:	simplify/improve kernel memory management and bootstrap
6631.19SyamtStatus:		Active
6641.19SyamtStart Date:	Tue Jan 25 2005
6651.19SyamtEnd Date:	
6661.25SyamtBase Tag:	yamt-km-base{,2}, yamt-km-doc-base
6671.19SyamtMaintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
6681.25SyamtScope:		yamt-km: src/sys
6691.25Syamt		yamt-km-doc: src/share/man/man9/uvm.9
6701.19SyamtNotes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
6711.19Syamt
6721.24Syamt		the followings are per-port status.
6731.24Syamt		(account names mean "tested by".)
6741.24Syamt
6751.20Syamt		works enough to go to multiuser:
6761.24Syamt			alpha, i386 (yamt@)
6771.24Syamt			pc532 (simonb@)
6781.28Syamt			alpha, i386, mac68k, macppc, pmax, shark,
6791.29Stsutsui			    sparc, sparc64 (chs@)
6801.31Syamt			cobalt, dreamcast, hp300, news68k (tsutsui@)
6811.31Syamt			amiga (mhitch@)
6821.28Syamt
6831.28Syamt		known to have the same problem as trunk:
6841.28Syamt			vax (chs@, stuck while running kvm_mkdb)
6851.24Syamt
6861.24Syamt		known to have a problem:
6871.28Syamt			hp300 (chs@, hang immediately after loading kernel)
6881.20Syamt
6891.20Syamt		buildable:
6901.20Syamt			src/sys/arch/acorn26/conf/GENERIC
6911.20Syamt			src/sys/arch/acorn32/conf/GENERIC
6921.20Syamt			src/sys/arch/algor/conf/P6032
6931.20Syamt			src/sys/arch/alpha/conf/GENERIC
6941.20Syamt			src/sys/arch/alpha/conf/GENERIC.MP
6951.20Syamt			src/sys/arch/amd64/conf/GENERIC
6961.20Syamt			src/sys/arch/amd64/conf/GENERIC.MP
6971.20Syamt			src/sys/arch/amiga/conf/GENERIC
6981.20Syamt			src/sys/arch/arc/conf/GENERIC
6991.20Syamt			src/sys/arch/atari/conf/MILAN-PCIIDE
7001.20Syamt			src/sys/arch/bebox/conf/GENERIC
7011.20Syamt			src/sys/arch/cats/conf/GENERIC
7021.20Syamt			src/sys/arch/cesfic/conf/GENERIC
7031.20Syamt			src/sys/arch/cobalt/conf/GENERIC
7041.20Syamt			src/sys/arch/dreamcast/conf/GENERIC
7051.20Syamt			src/sys/arch/evbarm/conf/TS7200
7061.20Syamt			src/sys/arch/evbppc/conf/WALNUT
7071.20Syamt			src/sys/arch/evbsh3/conf/COMPUTEXEVB
7081.26Syamt			(with a patch in port-evbsh3/29334)
7091.20Syamt			src/sys/arch/evbsh5/conf/CAYMAN64
7101.20Syamt			src/sys/arch/hp300/conf/GENERIC
7111.20Syamt			src/sys/arch/hp700/conf/GENERIC
7121.20Syamt			src/sys/arch/hpcarm/conf/JORNADA728
7131.20Syamt			src/sys/arch/hpcmips/conf/GENERIC
7141.20Syamt			src/sys/arch/hpcsh/conf/GENERIC
7151.20Syamt			src/sys/arch/hpcsh/conf/HPW650PA
7161.20Syamt			src/sys/arch/i386/conf/GENERIC
7171.20Syamt			src/sys/arch/i386/conf/GENERIC.MP
7181.20Syamt			src/sys/arch/ibmnws/conf/GENERIC
7191.20Syamt			src/sys/arch/iyonix/conf/GENERIC
7201.20Syamt			src/sys/arch/luna68k/conf/GENERIC
7211.20Syamt			src/sys/arch/mac68k/conf/GENERIC
7221.20Syamt			src/sys/arch/macppc/conf/GENERIC
7231.20Syamt			src/sys/arch/macppc/conf/GENERIC.MP
7241.20Syamt			src/sys/arch/mipsco/conf/GENERIC
7251.20Syamt			src/sys/arch/mvme68k/conf/GENERIC
7261.20Syamt			src/sys/arch/netwinder/conf/GENERIC
7271.20Syamt			src/sys/arch/news68k/conf/GENERIC
7281.20Syamt			src/sys/arch/newsmips/conf/GENERIC
7291.20Syamt			src/sys/arch/next68k/conf/GENERIC
7301.20Syamt			src/sys/arch/ofppc/conf/GENERIC
7311.20Syamt			src/sys/arch/pc532/conf/GENERIC
7321.20Syamt			src/sys/arch/pmax/conf/GENERIC
7331.20Syamt			src/sys/arch/prep/conf/GENERIC
7341.20Syamt			src/sys/arch/sandpoint/conf/GENERIC
7351.20Syamt			src/sys/arch/sbmips/conf/GENERIC
7361.20Syamt			src/sys/arch/sgimips/conf/GENERIC32_IP3x
7371.20Syamt			src/sys/arch/shark/conf/GENERIC
7381.20Syamt			src/sys/arch/sparc/conf/GENERIC
7391.20Syamt			src/sys/arch/sparc/conf/GENERIC.MP
7401.20Syamt			src/sys/arch/sparc64/conf/GENERIC
7411.20Syamt			src/sys/arch/sparc64/conf/GENERIC.MP
7421.20Syamt			src/sys/arch/sun2/conf/GENERIC
7431.20Syamt			src/sys/arch/sun3/conf/GENERIC
7441.20Syamt			src/sys/arch/vax/conf/GENERIC
7451.20Syamt			src/sys/arch/vax/conf/GENERIC.MP
7461.20Syamt			src/sys/arch/x68k/conf/GENERIC
7471.20Syamt			src/sys/arch/xen/conf/GENERIC
7481.20Syamt
7491.21Syamt		not tested at all:
7501.22Syamt			mmeye
7511.21Syamt			pdp10
7521.21Syamt			playstation2
7531.21Syamt
7541.19Syamt
7551.30StronBranch:		bouyer-xen2
7561.30StronDescription:	update xen port to xen 2.0, with support for domain0 operations
7571.30StronStatus:		Active
7581.30StronStart Date:	Dec 13 2004
7591.30StronEnd Date:
7601.30StronBase Tag:	netbsd-2-base
7611.30StronMaintainer:	Manuel Bouyer <bouyer@NetBSD.org>
7621.30StronScope:		src/sys/arch/xen
7631.30StronNotes:
7641.30Stron
7651.1Slukem# Other:
7661.1Slukem
7671.1SlukemBranch:		magnum
7681.1SlukemDescription:	?
7691.1SlukemStatus:		?
7701.1SlukemStart Date:
7711.1SlukemEnd Date:
7721.1SlukemBase Tag:	magnum-base
7731.1SlukemMaintainer:	?
7741.1SlukemScope:		kernel
7751.1SlukemNotes:
776