BRANCHES revision 1.233
1#	$NetBSD: BRANCHES,v 1.233 2007/12/23 03:52:44 ad 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
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-base8
577Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
578Scope:		src/sys  (src/common is tagged but not branched)
579Notes:		
580		i386		DONE
581		amd64		DONE
582		other ports should work as the trunk does.
583		(conditionalized by __HAVE_LAZY_MBUF macro)
584
585Branch:		reinoud-bufcleanup
586Description:	implement and evaluate struct buf usage cleanup strategies.
587		Ideas currently in mind (preference for b):
588		a)
589			1. use of bio_ops per buffer.
590			2. allow chaining/overloading of functions in bio_ops
591			   and provide some private context.
592			3. extend the bio_ops with commonly used functionality
593			   like pending action counting, custom context passing,
594			   last minute processing of buffer data, buffer cache
595			   etc.
596			4. investigate the use of the kcont()
597			   continuation-passing framework for async io
598			   completion notification for bufs
599			...
600		b)
601			1. all sequencing use of B_CALL replaced by
602			   device-threads, if possible generic code around BUFQ
603			2. possibly use kcont() for async IO finished signaling
604			3. counter of pending and queued actions requestable
605			   by IOCTL interface?
606			4. implement `last minute buffer fixup' calls and maybe
607			   even finished I/O calls as vnode operations
608			...
609Status:		Active
610Start Date:	Thu Mar 15 2007
611End Date:
612Base Tag:	reinoud-bufcleanup-base
613Maintainer:	Reinoud Zandijk <reinoud@NetBSD.org>
614Scope:		src/sys and src/common
615Notes:		Used as experiment sandbox and if successful hopefully one day
616		to be integrated.
617
618Branch:		thorpej-atomic
619Description:	Implementation of an atomic memory operations API modeled
620		after the one in Solaris 10.
621Status:		Active
622Start Date:	Apr 11 2007
623End Date:
624Base tag:	thorpej-atomic-base
625Maintainer:	Jason Thorpe <thorpej@netbsd.org>
626Scope:		src/common
627		src/sys
628Notes:		Base atomic primitives need to be implemented for
629		all of the supported architectures:
630
631		alpha		DONE
632		arm		DONE
633		hppa
634		i386		DONE
635		ia64
636		m68k		DONE (except for 68010)
637		mips
638		ns32k
639		powerpc		DONE except for membar_*()
640		powerpc64	DONE except for membar_*()
641		sh3
642		sparc		DONE except for membar_*()
643		sparc64		DONE except for membar_*()
644		vax
645		x86_64		DONE
646
647		Tested:
648
649		alpha		NO
650		arm		NO
651		hppa		NO
652		i386		NO
653		ia64		NO
654		m68k		NO
655		mips		NO
656		ns32k		NO
657		powerpc		NO
658		powerpc64	NO
659		sh3		NO
660		sparc		NO
661		sparc64		NO
662		vax		NO
663		x86_64		NO
664
665		TODO:
666
667		all		- Need to replace mb_*() with membar_*().
668
669				- Audit MUTEX_CAS() and RWLOCK_CAS() uses
670				  to see of membar_enter() is required here.
671
672				- Talk to ad@ -- figure out of non-atomic
673				  mutex / rwlock release is actually safe.
674
675		arm		- Consider using a RAS technique like
676				  MIPS uses for _lock_cas() and the mutex
677				  stubs.  Possibly do more than one atomic
678				  op as a RAS.  Possibly implement mutex
679				  stubs using the technique.
680
681		m68k		- Need to do 68010 support.
682		
683		i386		- Need to change when x86_patch() is called
684				  so we can test ncpus.
685
686		powerpc		- Figure out if we need barriers in the
687				  atomic ops themselves (hopefully not!)
688
689		x86_64		- Need to change when x86_patch() is called
690				  so we can test ncpus.
691
692########################################################################
693# Individual developers' branches (Terminated):
694########################################################################
695
696Branch:		bouyer-scsipi
697Description:	Integration of atapi support
698Status:		Terminated
699Start Date:
700End Date:
701Base Tag:
702Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
703Scope:		kernel
704Notes:		Superseded by thorpej_scsipi
705
706Branch:		bouyer-xen2
707Description:	update xen port to xen 2.0, with support for domain0 operations
708Status:		Terminated
709Start Date:	Dec 13 2004
710End Date:	Mar 10 2005
711Base Tag:	netbsd-2-base
712Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
713Scope:		src/sys/arch/xen
714Notes:
715
716Branch:		bouyer-xenamd64
717Description:	add amd64 support to Xen and rework some parts to share more code between Xen and others
718Status:		Terminated
719Start Date:	18 Oct 2007
720End Date:	22 Nov 2007
721Base Tag:	bouyer-xenamd64-base
722Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
723Scope:		kernel
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:		jmcneill-pm
822Description:	Power management framework overhaul, ACPI improvements
823Status:		Terminated; merged before NetBSD 5.0
824Start Date:	3 Aug 2007
825End Date:	9 Dec 2007
826Base Tag:	jmcneill-pm-base
827Maintainer:	Jared D. McNeill <jmcneill@NetBSD.org>
828Scope:		kernel
829Notes:		
830
831Branch:		kenh-if-detach
832Description:	Interface detach support.
833Status:		?
834Start Date:
835End Date:
836Base Tag:	kenh-if-detach-base
837Maintainer:	Ken Hornstein <kenh@NetBSD.org>
838Scope:		kernel
839Notes:
840
841Branch:		kent-audio1
842Description:	Audio converter pipeline
843Status:		Terminated; merged to -current
844Start Date:	Tue Dec  7 2004
845End Date:	Tue Jan 11 2005
846Base Tag:	kent-audio1-base
847Maintainer:	TAMURA Kent <kent@NetBSD.org>
848Scope:		kernel (audio device drivers)
849Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
850		Please consult with the maintainer before committing
851		to this branch.
852
853Branch:		kqueue
854Description:	kqueue kernel event notification mechanism (from FreeBSD)
855Status:		Terminated; merged to -current
856Start Date:	Tue Jul 10 23:08:38 EST 2001
857End Date:	Tue Oct 24 09:14:14 GMT 2002
858Base Tag:	kqueue-base
859Maintainer:	Jaromir Dolecek <jdolecek@NetBSD.org>
860Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
861Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
862		local internal changes to better suit NetBSD, and
863		enhancements such as looking up filters by name or
864		number, and dynamic registration of "user" filters.
865		The work is complete as is, but is awaiting more
866		feedback from various kernel gurus before going mainline.
867
868Branch:		ktrace-lwp
869Description:	ktrace support for lwp ids.
870Status:		Terminated; merged to -current
871Start Date:	Wed Jul  2 15:27:30 UTC 2003
872End Date:	Sun Dec 11 12:25:29 UTC 2005
873Base Tag:	ktrace-lwp-base
874Maintainer:	Darren Reed <darrenr@NetBSD.org>
875Scope:		sys
876Notes:		
877
878Branch:		marc-pcmcia
879Description:	PCMCIA support
880Status:		Terminated; merged to -current
881Start Date:
882End Date:
883Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
884Maintainer:	Marc Horowitz <marc@NetBSD.org>
885Scope:		kernel
886Notes:
887
888Branch:		minoura_x68k_bus_h
889Description:	bus_space(9) and bus_dma(9) implementation for x68k
890Status:		Terminated; merged to -current
891Start Date:	23 Dec 1998
892End Date:	16 Mar 1999
893Base Tag:	minoura_x68k_bus_h-base
894Maintainer:	Minoura Makoto <minoura@NetBSD.org>
895Scope:		sys/arch/x68k
896Notes:
897
898Branch:		minoura-xpg4dl
899Description:	Citrus Project locale subsystem
900Status:		Terminated; (partly) merged to -current
901Start Date:	28 March 2000
902End Date:
903Base Tag:	minoura-xpg4dl-base
904Maintainer:	Minoura Makoto <minoura@NetBSD.org>
905Scope:		basesrc, syssrc, sharesrc
906Notes:		Citrus Project is developing dynamically-loadable, codeset-
907		independent locale subsystem.  Part of the implementation
908		(LC_CTYPE) called XPG4DL is now integrated to -current.
909
910Branch:		mrg-vm-swap
911Description:	dynamic swap allocation, swap-to-files support
912Status:		Terminated; abandoned 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:		newlock
966Description:	New locking primitives, based on Solaris's
967Status:		Terminated
968Start Date:	March 9, 2002
969End Date:	February 12, 2007
970Base Tag:	newlock-base
971Maintainer:	Jason R. Thorpe <thorpej@NetBSD.org>
972Scope:		Kernel
973Notes:		The goal is to replace the existing lockmgr() and
974		simple_lock() based locking mechanisms with the
975		primitives found in Solaris: mutexes and rwlocks.
976		Superseded by the newlock2 branch.
977
978Branch:		newlock2
979Description:	New locking primitives, based on Solaris's
980Status:		Terminated
981Start Date:	September 9, 2006
982End Date:	February 12, 2007
983Base Tag:	newlock2-base
984Maintainer:	Andrew Doran <ad@NetBSD.org>
985Scope:		Kernel
986Notes:		As per the newlock branch, however given the amount of time
987		the original branch has lain dormant, a new one has been
988		created.  Goals:
989		- Implement new locking primitives on most-used ports.
990		- Minor locking improvements.
991		- Remove spinlockmgr().
992
993Branch:		nick-csl-alignment
994Description:	Provide correctly aligned __cpu_simple_lock_t for hppa
995Status:		Terminated
996Start Date:	2007-07-18
997End Date:
998Base Tag:	nick-csl-alignment-base5
999Maintainer:	Nick Hudson <skrll@NetBSD.org>
1000Scope:		sys, lib/libpthread, lib/libpthread_dbg
1001Notes:	
1002
1003Branch:		perseant-lfsv2
1004Description:	LFS incompatible on-disk data structure changes
1005Status:		Terminated
1006Start Date:	27 June 2001
1007End Date:	16 July 2001
1008Base Tag:	perseant-lfsv2-base
1009Maintainer:	Konrad Schroder <perseant@NetBSD.org>
1010Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
1011Notes:		This branch should be short-lived, I expect to merge as soon
1012		as the data structures required for unremove are in and tested.
1013
1014Branch:		ppcoea-renovation
1015Description:	General renovation and cleanup of all OEA PowerPC ports.
1016Status:		Terminated; merged to -current
1017Start Date:	30 April 2007
1018End Date:	15 October 2007
1019Base Tag:	ppcoea-renovation-base
1020Maintainer:	Tim Rightnour <garbled@netbsd.org>
1021Scope:		src/sys/arch
1022Notes:		This branch is for a general cleanup of all OEA-based PowerPC
1023		ports. OEA (Operating Environment Architecture) PowerPC refers
1024		to the 601, 603, 604, and similar chips.  Specifically, not the
1025		403/401 and other embedded chips. The general concept is to get
1026		them all compiling, and sharing as much code as possible.  All
1027		developers are welcome to commit to this branch.
1028
1029Branch:		thorpej-devvp
1030Description:	replace dev_t with struct vnode * in devsw entry points
1031Status:		Terminated
1032Start Date:	Sep 6 2001
1033End Date:	???
1034Base Tag:	thorpej-devvp-base
1035Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
1036Scope:		syssrc
1037Notes:		Kernels built from this branch are not expected
1038		to function correctly at this time.
1039
1040		Ports known to compile on this branch:
1041			alpha
1042			i386
1043
1044Branch:		peter-altq
1045Description:	New ALTQ framework:
1046		- sync with KAME sources
1047		- share mtag/name mapping functions
1048		- separate altq + pf attachment
1049Status:		Terminated; merged to -current
1050Start Date:	March 16, 2006
1051End Date:	October 12, 2006
1052Base Tag:	peter-altq-base
1053Maintainer:	Peter Postma <peter@NetBSD.org>,
1054		Martin Husemann <martin@NetBSD.org>,
1055		Matthias Scheler <tron@NetBSD.org>
1056Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
1057Notes:		Only the first item in the description was finished
1058		in this branch.
1059
1060Branch:		sommerfeld_i386mp_1
1061Description:	Multiprocessor support for i386 using Intel MP BIOS.
1062Status:		Terminated; merged to -current
1063Start Date:	21 Feb 2000
1064End Date:	01 Oct 2002
1065Base Tag:	sommerfeld_i386mpbase_1
1066Maintainer:	Bill Sommerfeld <sommerfeld@NetBSD.org>
1067Scope:		sys/arch/i386
1068Notes:
1069		Code committed to the branch has booted to multiuser 
1070		on at least one system.
1071
1072		Not guaranteed to compile against mainline since -current
1073		may have changed incompatibly with the last branch update;
1074		use "cvs update -D" to roll-back the rest of the tree to match.
1075
1076		Please get explicit permission from the maintainer 
1077		before each commit, or your changes will be backed out.
1078		Other tags starting with sommerfeld_ are private to 
1079		the developer and are guaranteed to be unstable.
1080		Only the maintainer should move tags.
1081
1082		Note that this branch uses a DIFFERENT scheme for 
1083		syncing with the mainline.  the maintainer uses some private
1084		scripts for keeping them in sync; if you make commits 
1085		to the branch to "resynchronize" things, you'll
1086		probably do it wrong; instead, ask the maintainer to
1087		resynchronize things.
1088
1089		See sys/arch/i386/TODO on the branch for a list of known
1090		issues with the branch.
1091
1092Branch:		thorpej-mips-cache
1093Description:	overhaul MIPS cache support code
1094Status:		Terminated; merged to -current
1095Start Date:	Oct 23 2001
1096End Date:	Nov 14 2001
1097Base Tag:	thorpej-mips-cache-base
1098Scope:		syssrc
1099Notes:		This branch needs more debugging, testing, and more
1100		ports need to be converted to the new world order.
1101
1102		The following processors have had cache ops
1103		written:
1104
1105			* R2000/R3000 (cache_r3k) -- light testing,
1106			  needs to be beat on a lot more to make
1107			  sure it's working.
1108
1109			* R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org
1110			  tracked down a bug, which has been fixed.
1111
1112			  Confirmed working on R4000-with-L2.
1113
1114			  Confirmed working on R4400-no-L2 and
1115			  R4400-with-L2.
1116
1117			* R4600/R5000 (cache_r5k) -- shin@NetBSD.org
1118			  has committed fixes to this code.
1119
1120			  Confirmed working on R4600 v2 (SGI IP-22 with
1121			  no SysAD L2 cache).
1122
1123			  Confirmed working on RM5260 (Algorithmics P-5064).
1124
1125			* TX39 (cache_tx39) -- uch@NetBSD.org has
1126			  committed fixes to this code.  Awaiting
1127			  confirmation that it is working properly.
1128
1129			* R5900 (cache_r5900) -- uch@NetBSD.org has
1130			  written this code and tested it on a
1131			  PlayStation 2.
1132
1133		The following ports have been updated to compile (and
1134		use optimized-for-processor bus_dma routines).  Those
1135		that have been tested and work are marked with [WORKING].
1136
1137			* algor		[WORKING]
1138
1139			* arc		[WORKING]
1140
1141			* pmax		[WORKING]
1142
1143			* playstation2	[WORKING]
1144					Needs optimized bus_dmamap_sync().
1145
1146			* hpcmips	[need verification that this is working]
1147					Needs optimized bus_dmamap_sync().
1148
1149			* sgimips	[WORKING]
1150					Needs optimized bus_dmamap_sync().
1151
1152			* cobalt	[need testing]
1153
1154			* mipsco	[need testing]
1155
1156			* newsmips	[need testing]
1157
1158Branch:		thorpej_scsipi
1159Description:	SCSI/ATAPI midlayer rewrite.
1160Status:		Terminated; merged to -current
1161Start Date:
1162End Date:	Apr 25 2001
1163Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
1164Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>,
1165		Jason Thorpe <thorpej@NetBSD.org>
1166Scope:		syssrc
1167Notes:		When a change from -current is pulled up please move the
1168		thorpej_scsipi_base tag to the revision you're syncing with.
1169		thorpej_scsipi_nbase is private to maintainer (only
1170		used when syncing the whole branch with HEAD).
1171		Just before the merge, syssrc has been tagged with
1172		thorpej_scsipi_beforemerge
1173
1174Branch:		thorpej-signal
1175Description:	?
1176Status:		?
1177Start Date:
1178End Date:
1179Base Tag:	thorpej-signal-base
1180Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
1181Scope:		kernel
1182Notes:
1183
1184Branch:		thorpej-setroot
1185Description:	?
1186Status:		Terminated; merged to -current
1187Start Date:
1188End Date:
1189Base Tag:
1190Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
1191Scope:		kernel
1192Notes:
1193
1194Branch:		simonb-timecounters
1195Description:	Port FreeBSD timecounters to NetBSD
1196Status:		Terminated
1197Start Date:	Sat Feb 04 2006
1198End Date:	Wed Jun 07 2006
1199Base Tag:	simonb-timecounters-base
1200Maintainer:	Simon Burge <simonb@NetBSD.org>,
1201		Frank Kardel <kardel@NetBSD.org>
1202Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
1203Notes:		early (partial conversion) commit to -current
1204		ok'ed by core@ on 20060605 for testing and further
1205		simplified conversion
1206
1207Branch:		wrstuden-devbsize
1208Description:	Modify buffer cache to deal with different devices having
1209		different block sizes. Also DEV_BSIZE would go away.
1210Status:		Terminated
1211Start Date:	Aug or Sept 1999
1212End Date:	1 Apr 2000
1213Base tag:	wrstuden-devbsize-base
1214Maintainer:	Bill Studenmund <wrstuden@NetBSD.org>
1215Scope:		kernel
1216Notes:		No longer active due to lack of time, and introduction
1217		of UBC. In terms of UBC, the primary cache for
1218		file data is the VM cache, which needs to operate
1219		in terms of VM pages. As no existing device has native
1220		pages the same size as our VM pages, there already is
1221		a mapping going on between the VM system and the
1222		underlying blocks. So it would be easier and cleaner
1223		to adjust that to deal w/ different block sizes.
1224		Also with UBC, all i/o is in terms of bytes at an offset
1225		with a certain length, so the exact block size isn't a big
1226		deal.
1227
1228		Any other wrstuden-devbsize tag may (and should) go away.
1229
1230Branch:		yamt-idlelwp
1231Description:	idle lwp, and some changes depending on it.
1232
1233		1. separate context switching and thread scheduling.
1234		   (cf. gmcgarry_ctxsw)
1235		2. implement idle lwp.
1236		3. clean up related MD/MI interfaces.
1237		4. make scheduler(s) modular.
1238
1239Status:		Terminated; merged to -current
1240Start Date:	Fri Feb 17 2007
1241End Date:	Thu May 17 2007
1242Base Tag:	yamt-idlelwp-base8
1243Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1244Scope:		src/sys  (src/common is tagged but not branched)
1245Notes:		
1246		Status of ports:
1247		  alpha			[ Done, UP tested, MP not tested ]
1248		  i386			[ Done, tested ]
1249		  amd64			[ Done, tested ]
1250		  mips			[ Done, both MIPS1 and MIPS3 tested]
1251		  sparc			[ Done, UP tested, MP might have
1252					  some problem after newlock2 merge ]
1253		  sparc64		[ Done, tested ]
1254		  arm			[ Done, SA1 tested. See PR 36548 ]
1255		  macppc/powerpc	[ Done, OEA tested ]
1256		  hppa			[ Done, tested ]
1257		  sh3			[ Done, tested ]
1258		  vax			[ Done, UP tested, MP untested ]
1259		  m68k			[ Done, tested on several ports ]
1260		  ns32k			[ broken ]
1261		  ia64			[ broken ]
1262		  pdp10			[ broken ]
1263
1264		How to adapt a port?
1265
1266		- unify cpu_switch, cpu_exit, cpu_switchto into
1267		  a single cpu_switchto.  see cpu_switchto.9.
1268
1269		- implement cpu_idle.  see cpu_idle.9.
1270
1271		- add a flag argument to cpu_need_resched.
1272		  handle RESCHED_IMMED flag, which means "cause a preemption
1273		  as soon as possible."  eg. in the case of MULTIPROCESSOR,
1274		  send an IPI to the target cpu.
1275
1276		- "curlwp == NULL" is not a valid check for idle state anymore.
1277		  use "(curlwp->l_flag & LW_IDLE) != 0" instead.  curlwp is
1278		  almost always non-NULL, with exceptions like early on boot.
1279
1280		- remove idle pcbs.
1281
1282		- (if MULTIPROCESSOR) tweak processor trampoline code.
1283
1284		- (if MULTIPROCESSOR) call mi_cpu_attach when attaching
1285		  secondary processors.
1286
1287		- (if schedhz!=0) call schedclock regardless of the value of
1288		  curlwp.
1289
1290		- of course, update MD users of scheduler/switching API.
1291
1292Branch:		yamt-km, yamt-km-doc
1293Description:	simplify/improve kernel memory management and bootstrap
1294Status:		Terminated; merged to -current
1295Start Date:	Tue Jan 25 2005
1296End Date:	Fri Apr  1 2005
1297Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
1298Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1299Scope:		yamt-km: src/sys
1300		yamt-km-doc: src/share/man/man9/uvm.9
1301Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
1302
1303		the followings are per-port status.
1304		(account names mean "tested by".)
1305
1306		works enough to go to multiuser:
1307			alpha, i386, xen (yamt@)
1308			pc532 (simonb@)
1309			alpha, i386, mac68k, macppc, pmax, shark,
1310			    sparc, sparc64, sun3, x68k (chs@)
1311			cobalt, dreamcast, hp300, news68k, newsmips,
1312			    sun3x (tsutsui@)
1313			amiga (mhitch@)
1314			cats, hp700 (skrll@)
1315			xen (bouyer@)
1316
1317		known to have the same problem as trunk:
1318			vax (chs@, stuck while running kvm_mkdb)
1319
1320		known to have a problem:
1321			luna68k (and, if any, other m68k ports which use TTR)
1322			needs to be revisited.
1323			-> for luna68k, although not tested,
1324			   Sysmap has been moved to avoid kva conflict with
1325			   I/O ranges.
1326
1327		buildable:
1328			src/sys/arch/acorn26/conf/GENERIC
1329			src/sys/arch/acorn32/conf/GENERIC
1330			src/sys/arch/algor/conf/P6032
1331			src/sys/arch/alpha/conf/GENERIC
1332			src/sys/arch/alpha/conf/GENERIC.MP
1333			src/sys/arch/amd64/conf/GENERIC
1334			src/sys/arch/amd64/conf/GENERIC.MP
1335			src/sys/arch/amiga/conf/GENERIC
1336			src/sys/arch/arc/conf/GENERIC
1337			src/sys/arch/atari/conf/MILAN-PCIIDE
1338			src/sys/arch/bebox/conf/GENERIC
1339			src/sys/arch/cats/conf/GENERIC
1340			src/sys/arch/cesfic/conf/GENERIC
1341			src/sys/arch/cobalt/conf/GENERIC
1342			src/sys/arch/dreamcast/conf/GENERIC
1343			src/sys/arch/evbarm/conf/TS7200
1344			src/sys/arch/evbppc/conf/WALNUT
1345			src/sys/arch/evbsh3/conf/COMPUTEXEVB
1346			src/sys/arch/evbsh5/conf/CAYMAN64
1347			src/sys/arch/hp300/conf/GENERIC
1348			src/sys/arch/hp700/conf/GENERIC
1349			src/sys/arch/hpcarm/conf/JORNADA728
1350			src/sys/arch/hpcmips/conf/GENERIC
1351			src/sys/arch/hpcsh/conf/GENERIC
1352			src/sys/arch/hpcsh/conf/HPW650PA
1353			src/sys/arch/i386/conf/GENERIC
1354			src/sys/arch/i386/conf/GENERIC.MP
1355			src/sys/arch/i386/conf/XEN0
1356			src/sys/arch/i386/conf/XENU
1357			src/sys/arch/ibmnws/conf/GENERIC
1358			src/sys/arch/iyonix/conf/GENERIC
1359			src/sys/arch/luna68k/conf/GENERIC
1360			src/sys/arch/mac68k/conf/GENERIC
1361			src/sys/arch/macppc/conf/GENERIC
1362			src/sys/arch/macppc/conf/GENERIC.MP
1363			src/sys/arch/mipsco/conf/GENERIC
1364			src/sys/arch/mmeye/conf/GENERIC
1365			src/sys/arch/mvme68k/conf/GENERIC
1366			src/sys/arch/netwinder/conf/GENERIC
1367			src/sys/arch/news68k/conf/GENERIC
1368			src/sys/arch/newsmips/conf/GENERIC
1369			src/sys/arch/next68k/conf/GENERIC
1370			src/sys/arch/ofppc/conf/GENERIC
1371			src/sys/arch/pc532/conf/GENERIC
1372			src/sys/arch/pmax/conf/GENERIC
1373			src/sys/arch/prep/conf/GENERIC
1374			src/sys/arch/sandpoint/conf/GENERIC
1375			src/sys/arch/sbmips/conf/GENERIC
1376			src/sys/arch/sgimips/conf/GENERIC32_IP3x
1377			src/sys/arch/shark/conf/GENERIC
1378			src/sys/arch/sparc/conf/GENERIC
1379			src/sys/arch/sparc/conf/GENERIC.MP
1380			src/sys/arch/sparc64/conf/GENERIC
1381			src/sys/arch/sparc64/conf/GENERIC.MP
1382			src/sys/arch/sun2/conf/GENERIC
1383			src/sys/arch/sun3/conf/GENERIC
1384			src/sys/arch/vax/conf/GENERIC
1385			src/sys/arch/vax/conf/GENERIC.MP
1386			src/sys/arch/x68k/conf/GENERIC
1387
1388			src/sys/arch/playstation2/conf/GENERIC
1389
1390Branch:		yamt-pdpolicy
1391Description:	play with page replacement policy
1392		- separate page replacement policy from the rest of kernel
1393		- implement alternative replacement policy
1394		- related read-ahead adjustment?
1395Status:		Terminated; merged to -current
1396Start Date:	Sun Mar  5 2006
1397End Date:	Sat Sep 16 2006
1398Base Tag:	yamt-pdpolicy-base9
1399Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1400Scope:		src/sys  (src/common is tagged but not branched)
1401Notes:		
1402
1403Branch:		yamt-readahead
1404Description:	play with file readahead
1405Status:		Terminated; merged to -current
1406Start Date:	Mon Nov 14 2005
1407End Date:	Wed Nov 30 2005
1408Base Tag:	yamt-readahead-base3
1409Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1410Scope:		src/sys
1411Notes:		
1412
1413Branch:		yamt-uio_vmspace
1414Description:	uio_lwp/uio_segflg -> uio_vmspace
1415Status:		Terminated; merged to -current
1416Start Date:	Mon Dec 31 2005
1417End Date:	Wed Mar  1 2006
1418Base Tag:	yamt-uio_vmspace-base5
1419Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1420Scope:		src/sys
1421Notes:		
1422
1423Branch:		yamt-splraiseipl
1424Description:	finish implementing splraiseipl (and makeiplcookie).
1425		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
1426
1427		- completes workqueue(9) and netbt.
1428		- fix PR/33218.
1429
1430Status:		Terminated; merged to -current
1431Start Date:	Mon Sep 18 2006
1432End Date:	Fri Dec 22 2006
1433Base Tag:	yamt-splraiseipl-base5
1434Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1435Scope:		src/sys  (src/common is tagged but not branched)
1436Notes:		
1437		tested (by who):
1438			alpha		(yamt)
1439			alpha		(pavel)
1440			amd64		(reported privately)
1441			cobalt		(tsutsui)
1442			ews4800mips	(tsutsui)
1443			hp300		(tsutsui)
1444			hpcarm		(reported privately)
1445			i386		(yamt)
1446			macppc		(tsutsui)
1447			news68k		(tsutsui)
1448			sgimips(IP32)	(tsutsui)
1449			sparc(sun4c)	(tsutsui)
1450			sun2		(tsutsui)
1451			sun3		(tsutsui)
1452			sun3x		(tsutsui)
1453			xen		(yamt)
1454
1455		compile-tested:
1456			acorn26
1457			acorn32
1458			algor
1459			amiga
1460			arc
1461			atari
1462			bebox
1463			cats
1464			cesfic
1465			dreamcast
1466			evbarm
1467			evbmips
1468			evbppc(marvell)
1469			evbppc(ibm4xx)
1470			evbsh3
1471			hp700
1472			hpcmips
1473			hpcsh
1474			ia64
1475			ibmnws
1476			iyonix
1477			landisk
1478			luna68k
1479			mac68k
1480			mmeye
1481			mvme68k
1482			mvmeppc
1483			mipsco
1484			netwinder
1485			newsmips
1486			next68k
1487			ofppc
1488			pc532
1489			pmax
1490			pmppc
1491			prep
1492			sandpoint
1493			sbmips
1494			shark
1495			sparc
1496			sparc64
1497			vax
1498			x68k
1499			zaurus
1500
1501		not tested:
1502			pdp10 (i don't know how to build)
1503			sh5 (not buildable with an unrelated problem.)
1504
1505    compile  CAYMAN64/netbsd32_sa.o
1506    cc1: warnings being treated as errors
1507    /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c: In function 'netbsd32_sa_ucsp':
1508    /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c:126: warning: implicit declaration of function '_UC_MACHINE32_SP'
1509    --- netbsd32_sa.o ---
1510    *** [netbsd32_sa.o] Error code 1
1511    1 error
1512
1513		notyet:
1514			amigappc
1515			playstation2
1516
1517Branch:		yamt-vop
1518Description:	remove several VOPs
1519Status:		Terminated; merged to -current
1520Start Date:	Wed Oct 19 2005
1521End Date:	Wed Nov  2 2005
1522Base Tag:	yamt-vop-base3
1523Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1524Scope:		src/sys
1525Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
1526
1527Branch:		yamt-x86pmap
1528Description:	merge i386 and amd64 pmap
1529Status:		Terminated; merged to -current
1530Start Date:	Mon Sep 24 2007
1531End Date:	Fri Oct 19 2007
1532Base Tag:	yamt-x86pmap-base4
1533Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1534Scope:		src/sys  (src/common is tagged but not branched)
1535Notes:		
1536
1537Branch:		gdamore-uart
1538Description:	Add register table support to com driver.
1539Status:		Active
1540Start Date:	14 June 2006
1541End Date:	13 July 2006
1542Base Tag:	gdamore-uart-base
1543Maintainer:	Garrett D'Amore <gdamore@NetBSD.org>
1544Scope:		kernel
1545Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
1546		com support, and also removes a nasty hack from Atheros com.
1547
1548########################################################################
1549# Other:
1550########################################################################
1551
1552Branch:		magnum
1553Description:	?
1554Status:		?
1555Start Date:
1556End Date:
1557Base Tag:	magnum-base
1558Maintainer:	?
1559Scope:		kernel
1560Notes:
1561
1562