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