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