BRANCHES revision 1.135
1#	$NetBSD: BRANCHES,v 1.135 2006/11/18 20:45:16 rpaulo Exp $
2#
3# This file contains a list of branches that exist in the NetBSD CVS
4# tree and their current state.
5#
6# This list is necessarily incomplete.
7# 
8# Within reason, developers may create branch and version tags at any
9# time for any purpose.  To avoid name collisions, private tags should
10# have names which begin with the developer's NetBSD login name
11# followed by a - or _ character (e.g., thorpej_scsipi,
12# thorpej-signal)
13# 
14# Any branch or version tag not listed here should be assumed to be
15# private to the developer who created it.  It is inappropriate for
16# anyone other than that developer to commit, move tags, or otherwise
17# modify the contents of the branch.
18#
19# Please update this file when a new branch is ready for consumption
20# by folks other than the maintainer, or when the use or status of an
21# existing branch changes significantly.
22#
23# Format:
24#   Branch:	  name of branch
25#   Description:  Purpose and intention of the branch
26#   Status:	  Active/Terminated/Dormant
27#   Start Date:	  date first instantiated
28#   End Date:	  date it was Terminated/made_Dormant, if any
29#   Base Tag:	  netbsd-1-5-base, etc.
30#   Maintainer:	  Somebody to blame.
31#   Scope:	  Portion of the tree covered.
32#   Notes:	  Various other info, perhaps explanation of special tags,
33#		  who-may-commit policies, etc.
34#
35# There are four sections to this file:
36#   Release branches
37#   Individual developers' branches (Active/Dormant)
38#   Individual developers' branches (Terminated), and
39#   other
40#
41# Entries within each section should be alphabetized.
42#
43
44
45# Release branches:
46
47Branch:		comdex-fall-1999
48Description:	Special release branch for pre-1.5 release at
49		Fall 1999 COMDEX.
50Status:		Terminated
51Start Date:
52End Date:
53Base Tag:	comdex-fall-1999-base
54Maintainer:	?
55Scope:		Entire tree.
56Notes:
57
58Branch:		netbsd-0-9
59Description:	The NetBSD 0.9 release branch
60Status:		Terminated
61Start Date:
62End Date:
63Base Tag:	netbsd-0-9-base
64Maintainer:	Release Engineering <releng@NetBSD.org>
65Scope:		Entire tree.
66Notes:		Subsidiary tags of: netbsd-0-9-ALPHA, netbsd-0-9-ALPHA2,
67		netbsd-0-9-BETA, netbsd-0-9-RELEASE.
68		Commits restricted to release engineering.
69
70Branch:		netbsd-1-0
71Description:	The NetBSD 1.0 release branch
72Status:		Terminated
73Start Date:
74End Date:
75Base Tag:	netbsd-1-0-base
76Maintainer:	Release Engineering <releng@NetBSD.org>
77Scope:		Entire tree.
78Notes:
79		Commits restricted to release engineering.
80
81Branch:		netbsd-1-1
82Description:	The NetBSD 1.1 release branch
83Status:		Terminated
84Start Date:
85End Date:
86Base Tag:	netbsd-1-1-base
87Maintainer:	Release Engineering <releng@NetBSD.org>
88Scope:		Entire tree.
89Notes:
90		Commits restricted to release engineering.
91
92Branch:		netbsd-1-2
93Description:	The NetBSD 1.2 release branch
94Status:		Terminated
95Start Date:
96End Date:
97Base Tag:	netbsd-1-2-base
98Maintainer:	Release Engineering <releng@NetBSD.org>
99Scope:		Entire tree.
100Notes:
101		Commits restricted to release engineering.
102
103Branch:		netbsd-1-3
104Description:	The NetBSD 1.3 release branch
105Status:		Terminated
106Start Date:
107End Date:
108Base Tag:	netbsd-1-3-base
109Maintainer:	Release Engineering <releng@NetBSD.org>
110Scope:		Entire tree.
111Notes:
112		Commits restricted to release engineering.
113
114Branch:		netbsd-1-4
115Description:	The NetBSD 1.4 release branch
116Status:		Terminated
117Start Date:	1 Apr 2000
118End Date:
119Base Tag:	netbsd-1-4-base
120Maintainer:	1.4 Release Engineering <releng-1-4@NetBSD.org>
121Scope:		Entire tree.
122Notes:
123		Commits restricted to release engineering.
124
125Branch:		netbsd-1-5
126Description:	The NetBSD 1.5 release branch
127Status:		Terminated
128Start Date:	20 Jun 2000
129End Date:	26 Jan 2005
130Base Tag:	netbsd-1-5-base
131Maintainer:	1.5 Release Engineering <releng-1-5@NetBSD.org>
132Scope:		Entire tree.
133Notes:
134		Commits restricted to release engineering.
135
136Branch:		netbsd-1-6
137Description:	The NetBSD 1.6 release branch
138Status:		Terminated
139Start Date:	22 May 2002
140End Date:
141Base Tag:	netbsd-1-6-base
142Maintainer:	1.6 Release Engineering <releng-1-6@NetBSD.org>
143Scope:		Entire tree.
144Notes:
145		Commits restricted to Release Engineering.
146
147Branch:		netbsd-2
148Description:    The NetBSD 2 release branch
149Status:		Active
150Start Date:	23 Dec 2004
151End Date:
152Base Tag:	netbsd-2-base
153Maintainer:	2 Release Engineering <releng-2@NetBSD.org>
154Scope:		Entire tree. (src + xsrc)
155Notes:
156		Commits restricted to Release Engineering.
157
158Branch:		netbsd-2-0
159Description:	Originally the NetBSD 2.0 release branch and now the branch 
160		tracking security/critical fixes for the NetBSD 2.0 series
161Status:		Active
162Start Date:	28 Mar 2004 and changed for security/critical function on
163       		23 Dec 2004
164End Date:
165Base Tag:	netbsd-2-0-base
166Maintainer:	2.0 Release Engineering <releng-2-0@NetBSD.org>
167Scope:		Entire tree. (src + xsrc)
168Notes:		Branch was re-purposed to security/critical change function
169		once 2.0 released. See netbsd-2 for current branch to track
170		NetBSD 2 tree.
171		Commits restricted to Release Engineering.
172
173Branch:		netbsd-2-1
174Description:	Tracking security/critical fixes for NetBSD 2.1
175Status:		Active
176Start Date:     26 Oct 2005 
177End Date:
178Base Tag:	netbsd-2-1-RELEASE
179Maintainer:	2 Release Engineering <releng-2@NetBSD.org>
180Scope:		Entire tree. (src + xsrc)
181Notes:		Branch contains only security/critical fixes to
182		NetBSD 2.1.  For new features, use netbsd-2 branch.
183		Commits restricted to Release Engineering.
184
185Branch:		netbsd-3
186Description:	The NetBSD 3 release branch
187Status:		Active
188Start Date:	16 Mar 2005
189End Date:
190Base Tag:	netbsd-3-base
191Maintainer:	3 Release Engineering <releng-3@NetBSD.org>
192Scope:		Entire tree. (src + xsrc)
193Notes:
194		Commits restricted to Release Engineering.
195
196Branch:		netbsd-4
197Description:	The NetBSD 4 release branch
198Status:		Active
199Start Date:	8 Aug 2006
200End Date:
201Base Tag:	netbsd-4-base
202Maintainer:	4 Release Engineering <releng-4@NetBSD.org>
203Scope:		Entire tree. (src + xsrc)
204Notes:
205		Commits restricted to Release Engineering.
206
207########################################################################
208# Individual developers' branches (Active/Dormant):
209########################################################################
210
211Branch:		bjh21-hydra
212Description:	Simtec Hydra support and ARM SMP in general
213Status:		Dormant
214Start Date:	18 Oct 2002
215End Date:
216Base Tag:	bjh21-hydra-base
217Maintainer:	Ben Harris <bjh21@NetBSD.org>
218Scope:		sys/arch/arm sys/arch/acorn32
219Notes:		This code was on a branch because it involves changes to
220		cpuswitch.S which would otherwise make merging the
221		nathanw_sa branch difficult.
222
223Branch:		gmcgarry_ctxsw
224Description:	Separate scheduler from context-switch code
225Status:		Dormant
226Start Date:	18 December 2002
227End Date:
228Base Tag:	gmcgarry_ctxsw_base
229Maintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
230Scope:		kernel
231Notes:		Removing knowledge of the schedular and its run queues
232		from the machine-dependent context switch code is the
233		first step in cleaning up the scheduler.  It is necessary
234		for the newlock branch, making the scheduler SMP friendly,
235		adding real-time scheduler extensions, and reducing the
236		number of code paths for LWP and proc switching.
237
238Branch:		gmcgarry_ucred
239Description:	Integrate and encapsulate user credentials
240Status:		Dormant
241Start Date:	18 December 2002
242End Date:
243Base Tag:	gmcgarry_ucred_base
244Maintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
245Scope:		kernel
246Notes:		merge pcred and ucred and poolify
247
248Branch:		kame
249Description:	KAME Project
250Status:		Dormant
251Start Date:	28 Jun 1999
252End Date:
253Base Tag:
254Maintainer:	Jun-ichiro itojun Hagino <itojun@NetBSD.org>
255Scope:		kernel
256Notes:		http://www.kame.net
257		Used for "reference" purposes for early part of KAME
258		integration effort.  The branch is not actively used, as I
259		(itojun) use patch(1) and diff(1) for the KAME syncs.
260
261Branch:		kent-audio2
262Description:	In-kernel audio mixer
263Status:		Active
264Start Date:	Sun Jan 16 2005
265End Date:	
266Base Tag:	kent-audio2-base
267Maintainer:	TAMURA Kent <kent@NetBSD.org>
268Scope:		kernel (audio device drivers)
269Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
270		Please consult with the maintainer before committing
271		to this branch.
272		This branch is not expected to be compilable yet.
273
274Branch:		matt-timespec
275Description:	Convert the kernel to struct timespec as its primary time
276		storage mechanism.
277Status:		Active
278Start Date:	2005-02-19
279End Date:
280Base Tag:	
281Maintainer:	Matt Thomas <matt@NetBSD.org>
282Scope:		kernel
283Notes:	
284
285Branch:		newlock
286Description:	New locking primitives, based on Solaris's
287Status:		Dormant
288Start Date:	March 9, 2002
289End Date:
290Base Tag:	newlock-base
291Maintainer:	Jason R. Thorpe <thorpej@NetBSD.org>
292Scope:		Kernel
293Notes:		The goal is to replace the existing lockmgr() and
294		simple_lock() based locking mechanisms with the
295		primitives found in Solaris: mutexes and rwlocks.
296
297Branch:		newlock2
298Description:	New locking primitives, based on Solaris's
299Status:		Active
300Start Date:	September 9, 2006
301End Date:
302Base Tag:	newlock2-base
303Maintainer:	Andrew Doran <ad@NetBSD.org>
304Scope:		Kernel
305Notes:		As per the newlock branch, however given the amount of time
306		the original branch has lain dormant, a new one has been
307		created. Goals:
308		- Implement new locking primitives on most-used ports.
309		- Minor locking improvements.
310		- Remove spinlockmgr().
311
312Branch:	  	pkgviews
313Description:  	package views, enabling multiple conflicting packages to co-exist
314Status:		Active
315Start Date:	22 July 2002
316End Date:
317Base Tag:	pkgviews
318Maintainer:	Alistair Crooks <agc@NetBSD.org>
319Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
320Notes:		A more flexible infrastructure for third-party packages by
321		allowing multiple conflicting packages and versions to co-exist
322		within the same tree
323
324Branch:		rpaulo-netinet-merge-pcb
325Description:	merge in6pcb with inpcb
326Status:		Dormant
327Start Date:	Wed Feb 01 2006
328End Date:	
329Base Tag:	rpaulo-netinet-merge-pcb-base
330Maintainer:	Rui Paulo <rpaulo@NetBSD.org>
331Scope:		src/sys
332Notes:		No longer active due to the lack of time. If you plan to
333		continue this branch, sys/netinet/in_pcb.h already contains
334		the proposed structure layout (which was roughly discussed
335		in the tech-net mailing list).
336		I also defined INP_*() macros to mimicate FreeBSD's inpcb
337		locking style, but currently they do nothing and are not
338		yet called at the correct places (needs discussion about
339		kernel fine-grained locking).
340		To continue this branch, one needs to read all the relevant
341		inpcb/in6pcb source files and change the function names,
342		structure names, structure fileds according to the new
343		layout (in6pcb is gone).
344		Don't try to build a kernel from this branch because it won't
345		work. The missing pieces required to do a complete build
346		were not committed because they were incomplete and generated
347		panics.
348		You shouldn't need to worry about KAME syncs because
349		they did most of them by now.
350		After the work is done, you are required to test the branch
351		(before the merge to -current) with an interop IPv6 test.
352		More info at: http://www.tahi.org/
353
354Branch:		rtr-xorg-branch
355Description:	xorg & static build alterations to src/x11
356Status:		Active
357Start Date:	Nov 15 2004
358End Date:	
359Base tag:	rtr-xorg-branch-base
360Maintainer:	Tyler R. Retzlaff <rtr@NetBSD.org>
361Scope:		x11
362		distrib/sets/lists
363		share/mk/bsd.x11.mk
364		share/mk/bsd.own.mk
365		etc/mtree/NetBSD.dist
366Notes:		Requires parts of xsrc/xfree (HEAD)
367		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
368		Requires xorg (XORG-6_8_1)
369
370Branch:		thorpej-devvp
371Description:	replace dev_t with struct vnode * in devsw entry points
372Status:		Active
373Start Date:	Sep 6 2001
374End Date:
375Base Tag:	thorpej-devvp-base
376Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
377Scope:		syssrc
378Notes:		Kernels built from this branch are not expected
379		to function correctly at this time.
380
381		Ports known to compile on this branch:
382			alpha
383			i386
384
385Branch:		yamt-lazymbuf
386Description:	implement and evaluate lazy mapping of mbuf external data pages
387		it's intended as the first step of larger changes.
388			1. support operations (esp. bus_dma load) on
389			   unmapped mbuf.
390			2. unify mbuf and buf.
391			   (or, at least some parts of them)
392			3. then it should be trivial to implement
393			   i/o coalescing, etc.
394Status:		Active
395Start Date:	Wed Jul  6 2005
396End Date:	
397Base Tag:	yamt-lazymbuf-base2
398Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
399Scope:		src/sys
400Notes:		
401
402Branch:		yamt-splraiseipl
403Description:	finish implementing splraiseipl (and makeiplcookie).
404		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
405Status:		Active
406Start Date:	Mon Sep 18 2006
407End Date:	
408Base Tag:	yamt-splraiseipl-base2
409Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
410Scope:		src/sys  (src/common is tagged but not branched)
411Notes:		
412		tested (by who):
413			alpha		(yamt)
414			ews4800mips	(tsutsui)
415			hp300		(tsutsui)
416			i386		(yamt)
417			macppc		(tsutsui)
418			news68k		(tsutsui)
419			sparc(sun4c)	(tsutsui)
420			sun2		(tsutsui)
421			sun3		(tsutsui)
422			sun3x		(tsutsui)
423			xen		(yamt)
424
425		compile-tested:
426			acorn26
427			acorn32
428			algor
429			amd64
430			amiga
431			arc
432			atari
433			cats
434			cesfic
435			cobalt
436			evbarm
437			evbmips
438			evbppc(marvell)
439			evbppc(ibm4xx)
440			evbsh3
441			hp700
442			hpcarm
443			hpcmips
444			hpcsh
445			ia64
446			ibmnws
447			iyonix
448			landisk
449			luna68k
450			mac68k
451			netwinder
452			newsmips
453			next68k
454			pc532
455			pmax
456			prep
457			sandpoint
458			sbmips
459			sgimips
460			shark
461			sparc
462			sparc64(GENERIC)
463			vax
464			x68k
465
466		not tested:
467			pdp10 (i don't know how to build)
468			sparc64 (GENERIC.MP seems to have an unrelated problem)
469
470		notyet:
471			amigappc
472			bebox
473			dreamcast
474			mipsco
475			mmeye
476			mvme68k
477			mvmeppc
478			ofppc
479			playstation2
480			pmppc
481			sh5
482
483
484########################################################################
485# Individual developers' branches (Terminated):
486########################################################################
487
488Branch:		bouyer-scsipi
489Description:	Integration of atapi support
490Status:		Terminated
491Start Date:
492End Date:
493Base Tag:
494Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
495Scope:		kernel
496Notes:		Superseded by thorpej_scsipi
497
498Branch:		bouyer-xen2
499Description:	update xen port to xen 2.0, with support for domain0 operations
500Status:		Terminated
501Start Date:	Dec 13 2004
502End Date:	Mar 10 2005
503Base Tag:	netbsd-2-base
504Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
505Scope:		src/sys/arch/xen
506Notes:
507
508Branch: 	chap-midi
509Description:	Renovation of MIDI support
510Status: 	Terminated; merged to -current
511Start Date:	19 May 2006
512End Date:	30 Jun 2006
513Base Tag:	chap-midi-base
514Maintainer:	Chapman Flack <chap@NetBSD.org>
515Scope:		sys, share/man, usr.bin
516Notes:
517
518Branch:		chs-ubc
519Description:	Unified Buffer Cache
520Status:		Terminated
521Start Date:
522End Date:
523Base Tag:	chs-ubc-base
524Maintainer:	Chuck Silvers <chs@NetBSD.org>
525Scope:		kernel
526Notes:
527
528Branch:		chs-ubc2
529Description:	 Unified Buffer Cache
530Status:		Terminated; merged to -current
531Start Date:
532End Date:
533Base Tag:	chs-ubc2-base, chs-ubc2-newbase
534Maintainer:	Chuck Silvers <chs@NetBSD.org>
535Scope:		kernel
536Notes:
537
538Branch:		cjs-build-against-obj-dir
539Description:	?
540Status:		?
541Start Date:
542End Date:
543Base Tag:
544Maintainer:	Curt Sampson <cjs@NetBSD.org>
545Scope:		Entire tree.
546Notes:
547
548Branch:		eeh-paddr_t
549Description:	use separate types for virtual vs. physical addresses
550Status:		Terminated; merged to -current
551Start Date:
552End Date:
553Base Tag:	eeh-paddr_t-base
554Maintainer:	Eduardo Horvath <eeh@NetBSD.org>
555Scope:		kernel
556Notes:		This is needed to support 32-bit kernels on sparc64.
557
558Branch:		elad-kernelauth
559Description:	Native NetBSD implementation of Apple's kernel authorization
560		based on TN2127. This is a "clean-room" implementation to
561		avoid any licensing issues.
562Status:		Terminated; merged to -current
563Start Date:	Tue Mar	 7 2006
564End Date:	Mon May 15 2006
565Base Tag:	elad-kernelauth-base
566Maintainer:	Elad Efrat <elad@NetBSD.org>
567Scope:		src/sys, src/share/man/man9/Makefile,
568		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
569Notes:
570
571Branch:		fvdl-softdep
572Description:	FFS soft dependencies
573Status:		Terminated; merged to -current
574Start Date:
575End Date:
576Base Tag:	fvdl-softdep-base
577Maintainer:	Frank van der Linden <fvdl@NetBSD.org>
578Scope:		kernel
579Notes:
580
581Branch:		gehenna-devsw
582Description:	auto-generation of devsw table
583Status:		Terminated
584Start Date:	16 May 2002
585End Date:	6 Sep 2002
586Base Tag:	gehenna-devsw-base
587Maintainer:	MAEKAWA Masahide <gehenna@NetBSD.org>
588Scope:		syssrc
589Notes:		The goal is to get rid of the existing device switch tables in
590		port-dependent conf.c and to generate them dynamically by
591		config(8).
592
593Branch:		is-newarp
594Description:	ARP for non-Ethernet
595Status:		Terminated; merged before NetBSD 1.3
596Start Date:	1996/10/13
597End Date:	1997/03/15
598Base Tag:	is-newarp-base
599Maintainer:	Ignatios Souvatzis <is@NetBSD.org>
600Scope:		kernel
601Notes:
602
603Branch:		kenh-if-detach
604Description:	Interface detach support.
605Status:		?
606Start Date:
607End Date:
608Base Tag:	kenh-if-detach-base
609Maintainer:	Ken Hornstein <kenh@NetBSD.org>
610Scope:		kernel
611Notes:
612
613Branch:		kent-audio1
614Description:	Audio converter pipeline
615Status:		Terminated; merged to -current
616Start Date:	Tue Dec  7 2004
617End Date:	Tue Jan 11 2005
618Base Tag:	kent-audio1-base
619Maintainer:	TAMURA Kent <kent@NetBSD.org>
620Scope:		kernel (audio device drivers)
621Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
622		Please consult with the maintainer before committing
623		to this branch.
624
625Branch:		kqueue
626Description:	kqueue kernel event notification mechanism (from FreeBSD)
627Status:		Terminated; merged to -current
628Start Date:	Tue Jul 10 23:08:38 EST 2001
629End Date:	Tue Oct 24 09:14:14 GMT 2002
630Base Tag:	kqueue-base
631Maintainer:	Jaromir Dolecek <jdolecek@NetBSD.org>
632Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
633Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
634		local internal changes to better suit NetBSD, and
635		enhancements such as looking up filters by name or
636		number, and dynamic registration of "user" filters.
637		The work is complete as is, but is awaiting more
638		feedback from various kernel gurus before going mainline.
639
640Branch:		ktrace-lwp
641Description:	ktrace support for lwp ids.
642Status:		Terminated; merged to -current
643Start Date:	Wed Jul  2 15:27:30 UTC 2003
644End Date:	Sun Dec 11 12:25:29 UTC 2005
645Base Tag:	ktrace-lwp-base
646Maintainer:	Darren Reed <darrenr@NetBSD.org>
647Scope:		sys
648Notes:		
649
650Branch:		marc-pcmcia
651Description:	PCMCIA support
652Status:		Terminated; merged to -current
653Start Date:
654End Date:
655Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
656Maintainer:	Marc Horowitz <marc@NetBSD.org>
657Scope:		kernel
658Notes:
659
660Branch:		minoura_x68k_bus_h
661Description:	bus_space(9) and bus_dma(9) implementation for x68k
662Status:		Terminated; merged to -current
663Start Date:	23 Dec 1998
664End Date:	16 Mar 1999
665Base Tag:	minoura_x68k_bus_h-base
666Maintainer:	Minoura Makoto <minoura@NetBSD.org>
667Scope:		sys/arch/x68k
668Notes:
669
670Branch:		minoura-xpg4dl
671Description:	Citrus Project locale subsystem
672Status:		Terminated; (partly) merged to -current
673Start Date:	28 March 2000
674End Date:
675Base Tag:	minoura-xpg4dl-base
676Maintainer:	Minoura Makoto <minoura@NetBSD.org>
677Scope:		basesrc, syssrc, sharesrc
678Notes:		Citrus Project is developing dynamically-loadable, codeset-
679		independent locale subsystem.  Part of the implementation
680		(LC_CTYPE) called XPG4DL is now integrated to -current.
681
682Branch:		mrg-vm-swap
683Description:	dynamic swap allocation, swap-to-files support
684Status:		Terminated; abondoned for mrg-vm-swap2
685Start Date:	12 February 1997
686End Date:	15 March 1997
687Base Tag:	[none]
688Maintainer:	Matthew R. Green <mrg@NetBSD.org>
689Scope:		kernel
690Notes:
691
692Branch:		mrg-vm-swap2
693Description:	dynamic swap allocation, swap-to-files support
694Status:		Terminated; merged to -current
695Start Date:	4 May 1997
696End Date:	12 June 1997
697Base Tag:	mrg-vm-swap2-base
698Maintainer:	Matthew R. Green <mrg@NetBSD.org>
699Scope:		kernel
700Notes:
701
702Branch:		nathanw_sa
703Description:	Scheduler activations
704Status:		Terminated; merged to -current
705Start Date:	5 March 2001
706End Date:	18 January 2003
707Base Tag:	nathanw_sa_base
708Maintainer:	Nathan Williams <nathanw@NetBSD.org>
709Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
710		bin/ps usr.bin/systat usr.bin/top usr.bin/w
711		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
712Notes:		The idea of scheduler activations is described in the
713		classic paper by Anderson et al., in ACM Transactions
714		a on Computer Systems volume 10 issue 1 (1992),which
715		can be found at
716		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
717		Many ideas in the implementation are based on the
718		implementation of scheduler activations added to Mach
719		3.0 and described by Davis et al. in the University of
720		Washington CS tech report 92-08-93, which can be found
721		at
722		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
723
724		My USENIX paper on the subject can be found at
725		http://web.mit.edu/nathanw/www/usenix/
726
727		Please consult with the maintainer before committing
728		to this branch.
729		Other tags starting with nathanw_sa reserved for
730		branch management and are not guaranteed to be stable.
731
732		Trunk tagged with "nathanw_sa_before_merge" prior to
733		merging branch down to trunk.  Branch tagged with
734		"nathanw_sa_end" to indicate the ending revision of
735		the branch.
736
737Branch:		perseant-lfsv2
738Description:	LFS incompatible on-disk data structure changes
739Status:		Terminated
740Start Date:	27 June 2001
741End Date:	16 July 2001
742Base Tag:	perseant-lfsv2-base
743Maintainer:	Konrad Schroder <perseant@NetBSD.org>
744Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
745Notes:		This branch should be short-lived, I expect to merge as soon
746		as the data structures required for unremove are in and tested.
747
748Branch:		peter-altq
749Description:	New ALTQ framework:
750		- sync with KAME sources
751		- share mtag/name mapping functions
752		- separate altq + pf attachment
753Status:		Terminated; merged to -current
754Start Date:	March 16, 2006
755End Date:	October 12, 2006
756Base Tag:	peter-altq-base
757Maintainer:	Peter Postma <peter@NetBSD.org>,
758		Martin Husemann <martin@NetBSD.org>,
759		Matthias Scheler <tron@NetBSD.org>
760Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
761Notes:		Only the first item in the description was finished
762		in this branch.
763
764Branch:		sommerfeld_i386mp_1
765Description:	Multiprocessor support for i386 using Intel MP BIOS.
766Status:		Terminated; merged to -current
767Start Date:	21 Feb 2000
768End Date:	01 Oct 2002
769Base Tag:	sommerfeld_i386mpbase_1
770Maintainer:	Bill Sommerfeld <sommerfeld@NetBSD.org>
771Scope:		sys/arch/i386
772Notes:
773		Code committed to the branch has booted to multiuser 
774		on at least one system.
775
776		Not guaranteed to compile against mainline since -current
777		may have changed incompatibly with the last branch update;
778		use "cvs update -D" to roll-back the rest of the tree to match.
779
780		Please get explicit permission from the maintainer 
781		before each commit, or your changes will be backed out.
782		Other tags starting with sommerfeld_ are private to 
783		the developer and are guaranteed to be unstable.
784		Only the maintainer should move tags.
785
786		Note that this branch uses a DIFFERENT scheme for 
787		synching with the mainline.  the maintainer uses some private
788		scripts for keeping them in synch; if you make commits 
789		to the branch to "resynchronize" things, you'll
790		probably do it wrong; instead, ask the maintainer to
791		resynchronize things.
792
793		See sys/arch/i386/TODO on the branch for a list of known
794		issues with the branch.
795
796Branch:		thorpej-mips-cache
797Description:	overhaul MIPS cache support code
798Status:		Terminated; merged to -current
799Start Date:	Oct 23 2001
800End Date:	Nov 14 2001
801Base Tag:	thorpej-mips-cache-base
802Scope:		syssrc
803Notes:		This branch needs more debugging, testing, and more
804		ports need to be converted to the new world order.
805
806		The following processors have had cache ops
807		written:
808
809			* R2000/R3000 (cache_r3k) -- light testing,
810			  needs to be beat on a lot more to make
811			  sure it's working.
812
813			* R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org
814			  tracked down a bug, which has been fixed.
815
816			  Confirmed working on R4000-with-L2.
817
818			  Confirmed working on R4400-no-L2 and
819			  R4400-with-L2.
820
821			* R4600/R5000 (cache_r5k) -- shin@NetBSD.org
822			  has committed fixes to this code.
823
824			  Confirmed working on R4600 v2 (SGI IP-22 with
825			  no SysAD L2 cache).
826
827			  Confirmed working on RM5260 (Algorithmics P-5064).
828
829			* TX39 (cache_tx39) -- uch@NetBSD.org has
830			  committed fixes to this code.  Awaiting
831			  confirmation that it is working properly.
832
833			* R5900 (cache_r5900) -- uch@NetBSD.org has
834			  written this code and tested it on a
835			  PlayStation 2.
836
837		The following ports have been updated to compile (and
838		use optimized-for-processor bus_dma routines).  Those
839		that have been tested and work are marked with [WORKING].
840
841			* algor		[WORKING]
842
843			* arc		[WORKING]
844
845			* pmax		[WORKING]
846
847			* playstation2	[WORKING]
848					Needs optimized bus_dmamap_sync().
849
850			* hpcmips	[need verification that this is working]
851					Needs optimized bus_dmamap_sync().
852
853			* sgimips	[WORKING]
854					Needs optimized bus_dmamap_sync().
855
856			* cobalt	[need testing]
857
858			* mipsco	[need testing]
859
860			* newsmips	[need testing]
861
862Branch:		thorpej_scsipi
863Description:	SCSI/ATAPI midlayer rewrite.
864Status:		Terminated; merged to -current
865Start Date:
866End Date:	Apr 25 2001
867Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
868Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>,
869		Jason Thorpe <thorpej@NetBSD.org>
870Scope:		syssrc
871Notes:		When a change from -current is pulled up please move the
872		thorpej_scsipi_base tag to the revision you're syncing with.
873		thorpej_scsipi_nbase is private to maintainer (only
874		used when syncing the whole branch with HEAD).
875		Just before the merge, syssrc has been tagged with
876		thorpej_scsipi_beforemerge
877
878Branch:		thorpej-signal
879Description:	?
880Status:		?
881Start Date:
882End Date:
883Base Tag:	thorpej-signal-base
884Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
885Scope:		kernel
886Notes:
887
888Branch:		thorpej-setroot
889Description:	?
890Status:		Terminated; merged to -current
891Start Date:
892End Date:
893Base Tag:
894Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
895Scope:		kernel
896Notes:
897
898Branch:		simonb-timecounters
899Description:	Port FreeBSD timecounters to NetBSD
900Status:		Terminated
901Start Date:	Sat Feb 04 2006
902End Date:	Wed Jun 07 2006
903Base Tag:	simonb-timecounters-base
904Maintainer:	Simon Burge <simonb@NetBSD.org>,
905		Frank Kardel <kardel@NetBSD.org>
906Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
907Notes:		early (partial conversion) commit to -current
908		ok'ed by core@ on 20060605 for testing and further
909		simplified conversion
910
911Branch:		wrstuden-devbsize
912Description:	Modify buffer cache to deal with different devices having
913		different block sizes. Also DEV_BSIZE would go away.
914Status:		Terminated
915Start Date:	Aug or Sept 1999
916End Date:	1 Apr 2000
917Base tag:	wrstuden-devbsize-base
918Maintainer:	Bill Studenmund <wrstuden@NetBSD.org>
919Scope:		kernel
920Notes:		No longer active due to lack of time, and introduction
921		of UBC. In terms of UBC, the primary cache for
922		file data is the VM cache, which needs to operate
923		in terms of VM pages. As no existing device has native
924		pages the same size as our VM pages, there already is
925		a mapping going on between the VM system and the
926		underlying blocks. So it would be easier and cleaner
927		to adjust that to deal w/ different block sizes.
928		Also with UBC, all i/o is in terms of bytes at an offset
929		with a certain length, so the exact block size isn't a big
930		deal.
931
932		Any other wrstuden-devbsize tag may (and should) go away.
933
934Branch:		yamt-km, yamt-km-doc
935Description:	simplify/improve kernel memory management and bootstrap
936Status:		Terminated; merged to -current
937Start Date:	Tue Jan 25 2005
938End Date:	Fri Apr  1 2005
939Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
940Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
941Scope:		yamt-km: src/sys
942		yamt-km-doc: src/share/man/man9/uvm.9
943Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
944
945		the followings are per-port status.
946		(account names mean "tested by".)
947
948		works enough to go to multiuser:
949			alpha, i386, xen (yamt@)
950			pc532 (simonb@)
951			alpha, i386, mac68k, macppc, pmax, shark,
952			    sparc, sparc64, sun3, x68k (chs@)
953			cobalt, dreamcast, hp300, news68k, newsmips,
954			    sun3x (tsutsui@)
955			amiga (mhitch@)
956			cats, hp700 (skrll@)
957			xen (bouyer@)
958
959		known to have the same problem as trunk:
960			vax (chs@, stuck while running kvm_mkdb)
961
962		known to have a problem:
963			luna68k (and, if any, other m68k ports which use TTR)
964			needs to be revisited.
965			-> for luna68k, although not tested,
966			   Sysmap has been moved to avoid kva conflict with
967			   I/O ranges.
968
969		buildable:
970			src/sys/arch/acorn26/conf/GENERIC
971			src/sys/arch/acorn32/conf/GENERIC
972			src/sys/arch/algor/conf/P6032
973			src/sys/arch/alpha/conf/GENERIC
974			src/sys/arch/alpha/conf/GENERIC.MP
975			src/sys/arch/amd64/conf/GENERIC
976			src/sys/arch/amd64/conf/GENERIC.MP
977			src/sys/arch/amiga/conf/GENERIC
978			src/sys/arch/arc/conf/GENERIC
979			src/sys/arch/atari/conf/MILAN-PCIIDE
980			src/sys/arch/bebox/conf/GENERIC
981			src/sys/arch/cats/conf/GENERIC
982			src/sys/arch/cesfic/conf/GENERIC
983			src/sys/arch/cobalt/conf/GENERIC
984			src/sys/arch/dreamcast/conf/GENERIC
985			src/sys/arch/evbarm/conf/TS7200
986			src/sys/arch/evbppc/conf/WALNUT
987			src/sys/arch/evbsh3/conf/COMPUTEXEVB
988			src/sys/arch/evbsh5/conf/CAYMAN64
989			src/sys/arch/hp300/conf/GENERIC
990			src/sys/arch/hp700/conf/GENERIC
991			src/sys/arch/hpcarm/conf/JORNADA728
992			src/sys/arch/hpcmips/conf/GENERIC
993			src/sys/arch/hpcsh/conf/GENERIC
994			src/sys/arch/hpcsh/conf/HPW650PA
995			src/sys/arch/i386/conf/GENERIC
996			src/sys/arch/i386/conf/GENERIC.MP
997			src/sys/arch/i386/conf/XEN0
998			src/sys/arch/i386/conf/XENU
999			src/sys/arch/ibmnws/conf/GENERIC
1000			src/sys/arch/iyonix/conf/GENERIC
1001			src/sys/arch/luna68k/conf/GENERIC
1002			src/sys/arch/mac68k/conf/GENERIC
1003			src/sys/arch/macppc/conf/GENERIC
1004			src/sys/arch/macppc/conf/GENERIC.MP
1005			src/sys/arch/mipsco/conf/GENERIC
1006			src/sys/arch/mmeye/conf/GENERIC
1007			src/sys/arch/mvme68k/conf/GENERIC
1008			src/sys/arch/netwinder/conf/GENERIC
1009			src/sys/arch/news68k/conf/GENERIC
1010			src/sys/arch/newsmips/conf/GENERIC
1011			src/sys/arch/next68k/conf/GENERIC
1012			src/sys/arch/ofppc/conf/GENERIC
1013			src/sys/arch/pc532/conf/GENERIC
1014			src/sys/arch/pmax/conf/GENERIC
1015			src/sys/arch/prep/conf/GENERIC
1016			src/sys/arch/sandpoint/conf/GENERIC
1017			src/sys/arch/sbmips/conf/GENERIC
1018			src/sys/arch/sgimips/conf/GENERIC32_IP3x
1019			src/sys/arch/shark/conf/GENERIC
1020			src/sys/arch/sparc/conf/GENERIC
1021			src/sys/arch/sparc/conf/GENERIC.MP
1022			src/sys/arch/sparc64/conf/GENERIC
1023			src/sys/arch/sparc64/conf/GENERIC.MP
1024			src/sys/arch/sun2/conf/GENERIC
1025			src/sys/arch/sun3/conf/GENERIC
1026			src/sys/arch/vax/conf/GENERIC
1027			src/sys/arch/vax/conf/GENERIC.MP
1028			src/sys/arch/x68k/conf/GENERIC
1029
1030			src/sys/arch/playstation2/conf/GENERIC
1031
1032Branch:		yamt-pdpolicy
1033Description:	play with page replacement policy
1034		- separate page replacement policy from the rest of kernel
1035		- implement alternative replacement policy
1036		- related read-ahead adjustment?
1037Status:		Terminated; merged to -current
1038Start Date:	Sun Mar  5 2006
1039End Date:	Sat Sep 16 2006
1040Base Tag:	yamt-pdpolicy-base9
1041Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1042Scope:		src/sys  (src/common is tagged but not branched)
1043Notes:		
1044
1045Branch:		yamt-readahead
1046Description:	play with file readahead
1047Status:		Terminated; merged to -current
1048Start Date:	Mon Nov 14 2005
1049End Date:	Wed Nov 30 2005
1050Base Tag:	yamt-readahead-base3
1051Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1052Scope:		src/sys
1053Notes:		
1054
1055Branch:		yamt-uio_vmspace
1056Description:	uio_lwp/uio_segflg -> uio_vmspace
1057Status:		Terminated; merged to -current
1058Start Date:	Mon Dec 31 2005
1059End Date:	Wed Mar  1 2006
1060Base Tag:	yamt-uio_vmspace-base5
1061Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1062Scope:		src/sys
1063Notes:		
1064
1065Branch:		yamt-vop
1066Description:	remove several VOPs
1067Status:		Terminated; merged to -current
1068Start Date:	Wed Oct 19 2005
1069End Date:	Wed Nov  2 2005
1070Base Tag:	yamt-vop-base3
1071Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1072Scope:		src/sys
1073Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
1074
1075Branch:		gdamore-uart
1076Description:	Add register table support to com driver.
1077Status:		Active
1078Start Date:	14 June 2006
1079End Date:	13 July 2006
1080Base Tag:	gdamore-uart-base
1081Maintainer:	Garrett D'Amore <gdamore@NetBSD.org>
1082Scope:		kernel
1083Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
1084		com support, and also removes a nasty hack from Atheros com.
1085
1086
1087########################################################################
1088# Other:
1089########################################################################
1090
1091Branch:		magnum
1092Description:	?
1093Status:		?
1094Start Date:
1095End Date:
1096Base Tag:	magnum-base
1097Maintainer:	?
1098Scope:		kernel
1099Notes:
1100
1101