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