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