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