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