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