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