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