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