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