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