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