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