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