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