BRANCHES revision 1.107
1#	$NetBSD: BRANCHES,v 1.107 2006/09/24 06:20:52 yamt Exp $
2#
3# This file contains a list of branches that exist in the NetBSD CVS
4# tree and their current state.
5#
6# This list is necessarily incomplete.
7# 
8# Within reason, developers may create branch and version tags at any
9# time for any purpose.  To avoid name collisions, private tags should
10# have names which begin with the developer's NetBSD login name
11# followed by a - or _ character (e.g., thorpej_scsipi,
12# thorpej-signal)
13# 
14# Any branch or version tag not listed here should be assumed to be
15# private to the developer who created it.  It is inappropriate for
16# anyone other than that developer to commit, move tags, or otherwise
17# modify the contents of the branch.
18#
19# Please update this file when a new branch is ready for consumption
20# by folks other than the maintainer, or when the use or status of an
21# existing branch changes significantly.
22#
23# Format:
24#   Branch:	  name of branch
25#   Description:  Purpose and intention of the branch
26#   Status:	  Active/Terminated/Dormant
27#   Start Date:	  date first instantiated
28#   End Date:	  date it was Terminated/made_Dormant, if any
29#   Base Tag:	  netbsd-1-5-base, etc.
30#   Maintainer:	  Somebody to blame.
31#   Scope:	  Portion of the tree covered.
32#   Notes:	  Various other info, perhaps explanation of special tags,
33#		  who-may-commit policies, etc.
34#
35# There are four sections to this file:
36#   Release branches
37#   Individual developers' branches (Active/Dormant)
38#   Individual developers' branches (Terminated), and
39#   other
40#
41# Entries within each section should be alphabetized.
42#
43
44
45# Release branches:
46
47Branch:		comdex-fall-1999
48Description:	Special release branch for pre-1.5 release at
49		Fall 1999 COMDEX.
50Status:		Terminated
51Start Date:
52End Date:
53Base Tag:	comdex-fall-1999-base
54Maintainer:	?
55Scope:		Entire tree.
56Notes:
57
58Branch:		netbsd-0-9
59Description:	The NetBSD 0.9 release branch
60Status:		Terminated
61Start Date:
62End Date:
63Base Tag:	netbsd-0-9-base
64Maintainer:	Release Engineering <releng@NetBSD.org>
65Scope:		Entire tree.
66Notes:		Subsidiary tags of: netbsd-0-9-ALPHA, netbsd-0-9-ALPHA2,
67		netbsd-0-9-BETA, netbsd-0-9-RELEASE.
68		Commits restricted to release engineering.
69
70Branch:		netbsd-1-0
71Description:	The NetBSD 1.0 release branch
72Status:		Terminated
73Start Date:
74End Date:
75Base Tag:	netbsd-1-0-base
76Maintainer:	Release Engineering <releng@NetBSD.org>
77Scope:		Entire tree.
78Notes:
79		Commits restricted to release engineering.
80
81Branch:		netbsd-1-1
82Description:	The NetBSD 1.1 release branch
83Status:		Terminated
84Start Date:
85End Date:
86Base Tag:	netbsd-1-1-base
87Maintainer:	Release Engineering <releng@NetBSD.org>
88Scope:		Entire tree.
89Notes:
90		Commits restricted to release engineering.
91
92Branch:		netbsd-1-2
93Description:	The NetBSD 1.2 release branch
94Status:		Terminated
95Start Date:
96End Date:
97Base Tag:	netbsd-1-2-base
98Maintainer:	Release Engineering <releng@NetBSD.org>
99Scope:		Entire tree.
100Notes:
101		Commits restricted to release engineering.
102
103Branch:		netbsd-1-3
104Description:	The NetBSD 1.3 release branch
105Status:		Terminated
106Start Date:
107End Date:
108Base Tag:	netbsd-1-3-base
109Maintainer:	Release Engineering <releng@NetBSD.org>
110Scope:		Entire tree.
111Notes:
112		Commits restricted to release engineering.
113
114Branch:		netbsd-1-4
115Description:	The NetBSD 1.4 release branch
116Status:		Terminated
117Start Date:	1 Apr 2000
118End Date:
119Base Tag:	netbsd-1-4-base
120Maintainer:	1.4 Release Engineering <releng-1-4@NetBSD.org>
121Scope:		Entire tree.
122Notes:
123		Commits restricted to release engineering.
124
125Branch:		netbsd-1-5
126Description:	The NetBSD 1.5 release branch
127Status:		Terminated
128Start Date:	20 Jun 2000
129End Date:	26 Jan 2005
130Base Tag:	netbsd-1-5-base
131Maintainer:	1.5 Release Engineering <releng-1-5@NetBSD.org>
132Scope:		Entire tree.
133Notes:
134		Commits restricted to release engineering.
135
136Branch:		netbsd-1-6
137Description:	The NetBSD 1.6 release branch
138Status:		Terminated
139Start Date:	22 May 2002
140End Date:
141Base Tag:	netbsd-1-6-base
142Maintainer:	1.6 Release Engineering <releng-1-6@NetBSD.org>
143Scope:		Entire tree.
144Notes:
145		Commits restricted to Release Engineering.
146
147Branch:		netbsd-2
148Description:    The NetBSD 2 release branch
149Status:		Active
150Start Date:	23 Dec 2004
151End Date:
152Base Tag:	netbsd-2-base
153Maintainer:	2 Release Engineering <releng-2@NetBSD.org>
154Scope:		Entire tree. (src + xsrc)
155Notes:
156		Commits restricted to Release Engineering.
157
158Branch:		netbsd-2-0
159Description:	Originally the NetBSD 2.0 release branch and now the branch 
160		tracking security/critical fixes for the NetBSD 2.0 series
161Status:		Active
162Start Date:	28 Mar 2004 and changed for security/critical function on
163       		23 Dec 2004
164End Date:
165Base Tag:	netbsd-2-0-base
166Maintainer:	2.0 Release Engineering <releng-2-0@NetBSD.org>
167Scope:		Entire tree. (src + xsrc)
168Notes:		Branch was re-purposed to security/critical change function
169		once 2.0 released. See netbsd-2 for current branch to track
170		NetBSD 2 tree.
171		Commits restricted to Release Engineering.
172
173Branch:		netbsd-2-1
174Description:	Tracking security/critical fixes for NetBSD 2.1
175Status:		Active
176Start Date:     26 Oct 2005 
177End Date:
178Base Tag:	netbsd-2-1-RELEASE
179Maintainer:	2 Release Engineering <releng-2@NetBSD.org>
180Scope:		Entire tree. (src + xsrc)
181Notes:		Branch contains only security/critical fixes to
182		NetBSD 2.1.  For new features, use netbsd-2 branch.
183		Commits restricted to Release Engineering.
184
185Branch:		netbsd-3
186Description:	The NetBSD 3 release branch
187Status:		Active
188Start Date:	16 Mar 2005
189End Date:
190Base Tag:	netbsd-3-base
191Maintainer:	3 Release Engineering <releng-3@NetBSD.org>
192Scope:		Entire tree. (src + xsrc)
193Notes:
194		Commits restricted to Release Engineering.
195
196Branch:		netbsd-4
197Description:	The NetBSD 4 release branch
198Status:		Active
199Start Date:	8 Aug 2006
200End Date:
201Base Tag:	netbsd-4-base
202Maintainer:	4 Release Engineering <releng-4@NetBSD.org>
203Scope:		Entire tree. (src + xsrc)
204Notes:
205		Commits restricted to Release Engineering.
206
207########################################################################
208# Individual developers' branches (Active/Dormant):
209########################################################################
210
211Branch:		bjh21-hydra
212Description:	Simtec Hydra support and ARM SMP in general
213Status:		Dormant
214Start Date:	18 Oct 2002
215End Date:
216Base Tag:	bjh21-hydra-base
217Maintainer:	Ben Harris <bjh21@NetBSD.org>
218Scope:		sys/arch/arm sys/arch/acorn32
219Notes:		This code was on a branch because it involves changes to
220		cpuswitch.S which would otherwise make merging the
221		nathanw_sa branch difficult.
222
223Branch:		gmcgarry_ctxsw
224Description:	Separate scheduler from context-switch code
225Status:		Dormant
226Start Date:	18 December 2002
227End Date:
228Base Tag:	gmcgarry_ctxsw_base
229Maintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
230Scope:		kernel
231Notes:		Removing knowledge of the schedular and its run queues
232		from the machine-dependent context switch code is the
233		first step in cleaning up the scheduler.  It is necessary
234		for the newlock branch, making the scheduler SMP friendly,
235		adding real-time scheduler extensions, and reducing the
236		number of code paths for LWP and proc switching.
237
238Branch:		gmcgarry_ucred
239Description:	Integrate and encapsulate user credentials
240Status:		Dormant
241Start Date:	18 December 2002
242End Date:
243Base Tag:	gmcgarry_ucred_base
244Maintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
245Scope:		kernel
246Notes:		merge pcred and ucred and poolify
247
248Branch:		kame
249Description:	KAME Project
250Status:		Dormant
251Start Date:	28 Jun 1999
252End Date:
253Base Tag:
254Maintainer:	Jun-ichiro itojun Hagino <itojun@NetBSD.org>
255Scope:		kernel
256Notes:		http://www.kame.net
257		Used for "reference" purposes for early part of KAME
258		integration effort.  The branch is not actively used, as I
259		(itojun) use patch(1) and diff(1) for the KAME syncs.
260
261Branch:		kent-audio2
262Description:	In-kernel audio mixer
263Status:		Active
264Start Date:	Sun Jan 16 2005
265End Date:	
266Base Tag:	kent-audio2-base
267Maintainer:	TAMURA Kent <kent@NetBSD.org>
268Scope:		kernel (audio device drivers)
269Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
270		Please consult with the maintainer before committing
271		to this branch.
272		This branch is not expected to be compilable yet.
273
274Branch:		matt-timespec
275Description:	Convert the kernel to struct timespec as its primary time
276		storage mechanism.
277Status:		Active
278Start Date:	2005-02-19
279End Date:
280Base Tag:	
281Maintainer:	Matt Thomas <matt@NetBSD.org>
282Scope:		kernel
283Notes:	
284
285Branch:		newlock
286Description:	New locking primitives, based on Solaris's
287Status:		Dormant
288Start Date:	March 9, 2002
289End Date:
290Base Tag:	newlock-base
291Maintainer:	Jason R. Thorpe <thorpej@NetBSD.org>
292Scope:		Kernel
293Notes:		The goal is to replace the existing lockmgr() and
294		simple_lock() based locking mechanisms with the
295		primitives found in Solaris: mutexes and rwlocks.
296
297Branch:		newlock2
298Description:	New locking primitives, based on Solaris's
299Status:		Active
300Start Date:	September 9, 2006
301End Date:
302Base Tag:	newlock2-base
303Maintainer:	Andrew Doran <ad@NetBSD.org>
304Scope:		Kernel
305Notes:		As per the newlock branch, however given the amount of time
306		the original branch has lain dormant, a new one has been
307		created. Goals:
308		- Implement new locking primitives on most-used ports.
309		- Minor locking improvements.
310		- Remove spinlockmgr().
311
312Branch:		peter-altq
313Description:	New ALTQ framework:
314		- sync with KAME sources
315		- share mtag/name mapping functions
316		- separate altq + pf attachment 
317Status:		Active
318Start Date:	March 16, 2006
319End Date:
320Base Tag:	peter-altq-base
321Maintainer:	Peter Postma <peter@NetBSD.org>,
322		Martin Husemann <martin@NetBSD.org>,
323		Matthias Scheler <tron@NetBSD.org>
324Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
325Notes:
326
327Branch:	  	pkgviews
328Description:  	package views, enabling multiple conflicting packages to co-exist
329Status:		Active
330Start Date:	22 July 2002
331End Date:
332Base Tag:	pkgviews
333Maintainer:	Alistair Crooks <agc@NetBSD.org>
334Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
335Notes:		A more flexible infrastructure for third-party packages by
336		allowing multiple conflicting packages and versions to co-exist
337		within the same tree
338
339Branch:		rpaulo-netinet-merge-pcb
340Description:	merge in6pcb with inpcb
341Status:		Active
342Start Date:	Wed Feb 01 2006
343End Date:	
344Base Tag:	rpaulo-netinet-merge-pcb-base
345Maintainer:	Rui Paulo <rpaulo@NetBSD.org>
346Scope:		src/sys
347Notes:
348
349Branch:		rtr-xorg-branch
350Description:	xorg & static build alterations to src/x11
351Status:		Active
352Start Date:	Nov 15 2004
353End Date:	
354Base tag:	rtr-xorg-branch-base
355Maintainer:	Tyler R. Retzlaff <rtr@NetBSD.org>
356Scope:		x11
357		distrib/sets/lists
358		share/mk/bsd.x11.mk
359		share/mk/bsd.own.mk
360		etc/mtree/NetBSD.dist
361Notes:		Requires parts of xsrc/xfree (HEAD)
362		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
363		Requires xorg (XORG-6_8_1)
364
365Branch:		thorpej-devvp
366Description:	replace dev_t with struct vnode * in devsw entry points
367Status:		Active
368Start Date:	Sep 6 2001
369End Date:
370Base Tag:	thorpej-devvp-base
371Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
372Scope:		syssrc
373Notes:		Kernels built from this branch are not expected
374		to function correctly at this time.
375
376		Ports known to compile on this branch:
377			alpha
378			i386
379
380Branch:		yamt-lazymbuf
381Description:	implement and evaluate lazy mapping of mbuf external data pages
382		it's intended as the first step of larger changes.
383			1. support operations (esp. bus_dma load) on
384			   unmapped mbuf.
385			2. unify mbuf and buf.
386			   (or, at least some parts of them)
387			3. then it should be trivial to implement
388			   i/o coalescing, etc.
389Status:		Active
390Start Date:	Wed Jul  6 2005
391End Date:	
392Base Tag:	yamt-lazymbuf-base2
393Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
394Scope:		src/sys
395Notes:		
396
397Branch:		yamt-splraiseipl
398Description:	finish implementing splraiseipl (and makeiplcookie).
399		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
400Status:		Active
401Start Date:	Mon Sep 18 2006
402End Date:	
403Base Tag:	yamt-splraiseipl-base
404Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
405Scope:		src/sys  (src/common is tagged but not branched)
406Notes:		
407		tested:
408			alpha, i386, xen (yamt)
409
410		compile-tested:
411			sun2, sun3, amd64, sparc, sparc64 (GENERIC),
412			vax, evbarm, evbmips, evbsh3, iyonix, acorn26,
413			hp700, evbppc (marvell, ibm4xx),
414			mac68k, x68k, hpcarm, shark, acorn32,
415			cats, netwinder, algor, arc, ews4800mips, hpcmips,
416			newsmips, luna68k, cobalt, pmax, sbmips
417
418		not tested:
419			sparc64 (GENERIC.MP seems to have an unrelated problem)
420			cesfic (GENERIC fails to build with the following
421			error.  i don't know if it's related to my changes.)
422
423      build  compat/libcompat.a
424      making sure the 68040 FPSP is up to date...
425      netbsd.s: Assembler messages:
426      netbsd.s:92: Error: can't resolve `0' {*UND* section} - `LOCAL_SIZE' {*UND* section}
427      netbsd.s:125: Error: can't resolve `0' {*UND* section} - `LOCAL_SIZE' {*UND* section}
428      netbsd.s:163: Error: can't resolve `0' {.text section} - `LOCAL_SIZE' {*UND* section}
429		
430		notyet:
431			others
432
433
434########################################################################
435# Individual developers' branches (Terminated):
436########################################################################
437
438Branch:		bouyer-scsipi
439Description:	Integration of atapi support
440Status:		Terminated
441Start Date:
442End Date:
443Base Tag:
444Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
445Scope:		kernel
446Notes:		Superseded by thorpej_scsipi
447
448Branch:		bouyer-xen2
449Description:	update xen port to xen 2.0, with support for domain0 operations
450Status:		Terminated
451Start Date:	Dec 13 2004
452End Date:	Mar 10 2005
453Base Tag:	netbsd-2-base
454Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
455Scope:		src/sys/arch/xen
456Notes:
457
458Branch: 	chap-midi
459Description:	Renovation of MIDI support
460Status: 	Terminated; merged to -current
461Start Date:	19 May 2006
462End Date:	30 Jun 2006
463Base Tag:	chap-midi-base
464Maintainer:	Chapman Flack <chap@NetBSD.org>
465Scope:		sys, share/man, usr.bin
466Notes:
467
468Branch:		chs-ubc
469Description:	Unified Buffer Cache
470Status:		Terminated
471Start Date:
472End Date:
473Base Tag:	chs-ubc-base
474Maintainer:	Chuck Silvers <chs@NetBSD.org>
475Scope:		kernel
476Notes:
477
478Branch:		chs-ubc2
479Description:	 Unified Buffer Cache
480Status:		Terminated; merged to -current
481Start Date:
482End Date:
483Base Tag:	chs-ubc2-base, chs-ubc2-newbase
484Maintainer:	Chuck Silvers <chs@NetBSD.org>
485Scope:		kernel
486Notes:
487
488Branch:		cjs-build-against-obj-dir
489Description:	?
490Status:		?
491Start Date:
492End Date:
493Base Tag:
494Maintainer:	Curt Sampson <cjs@NetBSD.org>
495Scope:		Entire tree.
496Notes:
497
498Branch:		eeh-paddr_t
499Description:	use separate types for virtual vs. physical addresses
500Status:		Terminated; merged to -current
501Start Date:
502End Date:
503Base Tag:	eeh-paddr_t-base
504Maintainer:	Eduardo Horvath <eeh@NetBSD.org>
505Scope:		kernel
506Notes:		This is needed to support 32-bit kernels on sparc64.
507
508Branch:		elad-kernelauth
509Description:	Native NetBSD implementation of Apple's kernel authorization
510		based on TN2127. This is a "clean-room" implementation to
511		avoid any licensing issues.
512Status:		Terminated; merged to -current
513Start Date:	Tue Mar	 7 2006
514End Date:	Mon May 15 2006
515Base Tag:	elad-kernelauth-base
516Maintainer:	Elad Efrat <elad@NetBSD.org>
517Scope:		src/sys, src/share/man/man9/Makefile,
518		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
519Notes:
520
521Branch:		fvdl-softdep
522Description:	FFS soft dependencies
523Status:		Terminated; merged to -current
524Start Date:
525End Date:
526Base Tag:	fvdl-softdep-base
527Maintainer:	Frank van der Linden <fvdl@NetBSD.org>
528Scope:		kernel
529Notes:
530
531Branch:		gehenna-devsw
532Description:	auto-generation of devsw table
533Status:		Terminated
534Start Date:	16 May 2002
535End Date:	6 Sep 2002
536Base Tag:	gehenna-devsw-base
537Maintainer:	MAEKAWA Masahide <gehenna@NetBSD.org>
538Scope:		syssrc
539Notes:		The goal is to get rid of the existing device switch tables in
540		port-dependent conf.c and to generate them dynamically by
541		config(8).
542
543Branch:		is-newarp
544Description:	ARP for non-Ethernet
545Status:		Terminated; merged before NetBSD 1.3
546Start Date:	1996/10/13
547End Date:	1997/03/15
548Base Tag:	is-newarp-base
549Maintainer:	Ignatios Souvatzis <is@NetBSD.org>
550Scope:		kernel
551Notes:
552
553Branch:		kenh-if-detach
554Description:	Interface detach support.
555Status:		?
556Start Date:
557End Date:
558Base Tag:	kenh-if-detach-base
559Maintainer:	Ken Hornstein <kenh@NetBSD.org>
560Scope:		kernel
561Notes:
562
563Branch:		kent-audio1
564Description:	Audio converter pipeline
565Status:		Terminated; merged to -current
566Start Date:	Tue Dec  7 2004
567End Date:	Tue Jan 11 2005
568Base Tag:	kent-audio1-base
569Maintainer:	TAMURA Kent <kent@NetBSD.org>
570Scope:		kernel (audio device drivers)
571Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
572		Please consult with the maintainer before committing
573		to this branch.
574
575Branch:		kqueue
576Description:	kqueue kernel event notification mechanism (from FreeBSD)
577Status:		Terminated; merged to -current
578Start Date:	Tue Jul 10 23:08:38 EST 2001
579End Date:	Tue Oct 24 09:14:14 GMT 2002
580Base Tag:	kqueue-base
581Maintainer:	Jaromir Dolecek <jdolecek@NetBSD.org>
582Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
583Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
584		local internal changes to better suit NetBSD, and
585		enhancements such as looking up filters by name or
586		number, and dynamic registration of "user" filters.
587		The work is complete as is, but is awaiting more
588		feedback from various kernel gurus before going mainline.
589
590Branch:		ktrace-lwp
591Description:	ktrace support for lwp ids.
592Status:		Terminated; merged to -current
593Start Date:	Wed Jul  2 15:27:30 UTC 2003
594End Date:	Sun Dec 11 12:25:29 UTC 2005
595Base Tag:	ktrace-lwp-base
596Maintainer:	Darren Reed <darrenr@NetBSD.org>
597Scope:		sys
598Notes:		
599
600Branch:		marc-pcmcia
601Description:	PCMCIA support
602Status:		Terminated; merged to -current
603Start Date:
604End Date:
605Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
606Maintainer:	Marc Horowitz <marc@NetBSD.org>
607Scope:		kernel
608Notes:
609
610Branch:		minoura_x68k_bus_h
611Description:	bus_space(9) and bus_dma(9) implementation for x68k
612Status:		Terminated; merged to -current
613Start Date:	23 Dec 1998
614End Date:	16 Mar 1999
615Base Tag:	minoura_x68k_bus_h-base
616Maintainer:	Minoura Makoto <minoura@NetBSD.org>
617Scope:		sys/arch/x68k
618Notes:
619
620Branch:		minoura-xpg4dl
621Description:	Citrus Project locale subsystem
622Status:		Terminated; (partly) merged to -current
623Start Date:	28 March 2000
624End Date:
625Base Tag:	minoura-xpg4dl-base
626Maintainer:	Minoura Makoto <minoura@NetBSD.org>
627Scope:		basesrc, syssrc, sharesrc
628Notes:		Citrus Project is developing dynamically-loadable, codeset-
629		independent locale subsystem.  Part of the implementation
630		(LC_CTYPE) called XPG4DL is now integrated to -current.
631
632Branch:		mrg-vm-swap
633Description:	dynamic swap allocation, swap-to-files support
634Status:		Terminated; abondoned for mrg-vm-swap2
635Start Date:	12 February 1997
636End Date:	15 March 1997
637Base Tag:	[none]
638Maintainer:	Matthew R. Green <mrg@NetBSD.org>
639Scope:		kernel
640Notes:
641
642Branch:		mrg-vm-swap2
643Description:	dynamic swap allocation, swap-to-files support
644Status:		Terminated; merged to -current
645Start Date:	4 May 1997
646End Date:	12 June 1997
647Base Tag:	mrg-vm-swap2-base
648Maintainer:	Matthew R. Green <mrg@NetBSD.org>
649Scope:		kernel
650Notes:
651
652Branch:		nathanw_sa
653Description:	Scheduler activations
654Status:		Terminated; merged to -current
655Start Date:	5 March 2001
656End Date:	18 January 2003
657Base Tag:	nathanw_sa_base
658Maintainer:	Nathan Williams <nathanw@NetBSD.org>
659Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
660		bin/ps usr.bin/systat usr.bin/top usr.bin/w
661		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
662Notes:		The idea of scheduler activations is described in the
663		classic paper by Anderson et al., in ACM Transactions
664		a on Computer Systems volume 10 issue 1 (1992),which
665		can be found at
666		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
667		Many ideas in the implementation are based on the
668		implementation of scheduler activations added to Mach
669		3.0 and described by Davis et al. in the University of
670		Washington CS tech report 92-08-93, which can be found
671		at
672		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
673
674		My USENIX paper on the subject can be found at
675		http://web.mit.edu/nathanw/www/usenix/
676
677		Please consult with the maintainer before committing
678		to this branch.
679		Other tags starting with nathanw_sa reserved for
680		branch management and are not guaranteed to be stable.
681
682		Trunk tagged with "nathanw_sa_before_merge" prior to
683		merging branch down to trunk.  Branch tagged with
684		"nathanw_sa_end" to indicate the ending revision of
685		the branch.
686
687Branch:		perseant-lfsv2
688Description:	LFS incompatible on-disk data structure changes
689Status:		Terminated
690Start Date:	27 June 2001
691End Date:	16 July 2001
692Base Tag:	perseant-lfsv2-base
693Maintainer:	Konrad Schroder <perseant@NetBSD.org>
694Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
695Notes:		This branch should be short-lived, I expect to merge as soon
696		as the data structures required for unremove are in and tested.
697
698Branch:		sommerfeld_i386mp_1
699Description:	Multiprocessor support for i386 using Intel MP BIOS.
700Status:		Terminated; merged to -current
701Start Date:	21 Feb 2000
702End Date:	01 Oct 2002
703Base Tag:	sommerfeld_i386mpbase_1
704Maintainer:	Bill Sommerfeld <sommerfeld@NetBSD.org>
705Scope:		sys/arch/i386
706Notes:
707		Code committed to the branch has booted to multiuser 
708		on at least one system.
709
710		Not guaranteed to compile against mainline since -current
711		may have changed incompatibly with the last branch update;
712		use "cvs update -D" to roll-back the rest of the tree to match.
713
714		Please get explicit permission from the maintainer 
715		before each commit, or your changes will be backed out.
716		Other tags starting with sommerfeld_ are private to 
717		the developer and are guaranteed to be unstable.
718		Only the maintainer should move tags.
719
720		Note that this branch uses a DIFFERENT scheme for 
721		synching with the mainline.  the maintainer uses some private
722		scripts for keeping them in synch; if you make commits 
723		to the branch to "resynchronize" things, you'll
724		probably do it wrong; instead, ask the maintainer to
725		resynchronize things.
726
727		See sys/arch/i386/TODO on the branch for a list of known
728		issues with the branch.
729
730Branch:		thorpej-mips-cache
731Description:	overhaul MIPS cache support code
732Status:		Terminated; merged to -current
733Start Date:	Oct 23 2001
734End Date:	Nov 14 2001
735Base Tag:	thorpej-mips-cache-base
736Scope:		syssrc
737Notes:		This branch needs more debugging, testing, and more
738		ports need to be converted to the new world order.
739
740		The following processors have had cache ops
741		written:
742
743			* R2000/R3000 (cache_r3k) -- light testing,
744			  needs to be beat on a lot more to make
745			  sure it's working.
746
747			* R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org
748			  tracked down a bug, which has been fixed.
749
750			  Confirmed working on R4000-with-L2.
751
752			  Confirmed working on R4400-no-L2 and
753			  R4400-with-L2.
754
755			* R4600/R5000 (cache_r5k) -- shin@NetBSD.org
756			  has committed fixes to this code.
757
758			  Confirmed working on R4600 v2 (SGI IP-22 with
759			  no SysAD L2 cache).
760
761			  Confirmed working on RM5260 (Algorithmics P-5064).
762
763			* TX39 (cache_tx39) -- uch@NetBSD.org has
764			  committed fixes to this code.  Awaiting
765			  confirmation that it is working properly.
766
767			* R5900 (cache_r5900) -- uch@NetBSD.org has
768			  written this code and tested it on a
769			  PlayStation 2.
770
771		The following ports have been updated to compile (and
772		use optimized-for-processor bus_dma routines).  Those
773		that have been tested and work are marked with [WORKING].
774
775			* algor		[WORKING]
776
777			* arc		[WORKING]
778
779			* pmax		[WORKING]
780
781			* playstation2	[WORKING]
782					Needs optimized bus_dmamap_sync().
783
784			* hpcmips	[need verification that this is working]
785					Needs optimized bus_dmamap_sync().
786
787			* sgimips	[WORKING]
788					Needs optimized bus_dmamap_sync().
789
790			* cobalt	[need testing]
791
792			* mipsco	[need testing]
793
794			* newsmips	[need testing]
795
796Branch:		thorpej_scsipi
797Description:	SCSI/ATAPI midlayer rewrite.
798Status:		Terminated; merged to -current
799Start Date:
800End Date:	Apr 25 2001
801Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
802Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>,
803		Jason Thorpe <thorpej@NetBSD.org>
804Scope:		syssrc
805Notes:		When a change from -current is pulled up please move the
806		thorpej_scsipi_base tag to the revision you're syncing with.
807		thorpej_scsipi_nbase is private to maintainer (only
808		used when syncing the whole branch with HEAD).
809		Just before the merge, syssrc has been tagged with
810		thorpej_scsipi_beforemerge
811
812Branch:		thorpej-signal
813Description:	?
814Status:		?
815Start Date:
816End Date:
817Base Tag:	thorpej-signal-base
818Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
819Scope:		kernel
820Notes:
821
822Branch:		thorpej-setroot
823Description:	?
824Status:		Terminated; merged to -current
825Start Date:
826End Date:
827Base Tag:
828Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
829Scope:		kernel
830Notes:
831
832Branch:		simonb-timecounters
833Description:	Port FreeBSD timecounters to NetBSD
834Status:		Terminated
835Start Date:	Sat Feb 04 2006
836End Date:	Wed Jun 07 2006
837Base Tag:	simonb-timecounters-base
838Maintainer:	Simon Burge <simonb@NetBSD.org>,
839		Frank Kardel <kardel@NetBSD.org>
840Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
841Notes:		early (partial conversion) commit to -current
842		ok'ed by core@ on 20060605 for testing and further
843		simplified conversion
844
845Branch:		wrstuden-devbsize
846Description:	Modify buffer cache to deal with different devices having
847		different block sizes. Also DEV_BSIZE would go away.
848Status:		Terminated
849Start Date:	Aug or Sept 1999
850End Date:	1 Apr 2000
851Base tag:	wrstuden-devbsize-base
852Maintainer:	Bill Studenmund <wrstuden@NetBSD.org>
853Scope:		kernel
854Notes:		No longer active due to lack of time, and introduction
855		of UBC. In terms of UBC, the primary cache for
856		file data is the VM cache, which needs to operate
857		in terms of VM pages. As no existing device has native
858		pages the same size as our VM pages, there already is
859		a mapping going on between the VM system and the
860		underlying blocks. So it would be easier and cleaner
861		to adjust that to deal w/ different block sizes.
862		Also with UBC, all i/o is in terms of bytes at an offset
863		with a certain length, so the exact block size isn't a big
864		deal.
865
866		Any other wrstuden-devbsize tag may (and should) go away.
867
868Branch:		yamt-km, yamt-km-doc
869Description:	simplify/improve kernel memory management and bootstrap
870Status:		Terminated; merged to -current
871Start Date:	Tue Jan 25 2005
872End Date:	Fri Apr  1 2005
873Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
874Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
875Scope:		yamt-km: src/sys
876		yamt-km-doc: src/share/man/man9/uvm.9
877Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
878
879		the followings are per-port status.
880		(account names mean "tested by".)
881
882		works enough to go to multiuser:
883			alpha, i386, xen (yamt@)
884			pc532 (simonb@)
885			alpha, i386, mac68k, macppc, pmax, shark,
886			    sparc, sparc64, sun3, x68k (chs@)
887			cobalt, dreamcast, hp300, news68k, newsmips,
888			    sun3x (tsutsui@)
889			amiga (mhitch@)
890			cats, hp700 (skrll@)
891			xen (bouyer@)
892
893		known to have the same problem as trunk:
894			vax (chs@, stuck while running kvm_mkdb)
895
896		known to have a problem:
897			luna68k (and, if any, other m68k ports which use TTR)
898			needs to be revisited.
899			-> for luna68k, although not tested,
900			   Sysmap has been moved to avoid kva conflict with
901			   I/O ranges.
902
903		buildable:
904			src/sys/arch/acorn26/conf/GENERIC
905			src/sys/arch/acorn32/conf/GENERIC
906			src/sys/arch/algor/conf/P6032
907			src/sys/arch/alpha/conf/GENERIC
908			src/sys/arch/alpha/conf/GENERIC.MP
909			src/sys/arch/amd64/conf/GENERIC
910			src/sys/arch/amd64/conf/GENERIC.MP
911			src/sys/arch/amiga/conf/GENERIC
912			src/sys/arch/arc/conf/GENERIC
913			src/sys/arch/atari/conf/MILAN-PCIIDE
914			src/sys/arch/bebox/conf/GENERIC
915			src/sys/arch/cats/conf/GENERIC
916			src/sys/arch/cesfic/conf/GENERIC
917			src/sys/arch/cobalt/conf/GENERIC
918			src/sys/arch/dreamcast/conf/GENERIC
919			src/sys/arch/evbarm/conf/TS7200
920			src/sys/arch/evbppc/conf/WALNUT
921			src/sys/arch/evbsh3/conf/COMPUTEXEVB
922			src/sys/arch/evbsh5/conf/CAYMAN64
923			src/sys/arch/hp300/conf/GENERIC
924			src/sys/arch/hp700/conf/GENERIC
925			src/sys/arch/hpcarm/conf/JORNADA728
926			src/sys/arch/hpcmips/conf/GENERIC
927			src/sys/arch/hpcsh/conf/GENERIC
928			src/sys/arch/hpcsh/conf/HPW650PA
929			src/sys/arch/i386/conf/GENERIC
930			src/sys/arch/i386/conf/GENERIC.MP
931			src/sys/arch/i386/conf/XEN0
932			src/sys/arch/i386/conf/XENU
933			src/sys/arch/ibmnws/conf/GENERIC
934			src/sys/arch/iyonix/conf/GENERIC
935			src/sys/arch/luna68k/conf/GENERIC
936			src/sys/arch/mac68k/conf/GENERIC
937			src/sys/arch/macppc/conf/GENERIC
938			src/sys/arch/macppc/conf/GENERIC.MP
939			src/sys/arch/mipsco/conf/GENERIC
940			src/sys/arch/mmeye/conf/GENERIC
941			src/sys/arch/mvme68k/conf/GENERIC
942			src/sys/arch/netwinder/conf/GENERIC
943			src/sys/arch/news68k/conf/GENERIC
944			src/sys/arch/newsmips/conf/GENERIC
945			src/sys/arch/next68k/conf/GENERIC
946			src/sys/arch/ofppc/conf/GENERIC
947			src/sys/arch/pc532/conf/GENERIC
948			src/sys/arch/pmax/conf/GENERIC
949			src/sys/arch/prep/conf/GENERIC
950			src/sys/arch/sandpoint/conf/GENERIC
951			src/sys/arch/sbmips/conf/GENERIC
952			src/sys/arch/sgimips/conf/GENERIC32_IP3x
953			src/sys/arch/shark/conf/GENERIC
954			src/sys/arch/sparc/conf/GENERIC
955			src/sys/arch/sparc/conf/GENERIC.MP
956			src/sys/arch/sparc64/conf/GENERIC
957			src/sys/arch/sparc64/conf/GENERIC.MP
958			src/sys/arch/sun2/conf/GENERIC
959			src/sys/arch/sun3/conf/GENERIC
960			src/sys/arch/vax/conf/GENERIC
961			src/sys/arch/vax/conf/GENERIC.MP
962			src/sys/arch/x68k/conf/GENERIC
963
964			src/sys/arch/playstation2/conf/GENERIC
965
966Branch:		yamt-pdpolicy
967Description:	play with page replacement policy
968		- separate page replacement policy from the rest of kernel
969		- implement alternative replacement policy
970		- related read-ahead adjustment?
971Status:		Terminated; merged to -current
972Start Date:	Sun Mar  5 2006
973End Date:	Sat Sep 16 2006
974Base Tag:	yamt-pdpolicy-base9
975Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
976Scope:		src/sys  (src/common is tagged but not branched)
977Notes:		
978
979Branch:		yamt-readahead
980Description:	play with file readahead
981Status:		Terminated; merged to -current
982Start Date:	Mon Nov 14 2005
983End Date:	Wed Nov 30 2005
984Base Tag:	yamt-readahead-base3
985Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
986Scope:		src/sys
987Notes:		
988
989Branch:		yamt-uio_vmspace
990Description:	uio_lwp/uio_segflg -> uio_vmspace
991Status:		Terminated; merged to -current
992Start Date:	Mon Dec 31 2005
993End Date:	Wed Mar  1 2006
994Base Tag:	yamt-uio_vmspace-base5
995Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
996Scope:		src/sys
997Notes:		
998
999Branch:		yamt-vop
1000Description:	remove several VOPs
1001Status:		Terminated; merged to -current
1002Start Date:	Wed Oct 19 2005
1003End Date:	Wed Nov  2 2005
1004Base Tag:	yamt-vop-base3
1005Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1006Scope:		src/sys
1007Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
1008
1009Branch:		gdamore-uart
1010Description:	Add register table support to com driver.
1011Status:		Active
1012Start Date:	14 June 2006
1013End Date:	13 July 2006
1014Base Tag:	gdamore-uart-base
1015Maintainer:	Garrett D'Amore <gdamore@NetBSD.org>
1016Scope:		kernel
1017Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
1018		com support, and also removes a nasty hack from Atheros com.
1019
1020
1021########################################################################
1022# Other:
1023########################################################################
1024
1025Branch:		magnum
1026Description:	?
1027Status:		?
1028Start Date:
1029End Date:
1030Base Tag:	magnum-base
1031Maintainer:	?
1032Scope:		kernel
1033Notes:
1034
1035