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