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