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