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