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