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