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