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