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