BRANCHES revision 1.114
1#	$NetBSD: BRANCHES,v 1.114 2006/10/07 02:53:57 tsutsui 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:		peter-altq
313Description:	New ALTQ framework:
314		- sync with KAME sources
315		- share mtag/name mapping functions
316		- separate altq + pf attachment 
317Status:		Active
318Start Date:	March 16, 2006
319End Date:
320Base Tag:	peter-altq-base
321Maintainer:	Peter Postma <peter@NetBSD.org>,
322		Martin Husemann <martin@NetBSD.org>,
323		Matthias Scheler <tron@NetBSD.org>
324Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
325Notes:
326
327Branch:	  	pkgviews
328Description:  	package views, enabling multiple conflicting packages to co-exist
329Status:		Active
330Start Date:	22 July 2002
331End Date:
332Base Tag:	pkgviews
333Maintainer:	Alistair Crooks <agc@NetBSD.org>
334Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
335Notes:		A more flexible infrastructure for third-party packages by
336		allowing multiple conflicting packages and versions to co-exist
337		within the same tree
338
339Branch:		rpaulo-netinet-merge-pcb
340Description:	merge in6pcb with inpcb
341Status:		Active
342Start Date:	Wed Feb 01 2006
343End Date:	
344Base Tag:	rpaulo-netinet-merge-pcb-base
345Maintainer:	Rui Paulo <rpaulo@NetBSD.org>
346Scope:		src/sys
347Notes:
348
349Branch:		rtr-xorg-branch
350Description:	xorg & static build alterations to src/x11
351Status:		Active
352Start Date:	Nov 15 2004
353End Date:	
354Base tag:	rtr-xorg-branch-base
355Maintainer:	Tyler R. Retzlaff <rtr@NetBSD.org>
356Scope:		x11
357		distrib/sets/lists
358		share/mk/bsd.x11.mk
359		share/mk/bsd.own.mk
360		etc/mtree/NetBSD.dist
361Notes:		Requires parts of xsrc/xfree (HEAD)
362		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
363		Requires xorg (XORG-6_8_1)
364
365Branch:		thorpej-devvp
366Description:	replace dev_t with struct vnode * in devsw entry points
367Status:		Active
368Start Date:	Sep 6 2001
369End Date:
370Base Tag:	thorpej-devvp-base
371Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
372Scope:		syssrc
373Notes:		Kernels built from this branch are not expected
374		to function correctly at this time.
375
376		Ports known to compile on this branch:
377			alpha
378			i386
379
380Branch:		yamt-lazymbuf
381Description:	implement and evaluate lazy mapping of mbuf external data pages
382		it's intended as the first step of larger changes.
383			1. support operations (esp. bus_dma load) on
384			   unmapped mbuf.
385			2. unify mbuf and buf.
386			   (or, at least some parts of them)
387			3. then it should be trivial to implement
388			   i/o coalescing, etc.
389Status:		Active
390Start Date:	Wed Jul  6 2005
391End Date:	
392Base Tag:	yamt-lazymbuf-base2
393Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
394Scope:		src/sys
395Notes:		
396
397Branch:		yamt-splraiseipl
398Description:	finish implementing splraiseipl (and makeiplcookie).
399		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
400Status:		Active
401Start Date:	Mon Sep 18 2006
402End Date:	
403Base Tag:	yamt-splraiseipl-base
404Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
405Scope:		src/sys  (src/common is tagged but not branched)
406Notes:		
407		tested:
408			alpha, i386, xen (yamt)
409			hp300, news68k, sparc(sun4c), sun2,
410			    sun3, sun3x (tsutsui)
411
412		compile-tested:
413			amd64, sparc, sparc64 (GENERIC),
414			vax, evbarm, evbmips, evbsh3, iyonix, acorn26,
415			hp700, evbppc (marvell, ibm4xx),
416			mac68k, x68k, hpcarm, shark, acorn32,
417			cats, netwinder, algor, arc, ews4800mips, hpcmips,
418			newsmips, luna68k, cobalt, pmax, sbmips, hpcsh,
419			landisk, next68k, macppc
420
421		not tested:
422			pdp10 (i don't know how to build)
423			sparc64 (GENERIC.MP seems to have an unrelated problem)
424			cesfic (GENERIC fails to build with the following
425			error.  i don't know if it's related to my changes.)
426
427      build  compat/libcompat.a
428      making sure the 68040 FPSP is up to date...
429      netbsd.s: Assembler messages:
430      netbsd.s:92: Error: can't resolve `0' {*UND* section} - `LOCAL_SIZE' {*UND* section}
431      netbsd.s:125: Error: can't resolve `0' {*UND* section} - `LOCAL_SIZE' {*UND* section}
432      netbsd.s:163: Error: can't resolve `0' {.text section} - `LOCAL_SIZE' {*UND* section}
433
434			amiga (GENERIC fails with the following error.)
435
436`libcompat.a' is up to date.
437making sure the 68040 FPSP is up to date...
438do_func.s: Assembler messages:
439do_func.s:564: Error: undefined symbol `neg_mask' in operation
440do_func.s:564: Error: undefined symbol `inf_mask' in operation
441do_func.s:591: Error: undefined symbol `neg_mask' in operation
442do_func.s:591: Error: undefined symbol `z_mask' in operation
443
444*** Failed target:  do_func.o
445*** Failed command: /exports/abhome/tools/bin/m68k--netbsdelf-gcc -x assembler-with-cpp -m68040 -Damiga -DFPCOPROC -I../../. -I/exports/nbsd/src/sys/../common/include -I/exports/nbsd/src/sys/arch -I/exports/nbsd/src/sys -nostdinc -DDRACO -DM68060 -DM68040 -DM68030 -DM68020 -DLKM -DMAXUSERS=8 -D_KERNEL -D_KERNEL_OPT -I/exports/nbsd/src/sys/lib/libkern/../../../common/lib/libc/quad -I/exports/nbsd/src/sys/lib/libkern/../../../common/lib/libc/string -I/exports/nbsd/src/sys/lib/libkern/../../../common/lib/libc/arch/m68k/string -I/exports/nbsd/src/sys/dist/ipf -c -o do_func.o do_func.s
446*** Error code 1
447
448		notyet:
449			others
450
451
452########################################################################
453# Individual developers' branches (Terminated):
454########################################################################
455
456Branch:		bouyer-scsipi
457Description:	Integration of atapi support
458Status:		Terminated
459Start Date:
460End Date:
461Base Tag:
462Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
463Scope:		kernel
464Notes:		Superseded by thorpej_scsipi
465
466Branch:		bouyer-xen2
467Description:	update xen port to xen 2.0, with support for domain0 operations
468Status:		Terminated
469Start Date:	Dec 13 2004
470End Date:	Mar 10 2005
471Base Tag:	netbsd-2-base
472Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
473Scope:		src/sys/arch/xen
474Notes:
475
476Branch: 	chap-midi
477Description:	Renovation of MIDI support
478Status: 	Terminated; merged to -current
479Start Date:	19 May 2006
480End Date:	30 Jun 2006
481Base Tag:	chap-midi-base
482Maintainer:	Chapman Flack <chap@NetBSD.org>
483Scope:		sys, share/man, usr.bin
484Notes:
485
486Branch:		chs-ubc
487Description:	Unified Buffer Cache
488Status:		Terminated
489Start Date:
490End Date:
491Base Tag:	chs-ubc-base
492Maintainer:	Chuck Silvers <chs@NetBSD.org>
493Scope:		kernel
494Notes:
495
496Branch:		chs-ubc2
497Description:	 Unified Buffer Cache
498Status:		Terminated; merged to -current
499Start Date:
500End Date:
501Base Tag:	chs-ubc2-base, chs-ubc2-newbase
502Maintainer:	Chuck Silvers <chs@NetBSD.org>
503Scope:		kernel
504Notes:
505
506Branch:		cjs-build-against-obj-dir
507Description:	?
508Status:		?
509Start Date:
510End Date:
511Base Tag:
512Maintainer:	Curt Sampson <cjs@NetBSD.org>
513Scope:		Entire tree.
514Notes:
515
516Branch:		eeh-paddr_t
517Description:	use separate types for virtual vs. physical addresses
518Status:		Terminated; merged to -current
519Start Date:
520End Date:
521Base Tag:	eeh-paddr_t-base
522Maintainer:	Eduardo Horvath <eeh@NetBSD.org>
523Scope:		kernel
524Notes:		This is needed to support 32-bit kernels on sparc64.
525
526Branch:		elad-kernelauth
527Description:	Native NetBSD implementation of Apple's kernel authorization
528		based on TN2127. This is a "clean-room" implementation to
529		avoid any licensing issues.
530Status:		Terminated; merged to -current
531Start Date:	Tue Mar	 7 2006
532End Date:	Mon May 15 2006
533Base Tag:	elad-kernelauth-base
534Maintainer:	Elad Efrat <elad@NetBSD.org>
535Scope:		src/sys, src/share/man/man9/Makefile,
536		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
537Notes:
538
539Branch:		fvdl-softdep
540Description:	FFS soft dependencies
541Status:		Terminated; merged to -current
542Start Date:
543End Date:
544Base Tag:	fvdl-softdep-base
545Maintainer:	Frank van der Linden <fvdl@NetBSD.org>
546Scope:		kernel
547Notes:
548
549Branch:		gehenna-devsw
550Description:	auto-generation of devsw table
551Status:		Terminated
552Start Date:	16 May 2002
553End Date:	6 Sep 2002
554Base Tag:	gehenna-devsw-base
555Maintainer:	MAEKAWA Masahide <gehenna@NetBSD.org>
556Scope:		syssrc
557Notes:		The goal is to get rid of the existing device switch tables in
558		port-dependent conf.c and to generate them dynamically by
559		config(8).
560
561Branch:		is-newarp
562Description:	ARP for non-Ethernet
563Status:		Terminated; merged before NetBSD 1.3
564Start Date:	1996/10/13
565End Date:	1997/03/15
566Base Tag:	is-newarp-base
567Maintainer:	Ignatios Souvatzis <is@NetBSD.org>
568Scope:		kernel
569Notes:
570
571Branch:		kenh-if-detach
572Description:	Interface detach support.
573Status:		?
574Start Date:
575End Date:
576Base Tag:	kenh-if-detach-base
577Maintainer:	Ken Hornstein <kenh@NetBSD.org>
578Scope:		kernel
579Notes:
580
581Branch:		kent-audio1
582Description:	Audio converter pipeline
583Status:		Terminated; merged to -current
584Start Date:	Tue Dec  7 2004
585End Date:	Tue Jan 11 2005
586Base Tag:	kent-audio1-base
587Maintainer:	TAMURA Kent <kent@NetBSD.org>
588Scope:		kernel (audio device drivers)
589Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
590		Please consult with the maintainer before committing
591		to this branch.
592
593Branch:		kqueue
594Description:	kqueue kernel event notification mechanism (from FreeBSD)
595Status:		Terminated; merged to -current
596Start Date:	Tue Jul 10 23:08:38 EST 2001
597End Date:	Tue Oct 24 09:14:14 GMT 2002
598Base Tag:	kqueue-base
599Maintainer:	Jaromir Dolecek <jdolecek@NetBSD.org>
600Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
601Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
602		local internal changes to better suit NetBSD, and
603		enhancements such as looking up filters by name or
604		number, and dynamic registration of "user" filters.
605		The work is complete as is, but is awaiting more
606		feedback from various kernel gurus before going mainline.
607
608Branch:		ktrace-lwp
609Description:	ktrace support for lwp ids.
610Status:		Terminated; merged to -current
611Start Date:	Wed Jul  2 15:27:30 UTC 2003
612End Date:	Sun Dec 11 12:25:29 UTC 2005
613Base Tag:	ktrace-lwp-base
614Maintainer:	Darren Reed <darrenr@NetBSD.org>
615Scope:		sys
616Notes:		
617
618Branch:		marc-pcmcia
619Description:	PCMCIA support
620Status:		Terminated; merged to -current
621Start Date:
622End Date:
623Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
624Maintainer:	Marc Horowitz <marc@NetBSD.org>
625Scope:		kernel
626Notes:
627
628Branch:		minoura_x68k_bus_h
629Description:	bus_space(9) and bus_dma(9) implementation for x68k
630Status:		Terminated; merged to -current
631Start Date:	23 Dec 1998
632End Date:	16 Mar 1999
633Base Tag:	minoura_x68k_bus_h-base
634Maintainer:	Minoura Makoto <minoura@NetBSD.org>
635Scope:		sys/arch/x68k
636Notes:
637
638Branch:		minoura-xpg4dl
639Description:	Citrus Project locale subsystem
640Status:		Terminated; (partly) merged to -current
641Start Date:	28 March 2000
642End Date:
643Base Tag:	minoura-xpg4dl-base
644Maintainer:	Minoura Makoto <minoura@NetBSD.org>
645Scope:		basesrc, syssrc, sharesrc
646Notes:		Citrus Project is developing dynamically-loadable, codeset-
647		independent locale subsystem.  Part of the implementation
648		(LC_CTYPE) called XPG4DL is now integrated to -current.
649
650Branch:		mrg-vm-swap
651Description:	dynamic swap allocation, swap-to-files support
652Status:		Terminated; abondoned for mrg-vm-swap2
653Start Date:	12 February 1997
654End Date:	15 March 1997
655Base Tag:	[none]
656Maintainer:	Matthew R. Green <mrg@NetBSD.org>
657Scope:		kernel
658Notes:
659
660Branch:		mrg-vm-swap2
661Description:	dynamic swap allocation, swap-to-files support
662Status:		Terminated; merged to -current
663Start Date:	4 May 1997
664End Date:	12 June 1997
665Base Tag:	mrg-vm-swap2-base
666Maintainer:	Matthew R. Green <mrg@NetBSD.org>
667Scope:		kernel
668Notes:
669
670Branch:		nathanw_sa
671Description:	Scheduler activations
672Status:		Terminated; merged to -current
673Start Date:	5 March 2001
674End Date:	18 January 2003
675Base Tag:	nathanw_sa_base
676Maintainer:	Nathan Williams <nathanw@NetBSD.org>
677Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
678		bin/ps usr.bin/systat usr.bin/top usr.bin/w
679		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
680Notes:		The idea of scheduler activations is described in the
681		classic paper by Anderson et al., in ACM Transactions
682		a on Computer Systems volume 10 issue 1 (1992),which
683		can be found at
684		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
685		Many ideas in the implementation are based on the
686		implementation of scheduler activations added to Mach
687		3.0 and described by Davis et al. in the University of
688		Washington CS tech report 92-08-93, which can be found
689		at
690		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
691
692		My USENIX paper on the subject can be found at
693		http://web.mit.edu/nathanw/www/usenix/
694
695		Please consult with the maintainer before committing
696		to this branch.
697		Other tags starting with nathanw_sa reserved for
698		branch management and are not guaranteed to be stable.
699
700		Trunk tagged with "nathanw_sa_before_merge" prior to
701		merging branch down to trunk.  Branch tagged with
702		"nathanw_sa_end" to indicate the ending revision of
703		the branch.
704
705Branch:		perseant-lfsv2
706Description:	LFS incompatible on-disk data structure changes
707Status:		Terminated
708Start Date:	27 June 2001
709End Date:	16 July 2001
710Base Tag:	perseant-lfsv2-base
711Maintainer:	Konrad Schroder <perseant@NetBSD.org>
712Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
713Notes:		This branch should be short-lived, I expect to merge as soon
714		as the data structures required for unremove are in and tested.
715
716Branch:		sommerfeld_i386mp_1
717Description:	Multiprocessor support for i386 using Intel MP BIOS.
718Status:		Terminated; merged to -current
719Start Date:	21 Feb 2000
720End Date:	01 Oct 2002
721Base Tag:	sommerfeld_i386mpbase_1
722Maintainer:	Bill Sommerfeld <sommerfeld@NetBSD.org>
723Scope:		sys/arch/i386
724Notes:
725		Code committed to the branch has booted to multiuser 
726		on at least one system.
727
728		Not guaranteed to compile against mainline since -current
729		may have changed incompatibly with the last branch update;
730		use "cvs update -D" to roll-back the rest of the tree to match.
731
732		Please get explicit permission from the maintainer 
733		before each commit, or your changes will be backed out.
734		Other tags starting with sommerfeld_ are private to 
735		the developer and are guaranteed to be unstable.
736		Only the maintainer should move tags.
737
738		Note that this branch uses a DIFFERENT scheme for 
739		synching with the mainline.  the maintainer uses some private
740		scripts for keeping them in synch; if you make commits 
741		to the branch to "resynchronize" things, you'll
742		probably do it wrong; instead, ask the maintainer to
743		resynchronize things.
744
745		See sys/arch/i386/TODO on the branch for a list of known
746		issues with the branch.
747
748Branch:		thorpej-mips-cache
749Description:	overhaul MIPS cache support code
750Status:		Terminated; merged to -current
751Start Date:	Oct 23 2001
752End Date:	Nov 14 2001
753Base Tag:	thorpej-mips-cache-base
754Scope:		syssrc
755Notes:		This branch needs more debugging, testing, and more
756		ports need to be converted to the new world order.
757
758		The following processors have had cache ops
759		written:
760
761			* R2000/R3000 (cache_r3k) -- light testing,
762			  needs to be beat on a lot more to make
763			  sure it's working.
764
765			* R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org
766			  tracked down a bug, which has been fixed.
767
768			  Confirmed working on R4000-with-L2.
769
770			  Confirmed working on R4400-no-L2 and
771			  R4400-with-L2.
772
773			* R4600/R5000 (cache_r5k) -- shin@NetBSD.org
774			  has committed fixes to this code.
775
776			  Confirmed working on R4600 v2 (SGI IP-22 with
777			  no SysAD L2 cache).
778
779			  Confirmed working on RM5260 (Algorithmics P-5064).
780
781			* TX39 (cache_tx39) -- uch@NetBSD.org has
782			  committed fixes to this code.  Awaiting
783			  confirmation that it is working properly.
784
785			* R5900 (cache_r5900) -- uch@NetBSD.org has
786			  written this code and tested it on a
787			  PlayStation 2.
788
789		The following ports have been updated to compile (and
790		use optimized-for-processor bus_dma routines).  Those
791		that have been tested and work are marked with [WORKING].
792
793			* algor		[WORKING]
794
795			* arc		[WORKING]
796
797			* pmax		[WORKING]
798
799			* playstation2	[WORKING]
800					Needs optimized bus_dmamap_sync().
801
802			* hpcmips	[need verification that this is working]
803					Needs optimized bus_dmamap_sync().
804
805			* sgimips	[WORKING]
806					Needs optimized bus_dmamap_sync().
807
808			* cobalt	[need testing]
809
810			* mipsco	[need testing]
811
812			* newsmips	[need testing]
813
814Branch:		thorpej_scsipi
815Description:	SCSI/ATAPI midlayer rewrite.
816Status:		Terminated; merged to -current
817Start Date:
818End Date:	Apr 25 2001
819Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
820Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>,
821		Jason Thorpe <thorpej@NetBSD.org>
822Scope:		syssrc
823Notes:		When a change from -current is pulled up please move the
824		thorpej_scsipi_base tag to the revision you're syncing with.
825		thorpej_scsipi_nbase is private to maintainer (only
826		used when syncing the whole branch with HEAD).
827		Just before the merge, syssrc has been tagged with
828		thorpej_scsipi_beforemerge
829
830Branch:		thorpej-signal
831Description:	?
832Status:		?
833Start Date:
834End Date:
835Base Tag:	thorpej-signal-base
836Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
837Scope:		kernel
838Notes:
839
840Branch:		thorpej-setroot
841Description:	?
842Status:		Terminated; merged to -current
843Start Date:
844End Date:
845Base Tag:
846Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
847Scope:		kernel
848Notes:
849
850Branch:		simonb-timecounters
851Description:	Port FreeBSD timecounters to NetBSD
852Status:		Terminated
853Start Date:	Sat Feb 04 2006
854End Date:	Wed Jun 07 2006
855Base Tag:	simonb-timecounters-base
856Maintainer:	Simon Burge <simonb@NetBSD.org>,
857		Frank Kardel <kardel@NetBSD.org>
858Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
859Notes:		early (partial conversion) commit to -current
860		ok'ed by core@ on 20060605 for testing and further
861		simplified conversion
862
863Branch:		wrstuden-devbsize
864Description:	Modify buffer cache to deal with different devices having
865		different block sizes. Also DEV_BSIZE would go away.
866Status:		Terminated
867Start Date:	Aug or Sept 1999
868End Date:	1 Apr 2000
869Base tag:	wrstuden-devbsize-base
870Maintainer:	Bill Studenmund <wrstuden@NetBSD.org>
871Scope:		kernel
872Notes:		No longer active due to lack of time, and introduction
873		of UBC. In terms of UBC, the primary cache for
874		file data is the VM cache, which needs to operate
875		in terms of VM pages. As no existing device has native
876		pages the same size as our VM pages, there already is
877		a mapping going on between the VM system and the
878		underlying blocks. So it would be easier and cleaner
879		to adjust that to deal w/ different block sizes.
880		Also with UBC, all i/o is in terms of bytes at an offset
881		with a certain length, so the exact block size isn't a big
882		deal.
883
884		Any other wrstuden-devbsize tag may (and should) go away.
885
886Branch:		yamt-km, yamt-km-doc
887Description:	simplify/improve kernel memory management and bootstrap
888Status:		Terminated; merged to -current
889Start Date:	Tue Jan 25 2005
890End Date:	Fri Apr  1 2005
891Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
892Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
893Scope:		yamt-km: src/sys
894		yamt-km-doc: src/share/man/man9/uvm.9
895Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
896
897		the followings are per-port status.
898		(account names mean "tested by".)
899
900		works enough to go to multiuser:
901			alpha, i386, xen (yamt@)
902			pc532 (simonb@)
903			alpha, i386, mac68k, macppc, pmax, shark,
904			    sparc, sparc64, sun3, x68k (chs@)
905			cobalt, dreamcast, hp300, news68k, newsmips,
906			    sun3x (tsutsui@)
907			amiga (mhitch@)
908			cats, hp700 (skrll@)
909			xen (bouyer@)
910
911		known to have the same problem as trunk:
912			vax (chs@, stuck while running kvm_mkdb)
913
914		known to have a problem:
915			luna68k (and, if any, other m68k ports which use TTR)
916			needs to be revisited.
917			-> for luna68k, although not tested,
918			   Sysmap has been moved to avoid kva conflict with
919			   I/O ranges.
920
921		buildable:
922			src/sys/arch/acorn26/conf/GENERIC
923			src/sys/arch/acorn32/conf/GENERIC
924			src/sys/arch/algor/conf/P6032
925			src/sys/arch/alpha/conf/GENERIC
926			src/sys/arch/alpha/conf/GENERIC.MP
927			src/sys/arch/amd64/conf/GENERIC
928			src/sys/arch/amd64/conf/GENERIC.MP
929			src/sys/arch/amiga/conf/GENERIC
930			src/sys/arch/arc/conf/GENERIC
931			src/sys/arch/atari/conf/MILAN-PCIIDE
932			src/sys/arch/bebox/conf/GENERIC
933			src/sys/arch/cats/conf/GENERIC
934			src/sys/arch/cesfic/conf/GENERIC
935			src/sys/arch/cobalt/conf/GENERIC
936			src/sys/arch/dreamcast/conf/GENERIC
937			src/sys/arch/evbarm/conf/TS7200
938			src/sys/arch/evbppc/conf/WALNUT
939			src/sys/arch/evbsh3/conf/COMPUTEXEVB
940			src/sys/arch/evbsh5/conf/CAYMAN64
941			src/sys/arch/hp300/conf/GENERIC
942			src/sys/arch/hp700/conf/GENERIC
943			src/sys/arch/hpcarm/conf/JORNADA728
944			src/sys/arch/hpcmips/conf/GENERIC
945			src/sys/arch/hpcsh/conf/GENERIC
946			src/sys/arch/hpcsh/conf/HPW650PA
947			src/sys/arch/i386/conf/GENERIC
948			src/sys/arch/i386/conf/GENERIC.MP
949			src/sys/arch/i386/conf/XEN0
950			src/sys/arch/i386/conf/XENU
951			src/sys/arch/ibmnws/conf/GENERIC
952			src/sys/arch/iyonix/conf/GENERIC
953			src/sys/arch/luna68k/conf/GENERIC
954			src/sys/arch/mac68k/conf/GENERIC
955			src/sys/arch/macppc/conf/GENERIC
956			src/sys/arch/macppc/conf/GENERIC.MP
957			src/sys/arch/mipsco/conf/GENERIC
958			src/sys/arch/mmeye/conf/GENERIC
959			src/sys/arch/mvme68k/conf/GENERIC
960			src/sys/arch/netwinder/conf/GENERIC
961			src/sys/arch/news68k/conf/GENERIC
962			src/sys/arch/newsmips/conf/GENERIC
963			src/sys/arch/next68k/conf/GENERIC
964			src/sys/arch/ofppc/conf/GENERIC
965			src/sys/arch/pc532/conf/GENERIC
966			src/sys/arch/pmax/conf/GENERIC
967			src/sys/arch/prep/conf/GENERIC
968			src/sys/arch/sandpoint/conf/GENERIC
969			src/sys/arch/sbmips/conf/GENERIC
970			src/sys/arch/sgimips/conf/GENERIC32_IP3x
971			src/sys/arch/shark/conf/GENERIC
972			src/sys/arch/sparc/conf/GENERIC
973			src/sys/arch/sparc/conf/GENERIC.MP
974			src/sys/arch/sparc64/conf/GENERIC
975			src/sys/arch/sparc64/conf/GENERIC.MP
976			src/sys/arch/sun2/conf/GENERIC
977			src/sys/arch/sun3/conf/GENERIC
978			src/sys/arch/vax/conf/GENERIC
979			src/sys/arch/vax/conf/GENERIC.MP
980			src/sys/arch/x68k/conf/GENERIC
981
982			src/sys/arch/playstation2/conf/GENERIC
983
984Branch:		yamt-pdpolicy
985Description:	play with page replacement policy
986		- separate page replacement policy from the rest of kernel
987		- implement alternative replacement policy
988		- related read-ahead adjustment?
989Status:		Terminated; merged to -current
990Start Date:	Sun Mar  5 2006
991End Date:	Sat Sep 16 2006
992Base Tag:	yamt-pdpolicy-base9
993Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
994Scope:		src/sys  (src/common is tagged but not branched)
995Notes:		
996
997Branch:		yamt-readahead
998Description:	play with file readahead
999Status:		Terminated; merged to -current
1000Start Date:	Mon Nov 14 2005
1001End Date:	Wed Nov 30 2005
1002Base Tag:	yamt-readahead-base3
1003Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1004Scope:		src/sys
1005Notes:		
1006
1007Branch:		yamt-uio_vmspace
1008Description:	uio_lwp/uio_segflg -> uio_vmspace
1009Status:		Terminated; merged to -current
1010Start Date:	Mon Dec 31 2005
1011End Date:	Wed Mar  1 2006
1012Base Tag:	yamt-uio_vmspace-base5
1013Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1014Scope:		src/sys
1015Notes:		
1016
1017Branch:		yamt-vop
1018Description:	remove several VOPs
1019Status:		Terminated; merged to -current
1020Start Date:	Wed Oct 19 2005
1021End Date:	Wed Nov  2 2005
1022Base Tag:	yamt-vop-base3
1023Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1024Scope:		src/sys
1025Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
1026
1027Branch:		gdamore-uart
1028Description:	Add register table support to com driver.
1029Status:		Active
1030Start Date:	14 June 2006
1031End Date:	13 July 2006
1032Base Tag:	gdamore-uart-base
1033Maintainer:	Garrett D'Amore <gdamore@NetBSD.org>
1034Scope:		kernel
1035Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
1036		com support, and also removes a nasty hack from Atheros com.
1037
1038
1039########################################################################
1040# Other:
1041########################################################################
1042
1043Branch:		magnum
1044Description:	?
1045Status:		?
1046Start Date:
1047End Date:
1048Base Tag:	magnum-base
1049Maintainer:	?
1050Scope:		kernel
1051Notes:
1052
1053