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