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