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