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