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