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