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