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