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