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