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