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