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