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