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