BRANCHES revision 1.210
1#	$NetBSD: BRANCHES,v 1.210 2007/10/14 14:40:35 yamt 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:		Terminated
417Start Date:	2007-07-18
418End Date:
419Base Tag:	nick-csl-alignment-base5
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-base5
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:		yamt-x86pmap
586Description:	merge i386 and amd64 pmap
587Status:		Active
588Start Date:	Mon Sep 24 2007
589End Date:	
590Base Tag:	yamt-x86pmap-base3
591Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
592Scope:		src/sys  (src/common is tagged but not branched)
593Notes:		
594
595Branch:		reinoud-bufcleanup
596Description:	implement and evaluate struct buf usage cleanup strategies.
597		Ideas currently in mind (preference for b):
598		a)
599			1. use of bio_ops per buffer.
600			2. allow chaining/overloading of functions in bio_ops
601			   and provide some private context.
602			3. extend the bio_ops with commenly used functionality
603			   like pending action counting, custom context passing,
604			   last minute processing of buffer data, buffer cache
605			   etc.
606			4. investigate the use of the kcont()
607			   continuation-passing framework for async io
608			   completion notification for bufs
609			...
610		b)
611			1. all sequencing use of B_CALL replaced by
612			   device-threads, if possible generic code around BUFQ
613			2. possibly use kcont() for async IO finished signalling
614			3. counter of pending and queued actions requestable
615			   by IOCTL interface?
616			4. implement `last minute buffer fixup' calls and maybe
617			   even finished I/O calls as vnode operations
618			...
619Status:		Active
620Start Date:	Thu Mar 15 2007
621End Date:
622Base Tag:	reinoud-bufcleanup-base
623Maintainer:	Reinoud Zandijk <reinoud@NetBSD.org>
624Scope:		src/sys and src/common
625Notes:		Used as expiriment sandbox and if successful hopefully one day
626		to be intergrated.
627
628Branch:		thorpej-atomic
629Description:	Implementation of an atomic memory operations API modeled
630		after the one in Solaris 10.
631Status:		Active
632Start Date:	Apr 11 2007
633End Date:
634Base tag:	thorpej-atomic-base
635Maintainer:	Jason Thorpe <thorpej@netbsd.org>
636Scope:		src/common
637		src/sys
638Notes:		Base atomic primitives need to be implemented for
639		all of the supported architectures:
640
641		alpha		DONE
642		arm		DONE
643		hppa
644		i386		DONE
645		ia64
646		m68k		DONE (except for 68010)
647		mips
648		ns32k
649		powerpc		DONE except for membar_*()
650		powerpc64	DONE except for membar_*()
651		sh3
652		sparc		DONE except for membar_*()
653		sparc64		DONE except for membar_*()
654		vax
655		x86_64		DONE
656
657		Tested:
658
659		alpha		NO
660		arm		NO
661		hppa		NO
662		i386		NO
663		ia64		NO
664		m68k		NO
665		mips		NO
666		ns32k		NO
667		powerpc		NO
668		powerpc64	NO
669		sh3		NO
670		sparc		NO
671		sparc64		NO
672		vax		NO
673		x86_64		NO
674
675		TODO:
676
677		all		- Need to replace mb_*() with membar_*().
678
679				- Audit MUTEX_CAS() and RWLOCK_CAS() uses
680				  to see of membar_enter() is required here.
681
682				- Talk to ad@ -- figure out of non-atomic
683				  mutex / rwlock release is actually safe.
684
685		arm		- Consider using a RAS technique like
686				  MIPS uses for _lock_cas() and the mutex
687				  stubs.  Possibly do more than one atomic
688				  op as a RAS.  Possibly implement mutex
689				  stubs using the technique.
690
691		m68k		- Need to do 68010 support.
692		
693		i386		- Need to change when x86_patch() is called
694				  so we can test ncpus.
695
696		powerpc		- Figure out if we need barriers in the
697				  atomic ops themselves (hopefully not!)
698
699		x86_64		- Need to change when x86_patch() is called
700				  so we can test ncpus.
701
702########################################################################
703# Individual developers' branches (Terminated):
704########################################################################
705
706Branch:		bouyer-scsipi
707Description:	Integration of atapi support
708Status:		Terminated
709Start Date:
710End Date:
711Base Tag:
712Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
713Scope:		kernel
714Notes:		Superseded by thorpej_scsipi
715
716Branch:		bouyer-xen2
717Description:	update xen port to xen 2.0, with support for domain0 operations
718Status:		Terminated
719Start Date:	Dec 13 2004
720End Date:	Mar 10 2005
721Base Tag:	netbsd-2-base
722Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
723Scope:		src/sys/arch/xen
724Notes:
725
726Branch: 	chap-midi
727Description:	Renovation of MIDI support
728Status: 	Terminated; merged to -current
729Start Date:	19 May 2006
730End Date:	30 Jun 2006
731Base Tag:	chap-midi-base
732Maintainer:	Chapman Flack <chap@NetBSD.org>
733Scope:		sys, share/man, usr.bin
734Notes:
735
736Branch:		chs-ubc
737Description:	Unified Buffer Cache
738Status:		Terminated
739Start Date:
740End Date:
741Base Tag:	chs-ubc-base
742Maintainer:	Chuck Silvers <chs@NetBSD.org>
743Scope:		kernel
744Notes:
745
746Branch:		chs-ubc2
747Description:	 Unified Buffer Cache
748Status:		Terminated; merged to -current
749Start Date:
750End Date:
751Base Tag:	chs-ubc2-base, chs-ubc2-newbase
752Maintainer:	Chuck Silvers <chs@NetBSD.org>
753Scope:		kernel
754Notes:
755
756Branch:		cjs-build-against-obj-dir
757Description:	?
758Status:		?
759Start Date:
760End Date:
761Base Tag:
762Maintainer:	Curt Sampson <cjs@NetBSD.org>
763Scope:		Entire tree.
764Notes:
765
766Branch:		eeh-paddr_t
767Description:	use separate types for virtual vs. physical addresses
768Status:		Terminated; merged to -current
769Start Date:
770End Date:
771Base Tag:	eeh-paddr_t-base
772Maintainer:	Eduardo Horvath <eeh@NetBSD.org>
773Scope:		kernel
774Notes:		This is needed to support 32-bit kernels on sparc64.
775
776Branch:		elad-kernelauth
777Description:	Native NetBSD implementation of Apple's kernel authorization
778		based on TN2127. This is a "clean-room" implementation to
779		avoid any licensing issues.
780Status:		Terminated; merged to -current
781Start Date:	Tue Mar	 7 2006
782End Date:	Mon May 15 2006
783Base Tag:	elad-kernelauth-base
784Maintainer:	Elad Efrat <elad@NetBSD.org>
785Scope:		src/sys, src/share/man/man9/Makefile,
786		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
787Notes:
788
789Branch:		fvdl-softdep
790Description:	FFS soft dependencies
791Status:		Terminated; merged to -current
792Start Date:
793End Date:
794Base Tag:	fvdl-softdep-base
795Maintainer:	Frank van der Linden <fvdl@NetBSD.org>
796Scope:		kernel
797Notes:
798
799Branch:		gehenna-devsw
800Description:	auto-generation of devsw table
801Status:		Terminated
802Start Date:	16 May 2002
803End Date:	6 Sep 2002
804Base Tag:	gehenna-devsw-base
805Maintainer:	MAEKAWA Masahide <gehenna@NetBSD.org>
806Scope:		syssrc
807Notes:		The goal is to get rid of the existing device switch tables in
808		port-dependent conf.c and to generate them dynamically by
809		config(8).
810
811Branch:		is-newarp
812Description:	ARP for non-Ethernet
813Status:		Terminated; merged before NetBSD 1.3
814Start Date:	1996/10/13
815End Date:	1997/03/15
816Base Tag:	is-newarp-base
817Maintainer:	Ignatios Souvatzis <is@NetBSD.org>
818Scope:		kernel
819Notes:
820
821Branch:		kenh-if-detach
822Description:	Interface detach support.
823Status:		?
824Start Date:
825End Date:
826Base Tag:	kenh-if-detach-base
827Maintainer:	Ken Hornstein <kenh@NetBSD.org>
828Scope:		kernel
829Notes:
830
831Branch:		kent-audio1
832Description:	Audio converter pipeline
833Status:		Terminated; merged to -current
834Start Date:	Tue Dec  7 2004
835End Date:	Tue Jan 11 2005
836Base Tag:	kent-audio1-base
837Maintainer:	TAMURA Kent <kent@NetBSD.org>
838Scope:		kernel (audio device drivers)
839Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
840		Please consult with the maintainer before committing
841		to this branch.
842
843Branch:		kqueue
844Description:	kqueue kernel event notification mechanism (from FreeBSD)
845Status:		Terminated; merged to -current
846Start Date:	Tue Jul 10 23:08:38 EST 2001
847End Date:	Tue Oct 24 09:14:14 GMT 2002
848Base Tag:	kqueue-base
849Maintainer:	Jaromir Dolecek <jdolecek@NetBSD.org>
850Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
851Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
852		local internal changes to better suit NetBSD, and
853		enhancements such as looking up filters by name or
854		number, and dynamic registration of "user" filters.
855		The work is complete as is, but is awaiting more
856		feedback from various kernel gurus before going mainline.
857
858Branch:		ktrace-lwp
859Description:	ktrace support for lwp ids.
860Status:		Terminated; merged to -current
861Start Date:	Wed Jul  2 15:27:30 UTC 2003
862End Date:	Sun Dec 11 12:25:29 UTC 2005
863Base Tag:	ktrace-lwp-base
864Maintainer:	Darren Reed <darrenr@NetBSD.org>
865Scope:		sys
866Notes:		
867
868Branch:		marc-pcmcia
869Description:	PCMCIA support
870Status:		Terminated; merged to -current
871Start Date:
872End Date:
873Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
874Maintainer:	Marc Horowitz <marc@NetBSD.org>
875Scope:		kernel
876Notes:
877
878Branch:		minoura_x68k_bus_h
879Description:	bus_space(9) and bus_dma(9) implementation for x68k
880Status:		Terminated; merged to -current
881Start Date:	23 Dec 1998
882End Date:	16 Mar 1999
883Base Tag:	minoura_x68k_bus_h-base
884Maintainer:	Minoura Makoto <minoura@NetBSD.org>
885Scope:		sys/arch/x68k
886Notes:
887
888Branch:		minoura-xpg4dl
889Description:	Citrus Project locale subsystem
890Status:		Terminated; (partly) merged to -current
891Start Date:	28 March 2000
892End Date:
893Base Tag:	minoura-xpg4dl-base
894Maintainer:	Minoura Makoto <minoura@NetBSD.org>
895Scope:		basesrc, syssrc, sharesrc
896Notes:		Citrus Project is developing dynamically-loadable, codeset-
897		independent locale subsystem.  Part of the implementation
898		(LC_CTYPE) called XPG4DL is now integrated to -current.
899
900Branch:		mjf-ufs-trans
901Description:	filesystem transactions for ufs
902Status:		Active
903Start Date:	12 March 2007
904End Date:
905Base Tag:	mjf-ufs-trans-base
906Maintainer:	Matt Fleming <mjf@NetBSD.org>
907Scope:		kernel
908Notes:
909
910Branch:		mrg-vm-swap
911Description:	dynamic swap allocation, swap-to-files support
912Status:		Terminated; abondoned for mrg-vm-swap2
913Start Date:	12 February 1997
914End Date:	15 March 1997
915Base Tag:	[none]
916Maintainer:	Matthew R. Green <mrg@NetBSD.org>
917Scope:		kernel
918Notes:
919
920Branch:		mrg-vm-swap2
921Description:	dynamic swap allocation, swap-to-files support
922Status:		Terminated; merged to -current
923Start Date:	4 May 1997
924End Date:	12 June 1997
925Base Tag:	mrg-vm-swap2-base
926Maintainer:	Matthew R. Green <mrg@NetBSD.org>
927Scope:		kernel
928Notes:
929
930Branch:		nathanw_sa
931Description:	Scheduler activations
932Status:		Terminated; merged to -current
933Start Date:	5 March 2001
934End Date:	18 January 2003
935Base Tag:	nathanw_sa_base
936Maintainer:	Nathan Williams <nathanw@NetBSD.org>
937Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
938		bin/ps usr.bin/systat usr.bin/top usr.bin/w
939		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
940Notes:		The idea of scheduler activations is described in the
941		classic paper by Anderson et al., in ACM Transactions
942		a on Computer Systems volume 10 issue 1 (1992),which
943		can be found at
944		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
945		Many ideas in the implementation are based on the
946		implementation of scheduler activations added to Mach
947		3.0 and described by Davis et al. in the University of
948		Washington CS tech report 92-08-93, which can be found
949		at
950		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
951
952		My USENIX paper on the subject can be found at
953		http://web.mit.edu/nathanw/www/usenix/
954
955		Please consult with the maintainer before committing
956		to this branch.
957		Other tags starting with nathanw_sa reserved for
958		branch management and are not guaranteed to be stable.
959
960		Trunk tagged with "nathanw_sa_before_merge" prior to
961		merging branch down to trunk.  Branch tagged with
962		"nathanw_sa_end" to indicate the ending revision of
963		the branch.
964
965Branch:		perseant-lfsv2
966Description:	LFS incompatible on-disk data structure changes
967Status:		Terminated
968Start Date:	27 June 2001
969End Date:	16 July 2001
970Base Tag:	perseant-lfsv2-base
971Maintainer:	Konrad Schroder <perseant@NetBSD.org>
972Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
973Notes:		This branch should be short-lived, I expect to merge as soon
974		as the data structures required for unremove are in and tested.
975
976Branch:		thorpej-devvp
977Description:	replace dev_t with struct vnode * in devsw entry points
978Status:		Terminated
979Start Date:	Sep 6 2001
980End Date:	???
981Base Tag:	thorpej-devvp-base
982Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
983Scope:		syssrc
984Notes:		Kernels built from this branch are not expected
985		to function correctly at this time.
986
987		Ports known to compile on this branch:
988			alpha
989			i386
990
991Branch:		peter-altq
992Description:	New ALTQ framework:
993		- sync with KAME sources
994		- share mtag/name mapping functions
995		- separate altq + pf attachment
996Status:		Terminated; merged to -current
997Start Date:	March 16, 2006
998End Date:	October 12, 2006
999Base Tag:	peter-altq-base
1000Maintainer:	Peter Postma <peter@NetBSD.org>,
1001		Martin Husemann <martin@NetBSD.org>,
1002		Matthias Scheler <tron@NetBSD.org>
1003Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
1004Notes:		Only the first item in the description was finished
1005		in this branch.
1006
1007Branch:		sommerfeld_i386mp_1
1008Description:	Multiprocessor support for i386 using Intel MP BIOS.
1009Status:		Terminated; merged to -current
1010Start Date:	21 Feb 2000
1011End Date:	01 Oct 2002
1012Base Tag:	sommerfeld_i386mpbase_1
1013Maintainer:	Bill Sommerfeld <sommerfeld@NetBSD.org>
1014Scope:		sys/arch/i386
1015Notes:
1016		Code committed to the branch has booted to multiuser 
1017		on at least one system.
1018
1019		Not guaranteed to compile against mainline since -current
1020		may have changed incompatibly with the last branch update;
1021		use "cvs update -D" to roll-back the rest of the tree to match.
1022
1023		Please get explicit permission from the maintainer 
1024		before each commit, or your changes will be backed out.
1025		Other tags starting with sommerfeld_ are private to 
1026		the developer and are guaranteed to be unstable.
1027		Only the maintainer should move tags.
1028
1029		Note that this branch uses a DIFFERENT scheme for 
1030		synching with the mainline.  the maintainer uses some private
1031		scripts for keeping them in synch; if you make commits 
1032		to the branch to "resynchronize" things, you'll
1033		probably do it wrong; instead, ask the maintainer to
1034		resynchronize things.
1035
1036		See sys/arch/i386/TODO on the branch for a list of known
1037		issues with the branch.
1038
1039Branch:		thorpej-mips-cache
1040Description:	overhaul MIPS cache support code
1041Status:		Terminated; merged to -current
1042Start Date:	Oct 23 2001
1043End Date:	Nov 14 2001
1044Base Tag:	thorpej-mips-cache-base
1045Scope:		syssrc
1046Notes:		This branch needs more debugging, testing, and more
1047		ports need to be converted to the new world order.
1048
1049		The following processors have had cache ops
1050		written:
1051
1052			* R2000/R3000 (cache_r3k) -- light testing,
1053			  needs to be beat on a lot more to make
1054			  sure it's working.
1055
1056			* R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org
1057			  tracked down a bug, which has been fixed.
1058
1059			  Confirmed working on R4000-with-L2.
1060
1061			  Confirmed working on R4400-no-L2 and
1062			  R4400-with-L2.
1063
1064			* R4600/R5000 (cache_r5k) -- shin@NetBSD.org
1065			  has committed fixes to this code.
1066
1067			  Confirmed working on R4600 v2 (SGI IP-22 with
1068			  no SysAD L2 cache).
1069
1070			  Confirmed working on RM5260 (Algorithmics P-5064).
1071
1072			* TX39 (cache_tx39) -- uch@NetBSD.org has
1073			  committed fixes to this code.  Awaiting
1074			  confirmation that it is working properly.
1075
1076			* R5900 (cache_r5900) -- uch@NetBSD.org has
1077			  written this code and tested it on a
1078			  PlayStation 2.
1079
1080		The following ports have been updated to compile (and
1081		use optimized-for-processor bus_dma routines).  Those
1082		that have been tested and work are marked with [WORKING].
1083
1084			* algor		[WORKING]
1085
1086			* arc		[WORKING]
1087
1088			* pmax		[WORKING]
1089
1090			* playstation2	[WORKING]
1091					Needs optimized bus_dmamap_sync().
1092
1093			* hpcmips	[need verification that this is working]
1094					Needs optimized bus_dmamap_sync().
1095
1096			* sgimips	[WORKING]
1097					Needs optimized bus_dmamap_sync().
1098
1099			* cobalt	[need testing]
1100
1101			* mipsco	[need testing]
1102
1103			* newsmips	[need testing]
1104
1105Branch:		thorpej_scsipi
1106Description:	SCSI/ATAPI midlayer rewrite.
1107Status:		Terminated; merged to -current
1108Start Date:
1109End Date:	Apr 25 2001
1110Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
1111Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>,
1112		Jason Thorpe <thorpej@NetBSD.org>
1113Scope:		syssrc
1114Notes:		When a change from -current is pulled up please move the
1115		thorpej_scsipi_base tag to the revision you're syncing with.
1116		thorpej_scsipi_nbase is private to maintainer (only
1117		used when syncing the whole branch with HEAD).
1118		Just before the merge, syssrc has been tagged with
1119		thorpej_scsipi_beforemerge
1120
1121Branch:		thorpej-signal
1122Description:	?
1123Status:		?
1124Start Date:
1125End Date:
1126Base Tag:	thorpej-signal-base
1127Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
1128Scope:		kernel
1129Notes:
1130
1131Branch:		thorpej-setroot
1132Description:	?
1133Status:		Terminated; merged to -current
1134Start Date:
1135End Date:
1136Base Tag:
1137Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
1138Scope:		kernel
1139Notes:
1140
1141Branch:		simonb-timecounters
1142Description:	Port FreeBSD timecounters to NetBSD
1143Status:		Terminated
1144Start Date:	Sat Feb 04 2006
1145End Date:	Wed Jun 07 2006
1146Base Tag:	simonb-timecounters-base
1147Maintainer:	Simon Burge <simonb@NetBSD.org>,
1148		Frank Kardel <kardel@NetBSD.org>
1149Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
1150Notes:		early (partial conversion) commit to -current
1151		ok'ed by core@ on 20060605 for testing and further
1152		simplified conversion
1153
1154Branch:		wrstuden-devbsize
1155Description:	Modify buffer cache to deal with different devices having
1156		different block sizes. Also DEV_BSIZE would go away.
1157Status:		Terminated
1158Start Date:	Aug or Sept 1999
1159End Date:	1 Apr 2000
1160Base tag:	wrstuden-devbsize-base
1161Maintainer:	Bill Studenmund <wrstuden@NetBSD.org>
1162Scope:		kernel
1163Notes:		No longer active due to lack of time, and introduction
1164		of UBC. In terms of UBC, the primary cache for
1165		file data is the VM cache, which needs to operate
1166		in terms of VM pages. As no existing device has native
1167		pages the same size as our VM pages, there already is
1168		a mapping going on between the VM system and the
1169		underlying blocks. So it would be easier and cleaner
1170		to adjust that to deal w/ different block sizes.
1171		Also with UBC, all i/o is in terms of bytes at an offset
1172		with a certain length, so the exact block size isn't a big
1173		deal.
1174
1175		Any other wrstuden-devbsize tag may (and should) go away.
1176
1177Branch:		yamt-idlelwp
1178Description:	idle lwp, and some changes depending on it.
1179
1180		1. separate context switching and thread scheduling.
1181		   (cf. gmcgarry_ctxsw)
1182		2. implement idle lwp.
1183		3. clean up related MD/MI interfaces.
1184		4. make scheduler(s) modular.
1185
1186Status:		Terminated; merged to -current
1187Start Date:	Fri Feb 17 2007
1188End Date:	Thu May 17 2007
1189Base Tag:	yamt-idlelwp-base8
1190Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1191Scope:		src/sys  (src/common is tagged but not branched)
1192Notes:		
1193		Status of ports:
1194		  alpha			[ Done, UP tested, MP not tested ]
1195		  i386			[ Done, tested ]
1196		  amd64			[ Done, tested ]
1197		  mips			[ Done, both MIPS1 and MIPS3 tested]
1198		  sparc			[ Done, UP tested, MP might have
1199					  some problem after newlock2 merge ]
1200		  sparc64		[ Done, tested ]
1201		  arm			[ Done, SA1 tested. See PR 36548 ]
1202		  macppc/powerpc	[ Done, OEA tested ]
1203		  hppa			[ Done, tested ]
1204		  sh3			[ Done, tested ]
1205		  vax			[ Done, UP tested, MP untested ]
1206		  m68k			[ Done, tested on several ports ]
1207		  ns32k			[ broken ]
1208		  ia64			[ broken ]
1209		  pdp10			[ broken ]
1210
1211		How to adapt a port?
1212
1213		- unify cpu_switch, cpu_exit, cpu_switchto into
1214		  a single cpu_switchto.  see cpu_switchto.9.
1215
1216		- implement cpu_idle.  see cpu_idle.9.
1217
1218		- add a flag argument to cpu_need_resched.
1219		  handle RESCHED_IMMED flag, which means "cause a preemption
1220		  as soon as possible."  eg. in the case of MULTIPROCESSOR,
1221		  send an IPI to the target cpu.
1222
1223		- "curlwp == NULL" is not a valid check for idle state anymore.
1224		  use "(curlwp->l_flag & LW_IDLE) != 0" instead.  curlwp is
1225		  almost always non-NULL, with exceptions like early on boot.
1226
1227		- remove idle pcbs.
1228
1229		- (if MULTIPROCESSOR) tweak processor trampoline code.
1230
1231		- (if MULTIPROCESSOR) call mi_cpu_attach when attaching
1232		  secondary processors.
1233
1234		- (if schedhz!=0) call schedclock regardless of the value of
1235		  curlwp.
1236
1237		- of course, update MD users of scheduler/switching API.
1238
1239Branch:		yamt-km, yamt-km-doc
1240Description:	simplify/improve kernel memory management and bootstrap
1241Status:		Terminated; merged to -current
1242Start Date:	Tue Jan 25 2005
1243End Date:	Fri Apr  1 2005
1244Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
1245Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1246Scope:		yamt-km: src/sys
1247		yamt-km-doc: src/share/man/man9/uvm.9
1248Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
1249
1250		the followings are per-port status.
1251		(account names mean "tested by".)
1252
1253		works enough to go to multiuser:
1254			alpha, i386, xen (yamt@)
1255			pc532 (simonb@)
1256			alpha, i386, mac68k, macppc, pmax, shark,
1257			    sparc, sparc64, sun3, x68k (chs@)
1258			cobalt, dreamcast, hp300, news68k, newsmips,
1259			    sun3x (tsutsui@)
1260			amiga (mhitch@)
1261			cats, hp700 (skrll@)
1262			xen (bouyer@)
1263
1264		known to have the same problem as trunk:
1265			vax (chs@, stuck while running kvm_mkdb)
1266
1267		known to have a problem:
1268			luna68k (and, if any, other m68k ports which use TTR)
1269			needs to be revisited.
1270			-> for luna68k, although not tested,
1271			   Sysmap has been moved to avoid kva conflict with
1272			   I/O ranges.
1273
1274		buildable:
1275			src/sys/arch/acorn26/conf/GENERIC
1276			src/sys/arch/acorn32/conf/GENERIC
1277			src/sys/arch/algor/conf/P6032
1278			src/sys/arch/alpha/conf/GENERIC
1279			src/sys/arch/alpha/conf/GENERIC.MP
1280			src/sys/arch/amd64/conf/GENERIC
1281			src/sys/arch/amd64/conf/GENERIC.MP
1282			src/sys/arch/amiga/conf/GENERIC
1283			src/sys/arch/arc/conf/GENERIC
1284			src/sys/arch/atari/conf/MILAN-PCIIDE
1285			src/sys/arch/bebox/conf/GENERIC
1286			src/sys/arch/cats/conf/GENERIC
1287			src/sys/arch/cesfic/conf/GENERIC
1288			src/sys/arch/cobalt/conf/GENERIC
1289			src/sys/arch/dreamcast/conf/GENERIC
1290			src/sys/arch/evbarm/conf/TS7200
1291			src/sys/arch/evbppc/conf/WALNUT
1292			src/sys/arch/evbsh3/conf/COMPUTEXEVB
1293			src/sys/arch/evbsh5/conf/CAYMAN64
1294			src/sys/arch/hp300/conf/GENERIC
1295			src/sys/arch/hp700/conf/GENERIC
1296			src/sys/arch/hpcarm/conf/JORNADA728
1297			src/sys/arch/hpcmips/conf/GENERIC
1298			src/sys/arch/hpcsh/conf/GENERIC
1299			src/sys/arch/hpcsh/conf/HPW650PA
1300			src/sys/arch/i386/conf/GENERIC
1301			src/sys/arch/i386/conf/GENERIC.MP
1302			src/sys/arch/i386/conf/XEN0
1303			src/sys/arch/i386/conf/XENU
1304			src/sys/arch/ibmnws/conf/GENERIC
1305			src/sys/arch/iyonix/conf/GENERIC
1306			src/sys/arch/luna68k/conf/GENERIC
1307			src/sys/arch/mac68k/conf/GENERIC
1308			src/sys/arch/macppc/conf/GENERIC
1309			src/sys/arch/macppc/conf/GENERIC.MP
1310			src/sys/arch/mipsco/conf/GENERIC
1311			src/sys/arch/mmeye/conf/GENERIC
1312			src/sys/arch/mvme68k/conf/GENERIC
1313			src/sys/arch/netwinder/conf/GENERIC
1314			src/sys/arch/news68k/conf/GENERIC
1315			src/sys/arch/newsmips/conf/GENERIC
1316			src/sys/arch/next68k/conf/GENERIC
1317			src/sys/arch/ofppc/conf/GENERIC
1318			src/sys/arch/pc532/conf/GENERIC
1319			src/sys/arch/pmax/conf/GENERIC
1320			src/sys/arch/prep/conf/GENERIC
1321			src/sys/arch/sandpoint/conf/GENERIC
1322			src/sys/arch/sbmips/conf/GENERIC
1323			src/sys/arch/sgimips/conf/GENERIC32_IP3x
1324			src/sys/arch/shark/conf/GENERIC
1325			src/sys/arch/sparc/conf/GENERIC
1326			src/sys/arch/sparc/conf/GENERIC.MP
1327			src/sys/arch/sparc64/conf/GENERIC
1328			src/sys/arch/sparc64/conf/GENERIC.MP
1329			src/sys/arch/sun2/conf/GENERIC
1330			src/sys/arch/sun3/conf/GENERIC
1331			src/sys/arch/vax/conf/GENERIC
1332			src/sys/arch/vax/conf/GENERIC.MP
1333			src/sys/arch/x68k/conf/GENERIC
1334
1335			src/sys/arch/playstation2/conf/GENERIC
1336
1337Branch:		yamt-pdpolicy
1338Description:	play with page replacement policy
1339		- separate page replacement policy from the rest of kernel
1340		- implement alternative replacement policy
1341		- related read-ahead adjustment?
1342Status:		Terminated; merged to -current
1343Start Date:	Sun Mar  5 2006
1344End Date:	Sat Sep 16 2006
1345Base Tag:	yamt-pdpolicy-base9
1346Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1347Scope:		src/sys  (src/common is tagged but not branched)
1348Notes:		
1349
1350Branch:		yamt-readahead
1351Description:	play with file readahead
1352Status:		Terminated; merged to -current
1353Start Date:	Mon Nov 14 2005
1354End Date:	Wed Nov 30 2005
1355Base Tag:	yamt-readahead-base3
1356Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1357Scope:		src/sys
1358Notes:		
1359
1360Branch:		yamt-uio_vmspace
1361Description:	uio_lwp/uio_segflg -> uio_vmspace
1362Status:		Terminated; merged to -current
1363Start Date:	Mon Dec 31 2005
1364End Date:	Wed Mar  1 2006
1365Base Tag:	yamt-uio_vmspace-base5
1366Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1367Scope:		src/sys
1368Notes:		
1369
1370Branch:		yamt-splraiseipl
1371Description:	finish implementing splraiseipl (and makeiplcookie).
1372		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
1373
1374		- completes workqueue(9) and netbt.
1375		- fix PR/33218.
1376
1377Status:		Terminated; merged to -current
1378Start Date:	Mon Sep 18 2006
1379End Date:	Fri Dec 22 2006
1380Base Tag:	yamt-splraiseipl-base5
1381Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1382Scope:		src/sys  (src/common is tagged but not branched)
1383Notes:		
1384		tested (by who):
1385			alpha		(yamt)
1386			alpha		(pavel)
1387			amd64		(reported privately)
1388			cobalt		(tsutsui)
1389			ews4800mips	(tsutsui)
1390			hp300		(tsutsui)
1391			hpcarm		(reported privately)
1392			i386		(yamt)
1393			macppc		(tsutsui)
1394			news68k		(tsutsui)
1395			sgimips(IP32)	(tsutsui)
1396			sparc(sun4c)	(tsutsui)
1397			sun2		(tsutsui)
1398			sun3		(tsutsui)
1399			sun3x		(tsutsui)
1400			xen		(yamt)
1401
1402		compile-tested:
1403			acorn26
1404			acorn32
1405			algor
1406			amiga
1407			arc
1408			atari
1409			bebox
1410			cats
1411			cesfic
1412			dreamcast
1413			evbarm
1414			evbmips
1415			evbppc(marvell)
1416			evbppc(ibm4xx)
1417			evbsh3
1418			hp700
1419			hpcmips
1420			hpcsh
1421			ia64
1422			ibmnws
1423			iyonix
1424			landisk
1425			luna68k
1426			mac68k
1427			mmeye
1428			mvme68k
1429			mvmeppc
1430			mipsco
1431			netwinder
1432			newsmips
1433			next68k
1434			ofppc
1435			pc532
1436			pmax
1437			pmppc
1438			prep
1439			sandpoint
1440			sbmips
1441			shark
1442			sparc
1443			sparc64
1444			vax
1445			x68k
1446			zaurus
1447
1448		not tested:
1449			pdp10 (i don't know how to build)
1450			sh5 (not buildable with an unrelated problem.)
1451
1452    compile  CAYMAN64/netbsd32_sa.o
1453    cc1: warnings being treated as errors
1454    /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c: In function 'netbsd32_sa_ucsp':
1455    /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c:126: warning: implicit declaration of function '_UC_MACHINE32_SP'
1456    --- netbsd32_sa.o ---
1457    *** [netbsd32_sa.o] Error code 1
1458    1 error
1459
1460		notyet:
1461			amigappc
1462			playstation2
1463
1464Branch:		yamt-vop
1465Description:	remove several VOPs
1466Status:		Terminated; merged to -current
1467Start Date:	Wed Oct 19 2005
1468End Date:	Wed Nov  2 2005
1469Base Tag:	yamt-vop-base3
1470Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1471Scope:		src/sys
1472Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
1473
1474Branch:		gdamore-uart
1475Description:	Add register table support to com driver.
1476Status:		Active
1477Start Date:	14 June 2006
1478End Date:	13 July 2006
1479Base Tag:	gdamore-uart-base
1480Maintainer:	Garrett D'Amore <gdamore@NetBSD.org>
1481Scope:		kernel
1482Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
1483		com support, and also removes a nasty hack from Atheros com.
1484
1485########################################################################
1486# Other:
1487########################################################################
1488
1489Branch:		magnum
1490Description:	?
1491Status:		?
1492Start Date:
1493End Date:
1494Base Tag:	magnum-base
1495Maintainer:	?
1496Scope:		kernel
1497Notes:
1498
1499