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