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