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