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