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