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