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