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