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