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