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