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