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