BRANCHES revision 1.206
1#	$NetBSD: BRANCHES,v 1.206 2007/08/27 15:57:00 matt 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:		ad-audiomp
212Description:	Add MP locking to the audio drivers
213Status:		Active
214Start Date:	28 Febuary 2007
215End Date:
216Base Tag:	ad-audiomp-base
217Maintainer:	Andrew Doran <ad@NetBSD.org>
218Scope:		kernel
219Notes:		Making the audio drivers MP safe is necessary before efforts
220		can be made to make the VM system MP safe. About 1/2 of the
221		drivers are converted, the remaining 1/2 need more changes.
222
223		As of import this is snapshot of work in progress and so
224		may not compile; in particular the midi changes are very
225		much "in progress". The audio component has been tested
226		and verified to work with emuxki and auvia. There may
227		be a locking issue in the ac97 code at boot.
228
229		The are two locks per device instance, an ISR lock and
230		a character device lock. The ISR lock replaces calls to
231		splaudio()/splx(), and will be held across calls to device
232		methods which were called at splaudio() before (e.g.
233		trigger_output). The character device lock is held across
234		calls to nearly all of the methods, excluding some only
235		used for initializtion, e.g. get_locks. This needs to be
236		documented at merge time.
237
238		To test on a multi way x86 system, search for "mpsafe" in
239		x86/x86/intr.c and change IPL_SCHED to IPL_AUDIO. Run a job
240		that will acquire the ISR lock (depends on the hardware, but
241		"while true; do mixerctl -a > /dev/null; done" may suffice).
242		Play audio, run lockstat and verify that that there is
243		contention on the ISR lock.
244
245Branch:		bjh21-hydra
246Description:	Simtec Hydra support and ARM SMP in general
247Status:		Dormant
248Start Date:	18 Oct 2002
249End Date:
250Base Tag:	bjh21-hydra-base
251Maintainer:	Ben Harris <bjh21@NetBSD.org>
252Scope:		sys/arch/arm sys/arch/acorn32
253Notes:		This code was on a branch because it involves changes to
254		cpuswitch.S which would otherwise make merging the
255		nathanw_sa branch difficult.
256
257Branch:		chris-arm-intr-rework
258Description:	Rework arm interrupt handling code
259Status:		Active
260Start Date:	11 Aug 2007
261End Date:
262Base Tag:	chris-arm-intr-rework-base
263Maintainer:	Chris Gilbert <chrisNetBSD.org>
264Scope:		sys/arch/arm sys/arch/cats (other arm archs to follow)
265Notes:		Rework arm interrupt code to provide a shared set of interrupt
266		routines, and allow improvements to be shared across all arm
267		based hardware.
268
269Branch:		gmcgarry_ctxsw
270Description:	Separate scheduler from context-switch code
271Status:		Dormant
272Start Date:	18 December 2002
273End Date:
274Base Tag:	gmcgarry_ctxsw_base
275Maintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
276Scope:		kernel
277Notes:		Removing knowledge of the schedular and its run queues
278		from the machine-dependent context switch code is the
279		first step in cleaning up the scheduler.  It is necessary
280		for the newlock branch, making the scheduler SMP friendly,
281		adding real-time scheduler extensions, and reducing the
282		number of code paths for LWP and proc switching.
283
284Branch:		gmcgarry_ucred
285Description:	Integrate and encapsulate user credentials
286Status:		Dormant
287Start Date:	18 December 2002
288End Date:
289Base Tag:	gmcgarry_ucred_base
290Maintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
291Scope:		kernel
292Notes:		merge pcred and ucred and poolify
293
294Branch:		hpcarm-cleanup
295Description:	Fix build problems for hpcarm
296Status:		Active
297Start Date:	31 July 2007
298End Date:
299Base Tag:	hpcarm-cleanup-base
300Maintainer:	Robert Swindells <rjs@NetBSD.org>
301Scope:		kernel
302Notes:		Modify SA11x0 interrupt code to match PXA2x0 equivalent.
303
304Branch:		itohy-usb1
305Description:	USB stack overhaul, mostly DMA related
306Status:		Active
307Start Date:	22 May 2007
308End Date:
309Base Tag:	itohy-usb1-base
310Maintainer:	ITOH Yasufumi <itohy@NetBSD.org>
311Scope:		kernel
312Notes:		To check out the kernel source tree,
313		1. check out checkout script
314			cvs checkout -ritohy-usb1 src/sys/dev/usb/filelist
315		2. update files in the branch
316			sh -e src/sys/dev/usb/filelist
317
318Branch:		jmcneill-pm
319Description:	Power management framework overhaul, ACPI improvements
320Status:		Active
321Start Date:	3 Aug 2007
322End Date:	
323Base Tag:	jmcneill-pm-base
324Scope:		kernel
325Notes:		
326
327Branch:		kame
328Description:	KAME Project
329Status:		Dormant
330Start Date:	28 Jun 1999
331End Date:
332Base Tag:
333Maintainer:	Jun-ichiro itojun Hagino <itojun@NetBSD.org>
334Scope:		kernel
335Notes:		http://www.kame.net
336		Used for "reference" purposes for early part of KAME
337		integration effort.  The branch is not actively used, as I
338		(itojun) use patch(1) and diff(1) for the KAME syncs.
339
340Branch:		kent-audio2
341Description:	In-kernel audio mixer
342Status:		Active
343Start Date:	Sun Jan 16 2005
344End Date:	
345Base Tag:	kent-audio2-base
346Maintainer:	TAMURA Kent <kent@NetBSD.org>
347Scope:		kernel (audio device drivers)
348Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
349		Please consult with the maintainer before committing
350		to this branch.
351		This branch is not expected to be compilable yet.
352
353Branch:		matt-timespec
354Description:	Convert the kernel to struct timespec as its primary time
355		storage mechanism.
356Status:		Inactive
357Start Date:	2005-02-19
358End Date:
359Base Tag:	
360Maintainer:	Matt Thomas <matt@NetBSD.org>
361Scope:		kernel
362Notes:	
363
364Branch:		matt-mips64
365Description:	Rototill the mips code to support LP64 mips and N32/N64 ABIs
366Status:		Active
367Start Date:	2007-07-17
368End Date:
369Base Tag:	matt-mips64-base
370Maintainer:	Matt Thomas <matt@NetBSD.org>
371Scope:		kernel & userland
372Notes:	
373
374Branch:		matt-armv6
375Description:	Rototill the arm code to support features present in the
376		v6 of the ARM Architecure.  Additionally, clean up things
377		along the way to use common practices.
378Status:		Active
379Start Date:	2007-08-27
380End Date:
381Base Tag:	matt-armv6-base
382Maintainer:	Matt Thomas <matt@NetBSD.org>
383Scope:		kernel & userland
384Notes:	
385
386Branch:		newlock
387Description:	New locking primitives, based on Solaris's
388Status:		Terminated
389Start Date:	March 9, 2002
390End Date:	Febuary 12, 2007
391Base Tag:	newlock-base
392Maintainer:	Jason R. Thorpe <thorpej@NetBSD.org>
393Scope:		Kernel
394Notes:		The goal is to replace the existing lockmgr() and
395		simple_lock() based locking mechanisms with the
396		primitives found in Solaris: mutexes and rwlocks.
397		Superseeded by the newlock2 branch.
398
399Branch:		newlock2
400Description:	New locking primitives, based on Solaris's
401Status:		Terminated
402Start Date:	September 9, 2006
403End Date:	Febuary 12, 2007
404Base Tag:	newlock2-base
405Maintainer:	Andrew Doran <ad@NetBSD.org>
406Scope:		Kernel
407Notes:		As per the newlock branch, however given the amount of time
408		the original branch has lain dormant, a new one has been
409		created.  Goals:
410		- Implement new locking primitives on most-used ports.
411		- Minor locking improvements.
412		- Remove spinlockmgr().
413
414Branch:		nick-csl-alignment
415Description:	Provide correctly aligned __cpu_simple_lock_t for hppa
416Status:		Active
417Start Date:	2007-07-18
418End Date:
419Base Tag:	nick-csl-alignment-base2
420Maintainer:	Nick Hudson <skrll@NetBSD.org>
421Scope:		sys, lib/libpthread, lib/libpthread_dbg
422Notes:	
423
424Branch:	  	pkgviews
425Description:  	package views, enabling multiple conflicting packages to co-exist
426Status:		Active
427Start Date:	22 July 2002
428End Date:
429Base Tag:	pkgviews
430Maintainer:	Alistair Crooks <agc@NetBSD.org>
431Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
432Notes:		A more flexible infrastructure for third-party packages by
433		allowing multiple conflicting packages and versions to co-exist
434		within the same tree
435
436Branch:		ppcoea-renovation
437Description:	General renovation and cleanup of all OEA PowerPC ports.
438Status:		Active
439Start Date:	30 April 2007
440End Date:
441Base Tag:	ppcoea-renovation-base
442Maintainer:	Tim Rightnour <garbled@netbsd.org>
443Scope:		src/sys/arch
444Notes:		This branch is for a general cleanup of all OEA-based PowerPC
445		ports. OEA (Operating Environment Architecture) PowerPC refers
446		to the 601, 603, 604, and similar chips.  Specifically, not the
447		403/401 and other embedded chips. The general concept is to get
448		them all compiling, and sharing as much code as possible.  All
449		developers are welcome to commit to this branch.
450
451Branch:		rpaulo-netinet-merge-pcb
452Description:	merge in6pcb with inpcb
453Status:		Dormant
454Start Date:	Wed Feb 01 2006
455End Date:	
456Base Tag:	rpaulo-netinet-merge-pcb-base
457Maintainer:	Rui Paulo <rpaulo@NetBSD.org>
458Scope:		src/sys
459Notes:		No longer active due to the lack of time. If you plan to
460		continue this branch, sys/netinet/in_pcb.h already contains
461		the proposed structure layout (which was roughly discussed
462		in the tech-net mailing list).
463		I also defined INP_*() macros to mimicate FreeBSD's inpcb
464		locking style, but currently they do nothing and are not
465		yet called at the correct places (needs discussion about
466		kernel fine-grained locking).
467		To continue this branch, one needs to read all the relevant
468		inpcb/in6pcb source files and change the function names,
469		structure names, structure fileds according to the new
470		layout (in6pcb is gone).
471		Don't try to build a kernel from this branch because it won't
472		work. The missing pieces required to do a complete build
473		were not committed because they were incomplete and generated
474		panics.
475		You shouldn't need to worry about KAME syncs because
476		they did most of them by now.
477		After the work is done, you are required to test the branch
478		(before the merge to -current) with an interop IPv6 test.
479		More info at: http://www.tahi.org/
480
481Branch:		rtr-xorg-branch
482Description:	xorg & static build alterations to src/x11
483Status:		Active
484Start Date:	Nov 15 2004
485End Date:	
486Base tag:	rtr-xorg-branch-base
487Maintainer:	Tyler R. Retzlaff <rtr@NetBSD.org>
488Scope:		x11
489		distrib/sets/lists
490		share/mk/bsd.x11.mk
491		share/mk/bsd.own.mk
492		etc/mtree/NetBSD.dist
493Notes:		Requires parts of xsrc/xfree (HEAD)
494		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
495		Requires xorg (XORG-6_8_1)
496
497Branch:  	wrstuden-fixsa
498Description:	Fix a number of issues present with Scheduler Activations.
499Status: 	Active
500Start Date:	15 May 2007
501End Date:
502Base Tag:	wrstuden-fixsa-base
503Maintainer:	Bill Stouder-Studenmund <wrstuden@NetBSD.org>
504Scope:		src, though all the interesting stuff is in the kernel
505		or lib/libpthread or maybe gdb.
506Notes:		This branch is based off of the netbsd-4 branch!
507		This branch is intended to stage improvements for the
508		Scheduler Activations system for NetBSD 4. Improvements
509		include not allocating memory while preparing to tsleep(),
510		reducing inappropriate upcall delivery (hopefully also
511		eliminating the need to mlock stacks), and being
512		able to pthread_kill() running threads.
513
514Branch:		vmlocking
515Description:	Make memory allocators and trap handling MP safe
516Status:		Active
517Start Date:	13 March 2007
518End Date:
519Base Tag:	vmlocking-base
520Maintainer:	Andrew Doran <ad@NetBSD.org>
521Scope:		kernel
522Notes:
523		- Replace all simplelocks with mutexes
524		- Remove spinlockmgr
525		- Make memory allocators MP safe
526		- Make trap handling MP safe: push kernel lock acquire
527		  back into pager ops.
528
529		Only i386 is currently update.  Most per architecture
530		changes need to be made in the pmap module.  LFS is not
531		currently stable due interaction between the pagedaemon (?)
532		and the HOLDRELE() in lfs_segment.c.  It may trash your
533		filesystem..
534
535		Most of the locks replaced are now sleep/adaptive locks or
536		spin locks at IPL_VM.  Assuming audio interrupt handlers
537		are made MP safe there are far fewer potential deadlocks
538		against the kernel lock.
539
540		v_interlock becomes an adaptive mutex so now acquring
541		it can potentially block, similarly for other locks
542		that were before simplelocks.  This needs to be audited
543		carefully.
544
545		Use vnodes in general needs to be audited, as vnodes can
546		now be inspected without the kernel lock held.
547
548		Acquiring locks in the pmap module can now block, meaning
549		that the current pmap, cpu or lazy pmap status can change
550		out from underneath the requestor.  This also needs to be
551		audited.
552
553		Currently, i386 has the necessary modifications, and has
554		trap handling and a few calls to allocators out from under
555		the kernel lock.  There are still problems that need to be
556		debugged.
557
558		Need to check that whenever a lock is initialized, it is
559		also destroyed.
560
561		Lots of testing required.
562
563Branch:		yamt-lazymbuf
564Description:	implement and evaluate lazy mapping of mbuf external data pages
565		also, change the way to share mbuf external storage.
566		it's intended as the first step of larger changes.
567			1. support operations (esp. bus_dma load) on
568			   unmapped mbuf.
569			2. unify mbuf and buf.
570			   (or, at least some parts of them)
571			3. then it should be trivial to implement
572			   i/o coalescing, etc.
573Status:		Active
574Start Date:	Wed Jul  6 2005
575End Date:	
576Base Tag:	yamt-lazymbuf-base4
577Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
578Scope:		src/sys  (src/common is tagged but not branched)
579Notes:		
580		i386		DONE
581		amd64		DONE
582		other ports should work as the trunk does.
583		(conditionalized by __HAVE_LAZY_MBUF macro)
584
585Branch:		reinoud-bufcleanup
586Description:	implement and evaluate struct buf usage cleanup strategies.
587		Ideas currently in mind (preference for b):
588		a)
589			1. use of bio_ops per buffer.
590			2. allow chaining/overloading of functions in bio_ops
591			   and provide some private context.
592			3. extend the bio_ops with commenly used functionality
593			   like pending action counting, custom context passing,
594			   last minute processing of buffer data, buffer cache
595			   etc.
596			4. investigate the use of the kcont()
597			   continuation-passing framework for async io
598			   completion notification for bufs
599			...
600		b)
601			1. all sequencing use of B_CALL replaced by
602			   device-threads, if possible generic code around BUFQ
603			2. possibly use kcont() for async IO finished signalling
604			3. counter of pending and queued actions requestable
605			   by IOCTL interface?
606			4. implement `last minute buffer fixup' calls and maybe
607			   even finished I/O calls as vnode operations
608			...
609Status:		Active
610Start Date:	Thu Mar 15 2007
611End Date:
612Base Tag:	reinoud-bufcleanup-base
613Maintainer:	Reinoud Zandijk <reinoud@NetBSD.org>
614Scope:		src/sys and src/common
615Notes:		Used as expiriment sandbox and if successful hopefully one day
616		to be intergrated.
617
618Branch:		thorpej-atomic
619Description:	Implementation of an atomic memory operations API modeled
620		after the one in Solaris 10.
621Status:		Active
622Start Date:	Apr 11 2007
623End Date:
624Base tag:	thorpej-atomic-base
625Maintainer:	Jason Thorpe <thorpej@netbsd.org>
626Scope:		src/common
627		src/sys
628Notes:		Base atomic primitives need to be implemented for
629		all of the supported architectures:
630
631		alpha		DONE
632		arm		DONE
633		hppa
634		i386		DONE
635		ia64
636		m68k		DONE (except for 68010)
637		mips
638		ns32k
639		powerpc		DONE except for membar_*()
640		powerpc64	DONE except for membar_*()
641		sh3
642		sparc		DONE except for membar_*()
643		sparc64		DONE except for membar_*()
644		vax
645		x86_64		DONE
646
647		Tested:
648
649		alpha		NO
650		arm		NO
651		hppa		NO
652		i386		NO
653		ia64		NO
654		m68k		NO
655		mips		NO
656		ns32k		NO
657		powerpc		NO
658		powerpc64	NO
659		sh3		NO
660		sparc		NO
661		sparc64		NO
662		vax		NO
663		x86_64		NO
664
665		TODO:
666
667		all		- Need to replace mb_*() with membar_*().
668
669				- Audit MUTEX_CAS() and RWLOCK_CAS() uses
670				  to see of membar_enter() is required here.
671
672				- Talk to ad@ -- figure out of non-atomic
673				  mutex / rwlock release is actually safe.
674
675		arm		- Consider using a RAS technique like
676				  MIPS uses for _lock_cas() and the mutex
677				  stubs.  Possibly do more than one atomic
678				  op as a RAS.  Possibly implement mutex
679				  stubs using the technique.
680
681		m68k		- Need to do 68010 support.
682		
683		i386		- Need to change when x86_patch() is called
684				  so we can test ncpus.
685
686		powerpc		- Figure out if we need barriers in the
687				  atomic ops themselves (hopefully not!)
688
689		x86_64		- Need to change when x86_patch() is called
690				  so we can test ncpus.
691
692########################################################################
693# Individual developers' branches (Terminated):
694########################################################################
695
696Branch:		bouyer-scsipi
697Description:	Integration of atapi support
698Status:		Terminated
699Start Date:
700End Date:
701Base Tag:
702Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
703Scope:		kernel
704Notes:		Superseded by thorpej_scsipi
705
706Branch:		bouyer-xen2
707Description:	update xen port to xen 2.0, with support for domain0 operations
708Status:		Terminated
709Start Date:	Dec 13 2004
710End Date:	Mar 10 2005
711Base Tag:	netbsd-2-base
712Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
713Scope:		src/sys/arch/xen
714Notes:
715
716Branch: 	chap-midi
717Description:	Renovation of MIDI support
718Status: 	Terminated; merged to -current
719Start Date:	19 May 2006
720End Date:	30 Jun 2006
721Base Tag:	chap-midi-base
722Maintainer:	Chapman Flack <chap@NetBSD.org>
723Scope:		sys, share/man, usr.bin
724Notes:
725
726Branch:		chs-ubc
727Description:	Unified Buffer Cache
728Status:		Terminated
729Start Date:
730End Date:
731Base Tag:	chs-ubc-base
732Maintainer:	Chuck Silvers <chs@NetBSD.org>
733Scope:		kernel
734Notes:
735
736Branch:		chs-ubc2
737Description:	 Unified Buffer Cache
738Status:		Terminated; merged to -current
739Start Date:
740End Date:
741Base Tag:	chs-ubc2-base, chs-ubc2-newbase
742Maintainer:	Chuck Silvers <chs@NetBSD.org>
743Scope:		kernel
744Notes:
745
746Branch:		cjs-build-against-obj-dir
747Description:	?
748Status:		?
749Start Date:
750End Date:
751Base Tag:
752Maintainer:	Curt Sampson <cjs@NetBSD.org>
753Scope:		Entire tree.
754Notes:
755
756Branch:		eeh-paddr_t
757Description:	use separate types for virtual vs. physical addresses
758Status:		Terminated; merged to -current
759Start Date:
760End Date:
761Base Tag:	eeh-paddr_t-base
762Maintainer:	Eduardo Horvath <eeh@NetBSD.org>
763Scope:		kernel
764Notes:		This is needed to support 32-bit kernels on sparc64.
765
766Branch:		elad-kernelauth
767Description:	Native NetBSD implementation of Apple's kernel authorization
768		based on TN2127. This is a "clean-room" implementation to
769		avoid any licensing issues.
770Status:		Terminated; merged to -current
771Start Date:	Tue Mar	 7 2006
772End Date:	Mon May 15 2006
773Base Tag:	elad-kernelauth-base
774Maintainer:	Elad Efrat <elad@NetBSD.org>
775Scope:		src/sys, src/share/man/man9/Makefile,
776		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
777Notes:
778
779Branch:		fvdl-softdep
780Description:	FFS soft dependencies
781Status:		Terminated; merged to -current
782Start Date:
783End Date:
784Base Tag:	fvdl-softdep-base
785Maintainer:	Frank van der Linden <fvdl@NetBSD.org>
786Scope:		kernel
787Notes:
788
789Branch:		gehenna-devsw
790Description:	auto-generation of devsw table
791Status:		Terminated
792Start Date:	16 May 2002
793End Date:	6 Sep 2002
794Base Tag:	gehenna-devsw-base
795Maintainer:	MAEKAWA Masahide <gehenna@NetBSD.org>
796Scope:		syssrc
797Notes:		The goal is to get rid of the existing device switch tables in
798		port-dependent conf.c and to generate them dynamically by
799		config(8).
800
801Branch:		is-newarp
802Description:	ARP for non-Ethernet
803Status:		Terminated; merged before NetBSD 1.3
804Start Date:	1996/10/13
805End Date:	1997/03/15
806Base Tag:	is-newarp-base
807Maintainer:	Ignatios Souvatzis <is@NetBSD.org>
808Scope:		kernel
809Notes:
810
811Branch:		kenh-if-detach
812Description:	Interface detach support.
813Status:		?
814Start Date:
815End Date:
816Base Tag:	kenh-if-detach-base
817Maintainer:	Ken Hornstein <kenh@NetBSD.org>
818Scope:		kernel
819Notes:
820
821Branch:		kent-audio1
822Description:	Audio converter pipeline
823Status:		Terminated; merged to -current
824Start Date:	Tue Dec  7 2004
825End Date:	Tue Jan 11 2005
826Base Tag:	kent-audio1-base
827Maintainer:	TAMURA Kent <kent@NetBSD.org>
828Scope:		kernel (audio device drivers)
829Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
830		Please consult with the maintainer before committing
831		to this branch.
832
833Branch:		kqueue
834Description:	kqueue kernel event notification mechanism (from FreeBSD)
835Status:		Terminated; merged to -current
836Start Date:	Tue Jul 10 23:08:38 EST 2001
837End Date:	Tue Oct 24 09:14:14 GMT 2002
838Base Tag:	kqueue-base
839Maintainer:	Jaromir Dolecek <jdolecek@NetBSD.org>
840Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
841Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
842		local internal changes to better suit NetBSD, and
843		enhancements such as looking up filters by name or
844		number, and dynamic registration of "user" filters.
845		The work is complete as is, but is awaiting more
846		feedback from various kernel gurus before going mainline.
847
848Branch:		ktrace-lwp
849Description:	ktrace support for lwp ids.
850Status:		Terminated; merged to -current
851Start Date:	Wed Jul  2 15:27:30 UTC 2003
852End Date:	Sun Dec 11 12:25:29 UTC 2005
853Base Tag:	ktrace-lwp-base
854Maintainer:	Darren Reed <darrenr@NetBSD.org>
855Scope:		sys
856Notes:		
857
858Branch:		marc-pcmcia
859Description:	PCMCIA support
860Status:		Terminated; merged to -current
861Start Date:
862End Date:
863Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
864Maintainer:	Marc Horowitz <marc@NetBSD.org>
865Scope:		kernel
866Notes:
867
868Branch:		minoura_x68k_bus_h
869Description:	bus_space(9) and bus_dma(9) implementation for x68k
870Status:		Terminated; merged to -current
871Start Date:	23 Dec 1998
872End Date:	16 Mar 1999
873Base Tag:	minoura_x68k_bus_h-base
874Maintainer:	Minoura Makoto <minoura@NetBSD.org>
875Scope:		sys/arch/x68k
876Notes:
877
878Branch:		minoura-xpg4dl
879Description:	Citrus Project locale subsystem
880Status:		Terminated; (partly) merged to -current
881Start Date:	28 March 2000
882End Date:
883Base Tag:	minoura-xpg4dl-base
884Maintainer:	Minoura Makoto <minoura@NetBSD.org>
885Scope:		basesrc, syssrc, sharesrc
886Notes:		Citrus Project is developing dynamically-loadable, codeset-
887		independent locale subsystem.  Part of the implementation
888		(LC_CTYPE) called XPG4DL is now integrated to -current.
889
890Branch:		mjf-ufs-trans
891Description:	filesystem transactions for ufs
892Status:		Active
893Start Date:	12 March 2007
894End Date:
895Base Tag:	mjf-ufs-trans-base
896Maintainer:	Matt Fleming <mjf@NetBSD.org>
897Scope:		kernel
898Notes:
899
900Branch:		mrg-vm-swap
901Description:	dynamic swap allocation, swap-to-files support
902Status:		Terminated; abondoned for mrg-vm-swap2
903Start Date:	12 February 1997
904End Date:	15 March 1997
905Base Tag:	[none]
906Maintainer:	Matthew R. Green <mrg@NetBSD.org>
907Scope:		kernel
908Notes:
909
910Branch:		mrg-vm-swap2
911Description:	dynamic swap allocation, swap-to-files support
912Status:		Terminated; merged to -current
913Start Date:	4 May 1997
914End Date:	12 June 1997
915Base Tag:	mrg-vm-swap2-base
916Maintainer:	Matthew R. Green <mrg@NetBSD.org>
917Scope:		kernel
918Notes:
919
920Branch:		nathanw_sa
921Description:	Scheduler activations
922Status:		Terminated; merged to -current
923Start Date:	5 March 2001
924End Date:	18 January 2003
925Base Tag:	nathanw_sa_base
926Maintainer:	Nathan Williams <nathanw@NetBSD.org>
927Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
928		bin/ps usr.bin/systat usr.bin/top usr.bin/w
929		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
930Notes:		The idea of scheduler activations is described in the
931		classic paper by Anderson et al., in ACM Transactions
932		a on Computer Systems volume 10 issue 1 (1992),which
933		can be found at
934		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
935		Many ideas in the implementation are based on the
936		implementation of scheduler activations added to Mach
937		3.0 and described by Davis et al. in the University of
938		Washington CS tech report 92-08-93, which can be found
939		at
940		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
941
942		My USENIX paper on the subject can be found at
943		http://web.mit.edu/nathanw/www/usenix/
944
945		Please consult with the maintainer before committing
946		to this branch.
947		Other tags starting with nathanw_sa reserved for
948		branch management and are not guaranteed to be stable.
949
950		Trunk tagged with "nathanw_sa_before_merge" prior to
951		merging branch down to trunk.  Branch tagged with
952		"nathanw_sa_end" to indicate the ending revision of
953		the branch.
954
955Branch:		perseant-lfsv2
956Description:	LFS incompatible on-disk data structure changes
957Status:		Terminated
958Start Date:	27 June 2001
959End Date:	16 July 2001
960Base Tag:	perseant-lfsv2-base
961Maintainer:	Konrad Schroder <perseant@NetBSD.org>
962Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
963Notes:		This branch should be short-lived, I expect to merge as soon
964		as the data structures required for unremove are in and tested.
965
966Branch:		thorpej-devvp
967Description:	replace dev_t with struct vnode * in devsw entry points
968Status:		Terminated
969Start Date:	Sep 6 2001
970End Date:	???
971Base Tag:	thorpej-devvp-base
972Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
973Scope:		syssrc
974Notes:		Kernels built from this branch are not expected
975		to function correctly at this time.
976
977		Ports known to compile on this branch:
978			alpha
979			i386
980
981Branch:		peter-altq
982Description:	New ALTQ framework:
983		- sync with KAME sources
984		- share mtag/name mapping functions
985		- separate altq + pf attachment
986Status:		Terminated; merged to -current
987Start Date:	March 16, 2006
988End Date:	October 12, 2006
989Base Tag:	peter-altq-base
990Maintainer:	Peter Postma <peter@NetBSD.org>,
991		Martin Husemann <martin@NetBSD.org>,
992		Matthias Scheler <tron@NetBSD.org>
993Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
994Notes:		Only the first item in the description was finished
995		in this branch.
996
997Branch:		sommerfeld_i386mp_1
998Description:	Multiprocessor support for i386 using Intel MP BIOS.
999Status:		Terminated; merged to -current
1000Start Date:	21 Feb 2000
1001End Date:	01 Oct 2002
1002Base Tag:	sommerfeld_i386mpbase_1
1003Maintainer:	Bill Sommerfeld <sommerfeld@NetBSD.org>
1004Scope:		sys/arch/i386
1005Notes:
1006		Code committed to the branch has booted to multiuser 
1007		on at least one system.
1008
1009		Not guaranteed to compile against mainline since -current
1010		may have changed incompatibly with the last branch update;
1011		use "cvs update -D" to roll-back the rest of the tree to match.
1012
1013		Please get explicit permission from the maintainer 
1014		before each commit, or your changes will be backed out.
1015		Other tags starting with sommerfeld_ are private to 
1016		the developer and are guaranteed to be unstable.
1017		Only the maintainer should move tags.
1018
1019		Note that this branch uses a DIFFERENT scheme for 
1020		synching with the mainline.  the maintainer uses some private
1021		scripts for keeping them in synch; if you make commits 
1022		to the branch to "resynchronize" things, you'll
1023		probably do it wrong; instead, ask the maintainer to
1024		resynchronize things.
1025
1026		See sys/arch/i386/TODO on the branch for a list of known
1027		issues with the branch.
1028
1029Branch:		thorpej-mips-cache
1030Description:	overhaul MIPS cache support code
1031Status:		Terminated; merged to -current
1032Start Date:	Oct 23 2001
1033End Date:	Nov 14 2001
1034Base Tag:	thorpej-mips-cache-base
1035Scope:		syssrc
1036Notes:		This branch needs more debugging, testing, and more
1037		ports need to be converted to the new world order.
1038
1039		The following processors have had cache ops
1040		written:
1041
1042			* R2000/R3000 (cache_r3k) -- light testing,
1043			  needs to be beat on a lot more to make
1044			  sure it's working.
1045
1046			* R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org
1047			  tracked down a bug, which has been fixed.
1048
1049			  Confirmed working on R4000-with-L2.
1050
1051			  Confirmed working on R4400-no-L2 and
1052			  R4400-with-L2.
1053
1054			* R4600/R5000 (cache_r5k) -- shin@NetBSD.org
1055			  has committed fixes to this code.
1056
1057			  Confirmed working on R4600 v2 (SGI IP-22 with
1058			  no SysAD L2 cache).
1059
1060			  Confirmed working on RM5260 (Algorithmics P-5064).
1061
1062			* TX39 (cache_tx39) -- uch@NetBSD.org has
1063			  committed fixes to this code.  Awaiting
1064			  confirmation that it is working properly.
1065
1066			* R5900 (cache_r5900) -- uch@NetBSD.org has
1067			  written this code and tested it on a
1068			  PlayStation 2.
1069
1070		The following ports have been updated to compile (and
1071		use optimized-for-processor bus_dma routines).  Those
1072		that have been tested and work are marked with [WORKING].
1073
1074			* algor		[WORKING]
1075
1076			* arc		[WORKING]
1077
1078			* pmax		[WORKING]
1079
1080			* playstation2	[WORKING]
1081					Needs optimized bus_dmamap_sync().
1082
1083			* hpcmips	[need verification that this is working]
1084					Needs optimized bus_dmamap_sync().
1085
1086			* sgimips	[WORKING]
1087					Needs optimized bus_dmamap_sync().
1088
1089			* cobalt	[need testing]
1090
1091			* mipsco	[need testing]
1092
1093			* newsmips	[need testing]
1094
1095Branch:		thorpej_scsipi
1096Description:	SCSI/ATAPI midlayer rewrite.
1097Status:		Terminated; merged to -current
1098Start Date:
1099End Date:	Apr 25 2001
1100Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
1101Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>,
1102		Jason Thorpe <thorpej@NetBSD.org>
1103Scope:		syssrc
1104Notes:		When a change from -current is pulled up please move the
1105		thorpej_scsipi_base tag to the revision you're syncing with.
1106		thorpej_scsipi_nbase is private to maintainer (only
1107		used when syncing the whole branch with HEAD).
1108		Just before the merge, syssrc has been tagged with
1109		thorpej_scsipi_beforemerge
1110
1111Branch:		thorpej-signal
1112Description:	?
1113Status:		?
1114Start Date:
1115End Date:
1116Base Tag:	thorpej-signal-base
1117Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
1118Scope:		kernel
1119Notes:
1120
1121Branch:		thorpej-setroot
1122Description:	?
1123Status:		Terminated; merged to -current
1124Start Date:
1125End Date:
1126Base Tag:
1127Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
1128Scope:		kernel
1129Notes:
1130
1131Branch:		simonb-timecounters
1132Description:	Port FreeBSD timecounters to NetBSD
1133Status:		Terminated
1134Start Date:	Sat Feb 04 2006
1135End Date:	Wed Jun 07 2006
1136Base Tag:	simonb-timecounters-base
1137Maintainer:	Simon Burge <simonb@NetBSD.org>,
1138		Frank Kardel <kardel@NetBSD.org>
1139Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
1140Notes:		early (partial conversion) commit to -current
1141		ok'ed by core@ on 20060605 for testing and further
1142		simplified conversion
1143
1144Branch:		wrstuden-devbsize
1145Description:	Modify buffer cache to deal with different devices having
1146		different block sizes. Also DEV_BSIZE would go away.
1147Status:		Terminated
1148Start Date:	Aug or Sept 1999
1149End Date:	1 Apr 2000
1150Base tag:	wrstuden-devbsize-base
1151Maintainer:	Bill Studenmund <wrstuden@NetBSD.org>
1152Scope:		kernel
1153Notes:		No longer active due to lack of time, and introduction
1154		of UBC. In terms of UBC, the primary cache for
1155		file data is the VM cache, which needs to operate
1156		in terms of VM pages. As no existing device has native
1157		pages the same size as our VM pages, there already is
1158		a mapping going on between the VM system and the
1159		underlying blocks. So it would be easier and cleaner
1160		to adjust that to deal w/ different block sizes.
1161		Also with UBC, all i/o is in terms of bytes at an offset
1162		with a certain length, so the exact block size isn't a big
1163		deal.
1164
1165		Any other wrstuden-devbsize tag may (and should) go away.
1166
1167Branch:		yamt-idlelwp
1168Description:	idle lwp, and some changes depending on it.
1169
1170		1. separate context switching and thread scheduling.
1171		   (cf. gmcgarry_ctxsw)
1172		2. implement idle lwp.
1173		3. clean up related MD/MI interfaces.
1174		4. make scheduler(s) modular.
1175
1176Status:		Terminated; merged to -current
1177Start Date:	Fri Feb 17 2007
1178End Date:	Thu May 17 2007
1179Base Tag:	yamt-idlelwp-base8
1180Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1181Scope:		src/sys  (src/common is tagged but not branched)
1182Notes:		
1183		Status of ports:
1184		  alpha			[ Done, UP tested, MP not tested ]
1185		  i386			[ Done, tested ]
1186		  amd64			[ Done, tested ]
1187		  mips			[ Done, both MIPS1 and MIPS3 tested]
1188		  sparc			[ Done, UP tested, MP might have
1189					  some problem after newlock2 merge ]
1190		  sparc64		[ Done, tested ]
1191		  arm			[ Done, SA1 tested. See PR 36548 ]
1192		  macppc/powerpc	[ Done, OEA tested ]
1193		  hppa			[ Done, tested ]
1194		  sh3			[ Done, tested ]
1195		  vax			[ Done, UP tested, MP untested ]
1196		  m68k			[ Done, tested on several ports ]
1197		  ns32k			[ broken ]
1198		  ia64			[ broken ]
1199		  pdp10			[ broken ]
1200
1201		How to adapt a port?
1202
1203		- unify cpu_switch, cpu_exit, cpu_switchto into
1204		  a single cpu_switchto.  see cpu_switchto.9.
1205
1206		- implement cpu_idle.  see cpu_idle.9.
1207
1208		- add a flag argument to cpu_need_resched.
1209		  handle RESCHED_IMMED flag, which means "cause a preemption
1210		  as soon as possible."  eg. in the case of MULTIPROCESSOR,
1211		  send an IPI to the target cpu.
1212
1213		- "curlwp == NULL" is not a valid check for idle state anymore.
1214		  use "(curlwp->l_flag & LW_IDLE) != 0" instead.  curlwp is
1215		  almost always non-NULL, with exceptions like early on boot.
1216
1217		- remove idle pcbs.
1218
1219		- (if MULTIPROCESSOR) tweak processor trampoline code.
1220
1221		- (if MULTIPROCESSOR) call mi_cpu_attach when attaching
1222		  secondary processors.
1223
1224		- (if schedhz!=0) call schedclock regardless of the value of
1225		  curlwp.
1226
1227		- of course, update MD users of scheduler/switching API.
1228
1229Branch:		yamt-km, yamt-km-doc
1230Description:	simplify/improve kernel memory management and bootstrap
1231Status:		Terminated; merged to -current
1232Start Date:	Tue Jan 25 2005
1233End Date:	Fri Apr  1 2005
1234Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
1235Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1236Scope:		yamt-km: src/sys
1237		yamt-km-doc: src/share/man/man9/uvm.9
1238Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
1239
1240		the followings are per-port status.
1241		(account names mean "tested by".)
1242
1243		works enough to go to multiuser:
1244			alpha, i386, xen (yamt@)
1245			pc532 (simonb@)
1246			alpha, i386, mac68k, macppc, pmax, shark,
1247			    sparc, sparc64, sun3, x68k (chs@)
1248			cobalt, dreamcast, hp300, news68k, newsmips,
1249			    sun3x (tsutsui@)
1250			amiga (mhitch@)
1251			cats, hp700 (skrll@)
1252			xen (bouyer@)
1253
1254		known to have the same problem as trunk:
1255			vax (chs@, stuck while running kvm_mkdb)
1256
1257		known to have a problem:
1258			luna68k (and, if any, other m68k ports which use TTR)
1259			needs to be revisited.
1260			-> for luna68k, although not tested,
1261			   Sysmap has been moved to avoid kva conflict with
1262			   I/O ranges.
1263
1264		buildable:
1265			src/sys/arch/acorn26/conf/GENERIC
1266			src/sys/arch/acorn32/conf/GENERIC
1267			src/sys/arch/algor/conf/P6032
1268			src/sys/arch/alpha/conf/GENERIC
1269			src/sys/arch/alpha/conf/GENERIC.MP
1270			src/sys/arch/amd64/conf/GENERIC
1271			src/sys/arch/amd64/conf/GENERIC.MP
1272			src/sys/arch/amiga/conf/GENERIC
1273			src/sys/arch/arc/conf/GENERIC
1274			src/sys/arch/atari/conf/MILAN-PCIIDE
1275			src/sys/arch/bebox/conf/GENERIC
1276			src/sys/arch/cats/conf/GENERIC
1277			src/sys/arch/cesfic/conf/GENERIC
1278			src/sys/arch/cobalt/conf/GENERIC
1279			src/sys/arch/dreamcast/conf/GENERIC
1280			src/sys/arch/evbarm/conf/TS7200
1281			src/sys/arch/evbppc/conf/WALNUT
1282			src/sys/arch/evbsh3/conf/COMPUTEXEVB
1283			src/sys/arch/evbsh5/conf/CAYMAN64
1284			src/sys/arch/hp300/conf/GENERIC
1285			src/sys/arch/hp700/conf/GENERIC
1286			src/sys/arch/hpcarm/conf/JORNADA728
1287			src/sys/arch/hpcmips/conf/GENERIC
1288			src/sys/arch/hpcsh/conf/GENERIC
1289			src/sys/arch/hpcsh/conf/HPW650PA
1290			src/sys/arch/i386/conf/GENERIC
1291			src/sys/arch/i386/conf/GENERIC.MP
1292			src/sys/arch/i386/conf/XEN0
1293			src/sys/arch/i386/conf/XENU
1294			src/sys/arch/ibmnws/conf/GENERIC
1295			src/sys/arch/iyonix/conf/GENERIC
1296			src/sys/arch/luna68k/conf/GENERIC
1297			src/sys/arch/mac68k/conf/GENERIC
1298			src/sys/arch/macppc/conf/GENERIC
1299			src/sys/arch/macppc/conf/GENERIC.MP
1300			src/sys/arch/mipsco/conf/GENERIC
1301			src/sys/arch/mmeye/conf/GENERIC
1302			src/sys/arch/mvme68k/conf/GENERIC
1303			src/sys/arch/netwinder/conf/GENERIC
1304			src/sys/arch/news68k/conf/GENERIC
1305			src/sys/arch/newsmips/conf/GENERIC
1306			src/sys/arch/next68k/conf/GENERIC
1307			src/sys/arch/ofppc/conf/GENERIC
1308			src/sys/arch/pc532/conf/GENERIC
1309			src/sys/arch/pmax/conf/GENERIC
1310			src/sys/arch/prep/conf/GENERIC
1311			src/sys/arch/sandpoint/conf/GENERIC
1312			src/sys/arch/sbmips/conf/GENERIC
1313			src/sys/arch/sgimips/conf/GENERIC32_IP3x
1314			src/sys/arch/shark/conf/GENERIC
1315			src/sys/arch/sparc/conf/GENERIC
1316			src/sys/arch/sparc/conf/GENERIC.MP
1317			src/sys/arch/sparc64/conf/GENERIC
1318			src/sys/arch/sparc64/conf/GENERIC.MP
1319			src/sys/arch/sun2/conf/GENERIC
1320			src/sys/arch/sun3/conf/GENERIC
1321			src/sys/arch/vax/conf/GENERIC
1322			src/sys/arch/vax/conf/GENERIC.MP
1323			src/sys/arch/x68k/conf/GENERIC
1324
1325			src/sys/arch/playstation2/conf/GENERIC
1326
1327Branch:		yamt-pdpolicy
1328Description:	play with page replacement policy
1329		- separate page replacement policy from the rest of kernel
1330		- implement alternative replacement policy
1331		- related read-ahead adjustment?
1332Status:		Terminated; merged to -current
1333Start Date:	Sun Mar  5 2006
1334End Date:	Sat Sep 16 2006
1335Base Tag:	yamt-pdpolicy-base9
1336Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1337Scope:		src/sys  (src/common is tagged but not branched)
1338Notes:		
1339
1340Branch:		yamt-readahead
1341Description:	play with file readahead
1342Status:		Terminated; merged to -current
1343Start Date:	Mon Nov 14 2005
1344End Date:	Wed Nov 30 2005
1345Base Tag:	yamt-readahead-base3
1346Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1347Scope:		src/sys
1348Notes:		
1349
1350Branch:		yamt-uio_vmspace
1351Description:	uio_lwp/uio_segflg -> uio_vmspace
1352Status:		Terminated; merged to -current
1353Start Date:	Mon Dec 31 2005
1354End Date:	Wed Mar  1 2006
1355Base Tag:	yamt-uio_vmspace-base5
1356Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1357Scope:		src/sys
1358Notes:		
1359
1360Branch:		yamt-splraiseipl
1361Description:	finish implementing splraiseipl (and makeiplcookie).
1362		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
1363
1364		- completes workqueue(9) and netbt.
1365		- fix PR/33218.
1366
1367Status:		Terminated; merged to -current
1368Start Date:	Mon Sep 18 2006
1369End Date:	Fri Dec 22 2006
1370Base Tag:	yamt-splraiseipl-base5
1371Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1372Scope:		src/sys  (src/common is tagged but not branched)
1373Notes:		
1374		tested (by who):
1375			alpha		(yamt)
1376			alpha		(pavel)
1377			amd64		(reported privately)
1378			cobalt		(tsutsui)
1379			ews4800mips	(tsutsui)
1380			hp300		(tsutsui)
1381			hpcarm		(reported privately)
1382			i386		(yamt)
1383			macppc		(tsutsui)
1384			news68k		(tsutsui)
1385			sgimips(IP32)	(tsutsui)
1386			sparc(sun4c)	(tsutsui)
1387			sun2		(tsutsui)
1388			sun3		(tsutsui)
1389			sun3x		(tsutsui)
1390			xen		(yamt)
1391
1392		compile-tested:
1393			acorn26
1394			acorn32
1395			algor
1396			amiga
1397			arc
1398			atari
1399			bebox
1400			cats
1401			cesfic
1402			dreamcast
1403			evbarm
1404			evbmips
1405			evbppc(marvell)
1406			evbppc(ibm4xx)
1407			evbsh3
1408			hp700
1409			hpcmips
1410			hpcsh
1411			ia64
1412			ibmnws
1413			iyonix
1414			landisk
1415			luna68k
1416			mac68k
1417			mmeye
1418			mvme68k
1419			mvmeppc
1420			mipsco
1421			netwinder
1422			newsmips
1423			next68k
1424			ofppc
1425			pc532
1426			pmax
1427			pmppc
1428			prep
1429			sandpoint
1430			sbmips
1431			shark
1432			sparc
1433			sparc64
1434			vax
1435			x68k
1436			zaurus
1437
1438		not tested:
1439			pdp10 (i don't know how to build)
1440			sh5 (not buildable with an unrelated problem.)
1441
1442    compile  CAYMAN64/netbsd32_sa.o
1443    cc1: warnings being treated as errors
1444    /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c: In function 'netbsd32_sa_ucsp':
1445    /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c:126: warning: implicit declaration of function '_UC_MACHINE32_SP'
1446    --- netbsd32_sa.o ---
1447    *** [netbsd32_sa.o] Error code 1
1448    1 error
1449
1450		notyet:
1451			amigappc
1452			playstation2
1453
1454Branch:		yamt-vop
1455Description:	remove several VOPs
1456Status:		Terminated; merged to -current
1457Start Date:	Wed Oct 19 2005
1458End Date:	Wed Nov  2 2005
1459Base Tag:	yamt-vop-base3
1460Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1461Scope:		src/sys
1462Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
1463
1464Branch:		gdamore-uart
1465Description:	Add register table support to com driver.
1466Status:		Active
1467Start Date:	14 June 2006
1468End Date:	13 July 2006
1469Base Tag:	gdamore-uart-base
1470Maintainer:	Garrett D'Amore <gdamore@NetBSD.org>
1471Scope:		kernel
1472Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
1473		com support, and also removes a nasty hack from Atheros com.
1474
1475########################################################################
1476# Other:
1477########################################################################
1478
1479Branch:		magnum
1480Description:	?
1481Status:		?
1482Start Date:
1483End Date:
1484Base Tag:	magnum-base
1485Maintainer:	?
1486Scope:		kernel
1487Notes:
1488
1489