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