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