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