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