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