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