BRANCHES revision 1.355
1#	$NetBSD: BRANCHES,v 1.355 2020/11/01 15:41:56 thorpej Exp $
2#
3# This file contains a list of branches that exist in the NetBSD CVS
4# tree and their current state.
5#
6# This list is necessarily incomplete.
7# 
8# Within reason, developers may create branch and version tags at any
9# time for any purpose.  To avoid name collisions, private tags should
10# have names which begin with the developer's NetBSD login name
11# followed by a - or _ character (e.g., thorpej_scsipi,
12# thorpej-signal)
13# 
14# Any branch or version tag not listed here should be assumed to be
15# private to the developer who created it.  It is inappropriate for
16# anyone other than that developer to commit, move tags, or otherwise
17# modify the contents of the branch.
18#
19# Please update this file when a new branch is ready for consumption
20# by folks other than the maintainer, or when the use or status of an
21# existing branch changes significantly.
22#
23# Format:
24#   Branch:	  name of branch
25#   Description:  Purpose and intention of the branch
26#   Status:	  Active/Terminated/Dormant
27#   Start Date:	  date first instantiated
28#   End Date:	  date it was Terminated/made_Dormant, if any
29#   Base Tag:	  netbsd-1-5-base, etc.
30#   Maintainer:	  Somebody to blame.
31#   Scope:	  Portion of the tree covered.
32#   Notes:	  Various other info, perhaps explanation of special tags,
33#		  who-may-commit policies, etc.
34#
35# There are four sections to this file:
36#   Release branches
37#   Individual developers' branches (Active/Dormant)
38#   Individual developers' branches (Terminated), and
39#   other
40#
41# Entries within each section should be alphabetized.
42#
43
44
45# Release branches:
46
47Branch:		comdex-fall-1999
48Description:	Special release branch for pre-1.5 release at
49		Fall 1999 COMDEX.
50Status:		Terminated
51Start Date:
52End Date:
53Base Tag:	comdex-fall-1999-base
54Maintainer:	mycroft
55Scope:		Entire tree.
56Notes:
57
58Branch:		netbsd-0-9
59Description:	The NetBSD 0.9 release branch
60Status:		Terminated
61Start Date:
62End Date:
63Base Tag:	netbsd-0-9-base
64Maintainer:	Release Engineering <releng@NetBSD.org>
65Scope:		Entire tree.
66Notes:		Subsidiary tags of: netbsd-0-9-ALPHA, netbsd-0-9-ALPHA2,
67		netbsd-0-9-BETA, netbsd-0-9-RELEASE.
68		Commits restricted to release engineering.
69
70Branch:		netbsd-1-0
71Description:	The NetBSD 1.0 release branch
72Status:		Terminated
73Start Date:
74End Date:
75Base Tag:	netbsd-1-0-base
76Maintainer:	Release Engineering <releng@NetBSD.org>
77Scope:		Entire tree.
78Notes:
79		Commits restricted to release engineering.
80
81Branch:		netbsd-1-1
82Description:	The NetBSD 1.1 release branch
83Status:		Terminated
84Start Date:
85End Date:
86Base Tag:	netbsd-1-1-base
87Maintainer:	Release Engineering <releng@NetBSD.org>
88Scope:		Entire tree.
89Notes:
90		Commits restricted to release engineering.
91
92Branch:		netbsd-1-2
93Description:	The NetBSD 1.2 release branch
94Status:		Terminated
95Start Date:
96End Date:
97Base Tag:	netbsd-1-2-base
98Maintainer:	Release Engineering <releng@NetBSD.org>
99Scope:		Entire tree.
100Notes:
101		Commits restricted to release engineering.
102
103Branch:		netbsd-1-3
104Description:	The NetBSD 1.3 release branch
105Status:		Terminated
106Start Date:
107End Date:
108Base Tag:	netbsd-1-3-base
109Maintainer:	Release Engineering <releng@NetBSD.org>
110Scope:		Entire tree.
111Notes:
112		Commits restricted to release engineering.
113
114Branch:		netbsd-1-4
115Description:	The NetBSD 1.4 release branch
116Status:		Terminated
117Start Date:	1 Apr 2000
118End Date:
119Base Tag:	netbsd-1-4-base
120Maintainer:	1.4 Release Engineering <releng-1-4@NetBSD.org>
121Scope:		Entire tree.
122Notes:
123		Commits restricted to release engineering.
124
125Branch:		netbsd-1-5
126Description:	The NetBSD 1.5 release branch
127Status:		Terminated
128Start Date:	20 Jun 2000
129End Date:	26 Jan 2005
130Base Tag:	netbsd-1-5-base
131Maintainer:	1.5 Release Engineering <releng-1-5@NetBSD.org>
132Scope:		Entire tree.
133Notes:
134		Commits restricted to release engineering.
135
136Branch:		netbsd-1-6
137Description:	The NetBSD 1.6 release branch
138Status:		Terminated
139Start Date:	22 May 2002
140End Date:
141Base Tag:	netbsd-1-6-base
142Maintainer:	1.6 Release Engineering <releng-1-6@NetBSD.org>
143Scope:		Entire tree.
144Notes:
145		Commits restricted to Release Engineering.
146
147Branch:		netbsd-2
148Description:    The NetBSD 2 release branch
149Status:		Terminated
150Start Date:	23 Dec 2004
151End Date:
152Base Tag:	netbsd-2-base
153Maintainer:	2 Release Engineering <releng-2@NetBSD.org>
154Scope:		Entire tree. (src + xsrc)
155Notes:
156		Commits restricted to Release Engineering.
157
158Branch:		netbsd-2-0
159Description:	Originally the NetBSD 2.0 release branch and now the branch 
160		tracking security/critical fixes for the NetBSD 2.0 series
161Status:		Terminated
162Start Date:	28 Mar 2004 and changed for security/critical function on
163       		23 Dec 2004
164End Date:
165Base Tag:	netbsd-2-0-base
166Maintainer:	2.0 Release Engineering <releng-2-0@NetBSD.org>
167Scope:		Entire tree. (src + xsrc)
168Notes:		Branch was re-purposed to security/critical change function
169		once 2.0 released. See netbsd-2 for current branch to track
170		NetBSD 2 tree.
171		Commits restricted to Release Engineering.
172
173Branch:		netbsd-2-1
174Description:	Tracking security/critical fixes for NetBSD 2.1
175Status:		Terminated
176Start Date:     26 Oct 2005 
177End Date:
178Base Tag:	netbsd-2-1-RELEASE
179Maintainer:	2 Release Engineering <releng-2@NetBSD.org>
180Scope:		Entire tree. (src + xsrc)
181Notes:		Branch contains only security/critical fixes to
182		NetBSD 2.1.  For new features, use netbsd-2 branch.
183		Commits restricted to Release Engineering.
184
185Branch:		netbsd-3
186Description:	The NetBSD 3 release branch
187Status:		Terminated
188Start Date:	16 Mar 2005
189End Date:
190Base Tag:	netbsd-3-base
191Maintainer:	3 Release Engineering <releng-3@NetBSD.org>
192Scope:		Entire tree. (src + xsrc)
193Notes:
194		Commits restricted to Release Engineering.
195
196Branch:		netbsd-4
197Description:	The NetBSD 4 release branch
198Status:		Terminated
199Start Date:	8 Aug 2006
200End Date:
201Base Tag:	netbsd-4-base
202Maintainer:	4 Release Engineering <releng-4@NetBSD.org>
203Scope:		Entire tree. (src + xsrc)
204Notes:
205		Commits restricted to Release Engineering.
206
207Branch:		netbsd-5
208Description:	The NetBSD 5 release branch
209Status:		Terminated
210Start Date:	31 Oct 2008
211End Date:	9 Nov 2015
212Base Tag:	netbsd-5-base
213Maintainer:	5.0 Release Engineering <releng-5@NetBSD.org>
214Scope:		Entire tree. (src + xsrc)
215Notes:
216		Commits restricted to Release Engineering.
217
218Branch:		netbsd-5-0
219Description:	Tracking security/critical fixes for NetBSD 5.0
220Status:		Terminated
221Start Date:	29 Apr 2009
222End Date:
223Base Tag:	netbsd-5-0-RELEASE
224Maintainer:	5.0 Release Engineering <releng-5@NetBSD.org>
225Scope:		Entire tree. (src + xsrc)
226Notes:		Commits restricted to Release Engineering.
227
228Branch:		netbsd-5-1
229Description:	Tracking security/critical fixes for NetBSD 5.1
230Status:		Terminated
231Start Date:
232End Date:	9 Nov 2015
233Base Tag:	netbsd-5-1-RELEASE
234Maintainer:	5.1 Release Engineering <releng-5@NetBSD.org>
235Scope:		Entire tree. (src + xsrc)
236Notes:		Commits restricted to Release Engineering.
237
238Branch:		netbsd-5-2
239Description:	Tracking security/critical fixes for NetBSD 5.2
240Status:		Terminated
241Start Date:
242End Date:	9 Nov 2015
243Base Tag:	netbsd-5-2-RELEASE
244Maintainer:	5.2 Release Engineering <releng-5@NetBSD.org>
245Scope:		Entire tree. (src + xsrc)
246Notes:		Commits restricted to Release Engineering.
247
248Branch:		netbsd-6
249Description:	The NetBSD 6 release branch
250Status:		Terminated
251Start Date:	15 Feb 2012
252End Date:
253Base Tag:	netbsd-6-base
254Maintainer:	6.0 Release Engineering <releng-6@NetBSD.org>
255Scope:		Entire tree. (src + xsrc)
256Notes:
257		Commits restricted to Release Engineering.
258
259Branch:		netbsd-6-0
260Description:	Tracking security/critical fixes for NetBSD 6.0
261Status:		Terminated
262Start Date:	17 Oct 2012
263End Date:
264Base Tag:	netbsd-6-0-RELEASE
265Maintainer:	6.0 Release Engineering <releng-6@NetBSD.org>
266Scope:		Entire tree. (src + xsrc)
267Notes:
268		Commits restricted to Release Engineering.
269
270Branch:		netbsd-6-1
271Description:	Tracking security/critical fixes for NetBSD 6.1
272Status:		Terminated
273Start Date:	01 Feb 2013
274End Date:
275Base Tag:	netbsd-6-1-RELEASE
276Maintainer:	6.1 Release Engineering <releng-6@NetBSD.org>
277Scope:		Entire tree. (src + xsrc)
278Notes:
279		Commits restricted to Release Engineering.
280
281Branch:		netbsd-7
282Description:	The NetBSD 7 release branch
283Status:		Active
284Start Date:	11 Aug 2014
285End Date:
286Base Tag:	netbsd-7-base
287Maintainer:	7.0 Release Engineering <releng-7@NetBSD.org>
288Scope:		Entire tree. (src + xsrc)
289Notes:
290		Commits restricted to Release Engineering.
291
292Branch:		netbsd-7-0
293Description:	Tracking security/critical fixes for NetBSD 7.0
294Status:		Active
295Start Date:	10 Oct 2015
296End Date:
297Base Tag:	netbsd-7-0-RELEASE
298Maintainer:	7.0 Release Engineering <releng-7@NetBSD.org>
299Scope:		Entire tree. (src + xsrc)
300Notes:
301		Commits restricted to Release Engineering.
302
303Branch:		netbsd-7-1
304Description:	Tracking security/critical fixes for NetBSD 7.1
305Status:		Active
306Start Date:	15 Mar 2017
307End Date:
308Base Tag:	netbsd-7-1-RELEASE
309Maintainer:	NetBSD 7 Release Engineering <releng-7@NetBSD.org>
310Scope:		Entire tree. (src + xsrc)
311Notes:
312		Commits restricted to Release Engineering.
313
314Branch:		netbsd-8
315Description:	The NetBSD 8 release branch
316Status:		Active
317Start Date:	2017-06-04
318End Date:
319Base Tag:	netbsd-8-base
320Maintainer:	Release Engineering <releng@NetBSD.org>
321Scope:		Entire tree. (src + xsrc)
322Notes:
323		Commits restricted to Release Engineering.
324
325Branch:		netbsd-9
326Description:	The NetBSD 9 release branch
327Status:		Active
328Start Date:	2019-07-30
329End Date:
330Base Tag:	netbsd-9-base
331Maintainer:	Release Engineering <releng@NetBSD.org>
332Scope:		Entire tree. (src + xsrc)
333Notes:
334		Commits restricted to Release Engineering.
335
336########################################################################
337# Individual developers' branches (Active/Dormant):
338########################################################################
339
340Branch:		ad-audiomp
341Description:	Add MP locking to the audio drivers
342Status:		Terminated
343Start Date:	28 February 2007
344End Date:	7 December 2008
345Base Tag:	ad-audiomp-base
346Maintainer:	Andrew Doran <ad@NetBSD.org>
347Scope:		kernel
348Notes:		Making the audio drivers MP safe is necessary before efforts
349		can be made to make the VM system MP safe. About 1/2 of the
350		drivers are converted, the remaining 1/2 need more changes.
351
352		As of import this is snapshot of work in progress and so
353		may not compile; in particular the midi changes are very
354		much "in progress". The audio component has been tested
355		and verified to work with emuxki and auvia. There may
356		be a locking issue in the ac97 code at boot.
357
358		The are two locks per device instance, an ISR lock and
359		a character device lock. The ISR lock replaces calls to
360		splaudio()/splx(), and will be held across calls to device
361		methods which were called at splaudio() before (e.g.
362		trigger_output). The character device lock is held across
363		calls to nearly all of the methods, excluding some only
364		used for initialization, e.g. get_locks. This needs to be
365		documented at merge time.
366
367		To test on a multi way x86 system, search for "mpsafe" in
368		x86/x86/intr.c and change IPL_SCHED to IPL_AUDIO. Run a job
369		that will acquire the ISR lock (depends on the hardware, but
370		"while true; do mixerctl -a > /dev/null; done" may suffice).
371		Play audio, run lockstat and verify that that there is
372		contention on the ISR lock.
373
374Branch:		ad-audiomp2
375Description:	Add MP locking to the audio drivers
376Status:		Terminated
377Start Date:	7 December 2008
378End Date:	19 November 2011
379Base Tag:	ad-audiomp2-base
380Maintainer:	Andrew Doran <ad@NetBSD.org>
381Scope:		kernel
382Notes:		Ressurect ad-audiomp, make the audio drivers MP safe.
383
384Branch:		ad-namecache
385Description:	Redo the namecache
386Status:		Active
387Start Date:	8 January 2020
388End Date:
389Base Tag:	ad-namecache-base
390Maintainer:	Andrew Doran <ad@NetBSD.org>
391Scope:		src/sys src/common
392Notes:		1) Redo the namecache to focus on per-directory data
393		structures, removing the huge hashtable and nasty locking
394		scheme.
395
396		Initially this uses rbtrees (because that's what's there). 
397		The intent is that ultimately some other data structure
398		will be used.
399
400		2) Experiment with having namei() traverse the cache and
401		avoid vnode locks except for the leaf in the totally
402		in-cache case.
403
404Branch:		agc-netpgp-standalone
405Description:	Remove dependency on openssl libraries in netpgp
406Status:		Active
407Start Date:	5 May 2012
408End Date:
409Base Tag:	agc-netpgp-standalone-base
410Maintainer:	Alistair Crooks <agc@NetBSD.org>
411Scope:		src/crypto/external/bsd/netpgp
412Notes:		This branch is used to develop the version of netpgp
413		which has its own version of bignum, ciphers, and signatures
414		libraries, so that it is able to operate without openssl
415		being in place.
416
417Branch:		agc-symver
418Description:	Add library symbol versioning information
419Status:		Active
420Start Date:	24 March 2013
421End Date:
422Base Tag:	agc-symver-base
423Maintainer:	Alistair Crooks <agc@NetBSD.org>
424Scope:		src
425Notes:		This branch is used to develop DSO symbol versioning, allowing
426		symbols to be added, modified and removed from shared libraries.
427
428Branch:		bjh21-hydra
429Description:	Simtec Hydra support and ARM SMP in general
430Status:		Dormant
431Start Date:	18 Oct 2002
432End Date:
433Base Tag:	bjh21-hydra-base
434Maintainer:	Ben Harris <bjh21@NetBSD.org>
435Scope:		sys/arch/arm sys/arch/acorn32
436Notes:		This code was on a branch because it involves changes to
437		cpuswitch.S which would otherwise make merging the
438		nathanw_sa branch difficult.
439
440Branch:		bouyer-socketcan
441Description:	Implement a CAN socket layer compatible with linux SocketCAN
442Status:		Terminated
443Start Date:	Sun Jan 15 2017
444End Date:	May 27 2017
445Base Tag:	bouyer-socketcan-base
446Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
447Scope:		src/
448Notes:		Some documentation on SocketCAN is there:
449		https://www.kernel.org/doc/Documentation/networking/can.txt
450
451Branch:		cherry-xenmp
452Description:	Port i386 and amd64 Xen kernels to run MP
453Status:		Terminated
454Start Date:	1st June 2011
455End Date:	13th January 2012
456Base Tag:	cherry-xenmp-base
457Maintainer:	Cherry G. Mathew <cherry@NetBSD.org>
458Scope:		kernel
459Notes:		None
460
461Branch:		chris-arm-intr-rework
462Description:	Rework arm interrupt handling code
463Status:		Dormant
464Start Date:	11 Aug 2007
465End Date:
466Base Tag:	chris-arm-intr-rework-base
467Maintainer:	Chris Gilbert <chris@NetBSD.org>
468Scope:		sys/arch/arm sys/arch/cats (other arm archs to follow)
469Notes:		Rework arm interrupt code to provide a shared set of interrupt
470		routines, and allow improvements to be shared across all arm
471		based hardware.
472
473Branch:		gmcgarry_ucred
474Description:	Integrate and encapsulate user credentials
475Status:		Dormant
476Start Date:	18 December 2002
477End Date:
478Base Tag:	gmcgarry_ucred_base
479Maintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
480Scope:		kernel
481Notes:		merge pcred and ucred and poolify
482
483Branch:		hpcarm-cleanup
484Description:	Fix build problems for hpcarm
485Status:		Active
486Start Date:	31 July 2007
487End Date:
488Base Tag:	hpcarm-cleanup-base
489Maintainer:	Robert Swindells <rjs@NetBSD.org>
490Scope:		kernel
491Notes:		Modify SA11x0 interrupt code to match PXA2x0 equivalent.
492
493Branch:		itohy-usb1
494Description:	USB stack overhaul, mostly DMA related
495Status:		Terminated
496Start Date:	22 May 2007
497End Date:
498Base Tag:	itohy-usb1-base
499Maintainer:	ITOH Yasufumi <itohy@NetBSD.org>
500Scope:		kernel
501Notes:		To check out the kernel source tree,
502		1. check out checkout script
503			cvs checkout -ritohy-usb1 src/sys/dev/usb/filelist
504		2. update files in the branch
505			sh -e src/sys/dev/usb/filelist
506
507Branch:		jruoho-x86intr
508Description:	Cleanup and rework the x86 APIC and PIC subsystems
509Status:		Active
510Start Date:	17 January 2011
511End Date:
512Base Tag:	jruoho-x86intr-base
513Maintainer:	Jukka Ruohonen <jruoho@NetBSD.org>
514Scope:		kernel
515Notes:		This branch aims to cleanup the x86 interrupt routing code.
516		In particular, a new implementation is provided for all
517		elements of the APIC that involve ACPI. In addition, better
518		abstractions are provided for the whole PIC layer. The main
519		work areas are sys/arch/x86 and sys/dev/acpi.
520
521Branch:		jym-xensuspend
522Description:	Implement xm save/restore/migrate for NetBSD domU
523Status:		Terminated
524Start Date:	2009-02-08
525End Date:	2011-09-20
526Base Tag:	jym-xensuspend-base
527Maintainer:	Jean-Yves Migeon <jym@NetBSD.org>
528Scope:		kernel
529Notes:		This branch contains the code required to support the Xen
530		save/restore/migrate facilities. It affects domU frontend
531		drivers (xbd, xennet, xencons, hypervisor), autoconf(9)
532		machinery, as well as MD code (mostly pmap(9)).
533
534Branch:		kame
535Description:	KAME Project
536Status:		Dormant
537Start Date:	28 Jun 1999
538End Date:
539Base Tag:
540Maintainer:	Jun-ichiro itojun Hagino <itojun@NetBSD.org>
541Scope:		kernel
542Notes:		http://www.kame.net
543		Used for "reference" purposes for early part of KAME
544		integration effort.  The branch is not actively used, as I
545		(itojun) use patch(1) and diff(1) for the KAME syncs.
546
547Branch:		keiichi-mipv6
548Description:	Developing Mobile IPv6 function
549Status:		Active
550Start Date:	21 Feb 2008
551End Date:	
552Base Tag:	keiichi-mipv6-base
553Maintainer:	Keiichi Shima <keiichi@netbsd.org>
554Scope:		sys, sbin, libc/net, distrib/sets, share/man/
555Notes:		http://www.mobileip.jp/
556		Work on developing Mobile IPv6/NEMO BS functions and
557		related MIPv6 based advanced functions on NetBSD.
558		Please consult keiichi for joining this activity.
559
560Branch:		kent-audio2
561Description:	In-kernel audio mixer
562Status:		Active
563Start Date:	Sun Jan 16 2005
564End Date:	
565Base Tag:	kent-audio2-base
566Maintainer:	TAMURA Kent <kent@NetBSD.org>
567Scope:		kernel (audio device drivers)
568Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
569		Please consult with the maintainer before committing
570		to this branch.
571		This branch is not expected to be compilable yet.
572
573Branch:		khorben-n900
574Description:	Supporting the Nokia N900 smartphone
575Status:		Active
576Start Date:	2013-05-07
577Maintainer:	Pierre Pronchery <khorben@netbsd.org>
578Scope:		kernel (OMAP3 support, device drivers)
579Notes:		Do not hesitate to communicate any change that would be welcome
580		in HEAD.
581
582Branch:		matt-mips64
583Description:	Rototill the mips code to support LP64 mips and N32/N64 ABIs
584Status:		Mostly dead
585Start Date:	2007-07-17
586End Date:
587Base Tag:	matt-mips64-base
588Maintainer:	Matt Thomas <matt@NetBSD.org>
589Scope:		kernel & userland
590Notes:		
591
592Branch:		matt-nb5-mips64
593Description:	Rototill the mips code to support LP64 mips and N32/N64 ABIs
594Status:		Active
595Start Date:	2009-08-01
596End Date:
597Base Tag:	netbsd-5-1-RELEASE
598Maintainer:	Matt Thomas <matt@NetBSD.org>
599Scope:		kernel & userland
600Notes:		
601
602Branch:		matt-nb5-pq3
603Description:	Rototill the powerpc code to support mpc85xx
604Status:		Inactive
605Start Date:	2010-12-20
606End Date:
607Base Tag:	matt-nb5-pq3-base
608Maintainer:	Matt Thomas <matt@NetBSD.org>
609Scope:		kernel & userland
610Notes:		
611
612Branch:		matt-nb8-mediatek
613Description:	Add support for various MediaTek SoCs
614Status:		Active
615Start Date:	2017-10-27
616End Date:
617Base Tag:	matt-nb8-mediatek-base
618Maintainer:	Matt Thomas <matt@NetBSD.org>
619Scope:		kernel & userland
620Notes:		
621
622Branch:		mjf-devfs2
623Description:	device file system supporting dynamic device nodes
624Status:		Active
625Start Date:	21 February 2008
626End Date:
627Base Tag:	mjf-devfs2-base
628Maintainer:	Matt Fleming <mjf@NetBSD.org>
629Scope:		kernel and userland
630Notes:		This branch will move away from the static device nodes that
631		are created with MAKEDEV scripts and allow nodes to be created
632		and removed dynamically as devices are attached and detached
633		from the machine.
634
635Branch:		mjf-ufs-trans
636Description:	file system transactions for ufs
637Status:		Active
638Start Date:	12 March 2007
639End Date:
640Base Tag:	mjf-ufs-trans-base
641Maintainer:	Matt Fleming <mjf@NetBSD.org>
642Scope:		kernel
643Notes:
644
645Branch:		nick-net80211-sync
646Description:	sync of net80211 with FreeBSD
647Status:		Dormant
648Start Date:	21 February 2008
649End Date:
650Base Tag:	nick-net80211-base
651Maintainer:	Nick Hudson <skrll@NetBSD.org>
652Scope:		sys/
653Notes:		Sync'ing net80211 with FreeBSD and drivers update. The branch is
654		currently only the kernel, but will likely extend to some userland
655		areas.
656
657Branch:	  	pkgviews
658Description:  	package views, enabling multiple conflicting packages to co-exist
659Status:		Active
660Start Date:	22 July 2002
661End Date:
662Base Tag:	pkgviews
663Maintainer:	Alistair Crooks <agc@NetBSD.org>
664Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
665Notes:		A more flexible infrastructure for third-party packages by
666		allowing multiple conflicting packages and versions to co-exist
667		within the same tree
668
669Branch:		phil-wifi
670Description:	Refresh WiFi code from FreeBSD
671Status:		Abandoned
672Start Date:	2018-06-28
673End Date:	-
674Base Tag:	phil-wifi-base
675Maintainer:	phil, martin
676Scope:		src
677Notes:		This branch has been superseeded by the topic 'wifi'
678		in the src-draft mercurial repository.
679		See https://wiki.netbsd.org/Wifi_renewal_on_hg/
680
681Branch:		rmind-smpnet
682Description:	MP safe network stack (milestone 1): IPv4, UDP and ICMP
683Status:		Active
684Start Date:	17 July 2013
685End Date:	
686Base Tag:	rmind-smpnet-base
687Maintainer:	Mindaugas Rasiukevicius <rmind@netbsd.org>
688Scope:		Kernel: src/sys (src/common is tagged but not branched)
689Notes:		Goals:
690
691		- Improve the abstraction of PCB and other interfaces.
692		- Add PCB and route cache locking, adjust socket locking.
693		- Rework IPv4, UDP and ICMP paths to be MP safe.
694		- Switch UDP sockets to a separate lock, test and benchmark.
695
696Branch:		rpaulo-netinet-merge-pcb
697Description:	merge in6pcb with inpcb
698Status:		Dormant
699Start Date:	Wed Feb 01 2006
700End Date:	
701Base Tag:	rpaulo-netinet-merge-pcb-base
702Maintainer:	Rui Paulo <rpaulo@NetBSD.org>
703Scope:		src/sys
704Notes:		No longer active due to the lack of time. If you plan to
705		continue this branch, sys/netinet/in_pcb.h already contains
706		the proposed structure layout (which was roughly discussed
707		in the tech-net mailing list).
708		I also defined INP_*() macros to mimicate FreeBSD's inpcb
709		locking style, but currently they do nothing and are not
710		yet called at the correct places (needs discussion about
711		kernel fine-grained locking).
712		To continue this branch, one needs to read all the relevant
713		inpcb/in6pcb source files and change the function names,
714		structure names, structure fields according to the new
715		layout (in6pcb is gone).
716		Don't try to build a kernel from this branch because it won't
717		work. The missing pieces required to do a complete build
718		were not committed because they were incomplete and generated
719		panics.
720		You shouldn't need to worry about KAME syncs because
721		they did most of them by now.
722		After the work is done, you are required to test the branch
723		(before the merge to -current) with an interop IPv6 test.
724		More info at: http://www.tahi.org/
725
726Branch:		thorpej-futex
727Description:	Overhaul of futex operations to fix thread priority issues
728Status:		Active
729Start Date:	Sun Nov 1 2020
730End Date:
731Base Tag:	thorpej-futex-base
732Maintainer:	Jason Thorpe <thorpej@netbsd.org>
733Scope:		src/sys src/tests/lib/libc/sys
734Note:		Normal futex operataions pass the test suite, but there are
735		issues with Linux compatibility currently, that need to be
736		addressed before merging.  Also includes new NetBSD extensions
737		to the futex interface to support reader/writer locks.  Those
738		changes can be discounted in favor of fixing the standard
739		futex operations with respect to Linux compatibility.
740
741Branch:  	wrstuden-fixsa
742Description:	Fix a number of issues present with Scheduler Activations.
743Status: 	Active
744Start Date:	15 May 2007
745End Date:
746Base Tag:	wrstuden-fixsa-base
747Maintainer:	Bill Stouder-Studenmund <wrstuden@NetBSD.org>
748Scope:		src, though all the interesting stuff is in the kernel
749		or lib/libpthread or maybe gdb.
750Notes:		This branch is based off of the netbsd-4 branch!
751		This branch is intended to stage improvements for the
752		Scheduler Activations system for NetBSD 4. Improvements
753		include not allocating memory while preparing to tsleep(),
754		reducing inappropriate upcall delivery (hopefully also
755		eliminating the need to mlock stacks), and being
756		able to pthread_kill() running threads. At this date,
757		most goals have been achieved. This branch also includes
758		fixes to gdb to support working with threaded apps.
759
760Branch:  	wrstuden-revivesa
761Description:	Fix a number of issues present with Scheduler Activations.
762Status: 	Active
763Start Date:	10 May 2008
764End Date:
765Base Tag:	wrstuden-revivesa-base
766Maintainer:	Bill Stouder-Studenmund <wrstuden@NetBSD.org>
767Scope:		src, though all the interesting stuff is in the kernel
768Notes:		This branch is intended to revive Scheduler Activations
769		in -current in the 5.0 era. This branch's main goal is
770		to re-add syscall compatability so that SA-based libpthread
771		programs can run with a -current kernel. 1:1 threading will
772		remain the NetBSD-default. This branch will re-add necessary
773		upcall support, and will also serve as a chance to clean
774		out cruft that had accumulated in the implementation over
775		time.
776
777Branch:		yamt-kmem
778Description:	
779		- separate kernel va allocation from kernel fault handling.
780		- make kmem_alloc interrupt-safe.
781Status:		Active
782Start Date:	Sun Dec  9 2007
783End Date:	
784Base Tag:	yamt-kmem-base3
785Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
786Scope:		src/sys  (src/common is tagged but not branched)
787Notes:		
788		todo:
789		- investigate if PMAP_PREFER equivalent can be done
790		  with vmem_xalloc.  find a tester with hardware for it.
791		- g/c replaced code, including kmapent and malloc.
792		- consider to remove other submaps.  eg. mb_map
793
794Branch:		yamt-nfs-mp
795Description:	make nfs client mp-safe
796Status:		Active
797Start Date:	Sun Apr 27 2008
798End Date:	
799Base Tag:	yamt-nfs-mp-base11
800Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
801Scope:		src/sys  (src/common is tagged but not branched)
802Notes:		
803
804Branch:		yamt-pagecache
805Description:	page cache related changes
806Status:		Active
807Start Date:	Wed Nov 2 2011
808End Date:	
809Base Tag:	yamt-pagecache-base8
810Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
811Scope:		src
812Notes:		- maintain object pages in radix tree rather than rb tree.
813		- shrink the size of vm_page.
814		- reduce unnecessary page scan in putpages.  esp. when an
815		  object has a ton of pages cached but only a few of them
816		  are dirty.
817		- reduce the number of pmap operations by tracking page
818		  dirtiness more precisely in uvm layer.
819		- fix nfs commit range tracking.
820		- fix nfs write clustering.  XXX hack
821		- fix A->O loaning
822		- write radixtree(9) man page
823
824		TODO:
825			- benchmark
826			- test
827			- make the write clustering fix less kludgy
828			- fix or disable the ad-hoc per-cpu statistic
829			- disable A->O loan as its benefit is unclear at best
830
831		tested: i386, amd64, nfs, ffs
832
833		have good chances to be broken: lfs, sparc64, hp700
834
835		the following is kernel build test results.
836		most of NG seem unrelated to the changes in the branch.
837
838			acorn26  GENERIC    OK      
839			acorn32  GENERIC    OK      
840			algor    P6032      NG      
841			alpha    GENERIC    OK      
842			alpha    GENERIC.MP OK      
843			amd64    GENERIC    OK      
844			amd64    XEN3_DOM0  OK      
845			amd64    XEN3_DOMU  OK      
846			amiga    GENERIC    OK      
847			amigappc GENERIC    OK      
848			arc      GENERIC    OK      
849			atari    MILAN-PCIIDE OK      
850			bebox    GENERIC    OK      
851			cats     GENERIC    OK      
852			cesfic   GENERIC    OK      
853			cobalt   GENERIC    OK      
854			dreamcast GENERIC    NG      
855			emips    GENERIC    OK      
856			evbarm   NSLU2      NG      
857			evbarm   TS7200     NG      
858			evbmips  P6032      NG      
859			evbmips  MALTA      NG      
860			evbppc   WALNUT     NG      
861			evbppc   EXPLORA451 NG      
862			evbppc   PMPPC      NG      
863			evbsh3   COMPUTEXEVB OK      
864			ews4800mips GENERIC    OK      
865			hp300    GENERIC    OK      
866			hp700    GENERIC    OK      
867			hpcarm   JORNADA720 OK      
868			hpcarm   JORNADA728 OK      
869			hpcmips  GENERIC    OK      
870			hpcsh    GENERIC    OK      
871			hpcsh    HPW650PA   OK      
872			i386     MONOLITHIC OK      
873			i386     GENERIC    OK      
874			i386     XEN3_DOM0  OK      
875			i386     XEN3_DOMU  OK      
876			i386     ALL        NG      
877			ia64     GENERIC    OK      
878			ia64     GENERIC.SKI NG      
879			ibmnws   GENERIC    OK      
880			iyonix   GENERIC    NG      
881			landisk  GENERIC    OK      
882			luna68k  GENERIC    OK      
883			mac68k   GENERIC    OK      
884			macppc   GENERIC    OK      
885			macppc   GENERIC.MP OK      
886			mipsco   GENERIC    OK      
887			mmeye    GENERIC    OK      
888			mvme68k  GENERIC    OK      
889			mvmeppc  GENERIC    OK      
890			netwinder GENERIC    NG      
891			news68k  GENERIC    OK      
892			newsmips GENERIC    OK      
893			next68k  GENERIC    OK      
894			ofppc    GENERIC    OK      
895			ofppc    GENERIC.MP NG      
896			pmax     GENERIC    OK      
897			prep     GENERIC    OK      
898			rs6000   GENERIC    NG      
899			sandpoint GENERIC    OK      
900			sbmips   GENERIC    NG      
901			sbmips   GENERIC.MP NG      
902			sgimips  GENERIC32_IP3x OK      
903			shark    GENERIC    NG      
904			sparc    GENERIC    OK      
905			sparc    GENERIC.MP OK      
906			sparc64  GENERIC    OK      
907			sun2     GENERIC    OK      
908			sun3     GENERIC    OK      
909			usermode GENERIC    NG      
910			vax      GENERIC    OK      
911			vax      GENERIC.MP OK      
912			x68k     GENERIC    OK      
913			zaurus   GENERIC    NG      
914
915Branch:		reinoud-bufcleanup
916Description:	implement and evaluate struct buf usage cleanup strategies.
917		Ideas currently in mind (preference for b):
918		a)
919			1. use of bio_ops per buffer.
920			2. allow chaining/overloading of functions in bio_ops
921			   and provide some private context.
922			3. extend the bio_ops with commonly used functionality
923			   like pending action counting, custom context passing,
924			   last minute processing of buffer data, buffer cache
925			   etc.
926			4. investigate the use of the kcont()
927			   continuation-passing framework for async io
928			   completion notification for bufs
929			...
930		b)
931			1. all sequencing use of B_CALL replaced by
932			   device-threads, if possible generic code around BUFQ
933			2. possibly use kcont() for async IO finished signaling
934			3. counter of pending and queued actions requestable
935			   by IOCTL interface?
936			4. implement `last minute buffer fixup' calls and maybe
937			   even finished I/O calls as vnode operations
938			...
939Status:		Active
940Start Date:	Thu Mar 15 2007
941End Date:
942Base Tag:	reinoud-bufcleanup-base
943Maintainer:	Reinoud Zandijk <reinoud@NetBSD.org>
944Scope:		src/sys and src/common
945Notes:		Used as experiment sandbox and if successful hopefully one day
946		to be integrated.
947
948
949########################################################################
950# Individual developers' branches (Terminated):
951########################################################################
952
953Branch:		pgoyette-compat
954Description:	clean-up of compat module
955Status:		Merged
956Start Date:	Tues Mar 6, 2018
957End Date:	Sun Jan 27, 2019
958Base Tag:	pgoyette-compat-base
959Maintainer:	pgoyette
960Scope:		src/
961Notes:
962
963Branch:		prg-localcount2
964Description:	Implement localcount reference counting as proposed by
965		riastradh@ - supersedes abandonded pgoyette-localcount
966Status:		Suspended - core of the changes were merged to HEAD
967Start Date:	Wed Apr 26 2017
968End Date:	
969Base Tag:	prg-localcount2-base
970Maintainer:	pgoyette
971Scope:		src/sys/
972Notes:		
973
974Branch:		pgoyette-localcount
975Description:	Implement localcount reference counting as proposed by
976		riastradh@
977Status:		Terminated
978Start Date:	Fri Jul 15 2016
979End Date:	Wed Apr 26 2017
980Base Tag:	pgoyette-localcount-base
981Maintainer:	pgoyette
982Scope:		src/sys/
983Notes:		Abandoned - there seems to have been some CVS "pilot
984		error during one of the sync-with-head and now there
985		are an unknown number of commits missing from an
986		unknown number of files from an unknown time period.
987		The work will be salvaged as much as possible, and
988		applied to a new clean branch.
989
990Branch:		bouyer-scsipi
991Description:	Integration of atapi support
992Status:		Terminated
993Start Date:
994End Date:
995Base Tag:
996Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
997Scope:		kernel
998Notes:		Superseded by thorpej_scsipi
999
1000Branch:		bouyer-xen2
1001Description:	update xen port to xen 2.0, with support for domain0 operations
1002Status:		Terminated
1003Start Date:	Dec 13 2004
1004End Date:	Mar 10 2005
1005Base Tag:	netbsd-2-base
1006Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
1007Scope:		src/sys/arch/xen
1008Notes:
1009
1010Branch:		bouyer-xenamd64
1011Description:	add amd64 support to Xen and rework some parts to share more code between Xen and others
1012Status:		Terminated
1013Start Date:	18 Oct 2007
1014End Date:	22 Nov 2007
1015Base Tag:	bouyer-xenamd64-base
1016Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
1017Scope:		kernel
1018Notes:		
1019
1020Branch:		bouyer-xeni386
1021Description:	switch xen on i386 to the x86 pmap and the xen/x86/x86_xpmap.c bootstrap, and add i386 PAE support
1022Status:		Terminated
1023Start Date:	10 Dec 2007
1024End Date:	23 Jan 2008
1025Base Tag:	bouyer-xeni386-base
1026Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
1027Scope:		kernel
1028Notes:		
1029
1030Branch:		bouyer-quota2
1031Description:	modernise disk quotas
1032Status:		Terminated
1033Start Date:	Thu Jan 20 2011
1034End Date:	March 06 2011
1035Base Tag:	bouyer-quota2-base
1036Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>
1037Scope:		src/
1038Notes:
1039
1040Branch: 	chap-midi
1041Description:	Renovation of MIDI support
1042Status: 	Terminated; merged to -current
1043Start Date:	19 May 2006
1044End Date:	30 Jun 2006
1045Base Tag:	chap-midi-base
1046Maintainer:	Chapman Flack <chap@NetBSD.org>
1047Scope:		sys, share/man, usr.bin
1048Notes:
1049
1050Branch:		chs-ubc
1051Description:	Unified Buffer Cache
1052Status:		Terminated
1053Start Date:
1054End Date:
1055Base Tag:	chs-ubc-base
1056Maintainer:	Chuck Silvers <chs@NetBSD.org>
1057Scope:		kernel
1058Notes:
1059
1060Branch:		chs-ubc2
1061Description:	 Unified Buffer Cache
1062Status:		Terminated; merged to -current
1063Start Date:
1064End Date:
1065Base Tag:	chs-ubc2-base, chs-ubc2-newbase
1066Maintainer:	Chuck Silvers <chs@NetBSD.org>
1067Scope:		kernel
1068Notes:
1069
1070Branch:		cjs-build-against-obj-dir
1071Description:	?
1072Status:		?
1073Start Date:
1074End Date:
1075Base Tag:
1076Maintainer:	Curt Sampson <cjs@NetBSD.org>
1077Scope:		Entire tree.
1078Notes:
1079
1080Branch:		cube-autoconf
1081Description:	Renovate autoconf(9) API
1082Status:		Terminated; abandoned
1083Start Date:	11 Dec 2007
1084End Date:
1085Base Tag:	cube-autoconf-base
1086Maintainer:	Quentin Garnier <cube@NetBSD.org>
1087Scope:		kernel usr.bin/config (and some other userland bits)
1088Notes:		Address a number of issues the current autoconf(9) API has.
1089
1090Branch:		eeh-paddr_t
1091Description:	use separate types for virtual vs. physical addresses
1092Status:		Terminated; merged to -current
1093Start Date:
1094End Date:
1095Base Tag:	eeh-paddr_t-base
1096Maintainer:	Eduardo Horvath <eeh@NetBSD.org>
1097Scope:		kernel
1098Notes:		This is needed to support 32-bit kernels on sparc64.
1099
1100Branch:		elad-kernelauth
1101Description:	Native NetBSD implementation of Apple's kernel authorization
1102		based on TN2127. This is a "clean-room" implementation to
1103		avoid any licensing issues.
1104Status:		Terminated; merged to -current
1105Start Date:	Tue Mar	 7 2006
1106End Date:	Mon May 15 2006
1107Base Tag:	elad-kernelauth-base
1108Maintainer:	Elad Efrat <elad@NetBSD.org>
1109Scope:		src/sys, src/share/man/man9/Makefile,
1110		src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
1111Notes:
1112
1113Branch:		fvdl-softdep
1114Description:	FFS soft dependencies
1115Status:		Terminated; merged to -current
1116Start Date:
1117End Date:
1118Base Tag:	fvdl-softdep-base
1119Maintainer:	Frank van der Linden <fvdl@NetBSD.org>
1120Scope:		kernel
1121Notes:
1122
1123Branch:		gehenna-devsw
1124Description:	auto-generation of devsw table
1125Status:		Terminated
1126Start Date:	16 May 2002
1127End Date:	6 Sep 2002
1128Base Tag:	gehenna-devsw-base
1129Maintainer:	MAEKAWA Masahide <gehenna@NetBSD.org>
1130Scope:		syssrc
1131Notes:		The goal is to get rid of the existing device switch tables in
1132		port-dependent conf.c and to generate them dynamically by
1133		config(8).
1134
1135Branch:         haad-dm
1136Description:    Add support for LVM to NetBSD
1137Status:         Terminated; merged with -current
1138Start Date:     7 July 2008
1139End Date:	19 December 2008
1140Base Tag:       haad-dm-base
1141Maintainer:     Adam Hamsik <haad@NetBSD.org>
1142Scope:          kernel
1143Notes:          LVM support is based on Linux lvm2tools, 
1144                libdevmapper library and NetBSD device-mapper
1145                driver. 
1146
1147Branch:		is-newarp
1148Description:	ARP for non-Ethernet
1149Status:		Terminated; merged before NetBSD 1.3
1150Start Date:	1996/10/13
1151End Date:	1997/03/15
1152Base Tag:	is-newarp-base
1153Maintainer:	Ignatios Souvatzis <is@NetBSD.org>
1154Scope:		kernel
1155Notes:
1156
1157Branch:		isaki-audio2
1158Description:	Overhaul audio subsystem
1159Status:		Terminated; merged to -current
1160Start Date:	21 Apr 2019
1161End Date:	08 May 2019
1162Base Tag:	isaki-audio2-base
1163Maintainer:	Tetsuya Isaki <isaki@NetBSD.org>
1164Scope:		src/sys
1165Notes:		Rework audio subsystem, including multiple streaming,
1166		filter pipeline.
1167
1168Branch:		jmcneill-pm
1169Description:	Power management framework overhaul, ACPI improvements
1170Status:		Terminated; merged before NetBSD 5.0
1171Start Date:	3 Aug 2007
1172End Date:	9 Dec 2007
1173Base Tag:	jmcneill-pm-base
1174Maintainer:	Jared D. McNeill <jmcneill@NetBSD.org>
1175Scope:		kernel
1176Notes:		
1177
1178Branch:		jmcneill-audiomp3
1179Description:	Add MP locking to the audio drivers
1180Status:		Terminated; merged before NetBSD 6.0
1181Start Date:	19 Nov 2011
1182End Date:	23 Nov 2011
1183Base Tag:	jmcneill-audiomp3-base
1184Maintainer:	Jared D. McNeill <jmcneill@NetBSD.org>
1185Scope:		kernel
1186Notes:		Resurrect ad-audiomp2, make the audio drivers MP safe.
1187
1188Branch:		kenh-if-detach
1189Description:	Interface detach support.
1190Status:		?
1191Start Date:
1192End Date:
1193Base Tag:	kenh-if-detach-base
1194Maintainer:	Ken Hornstein <kenh@NetBSD.org>
1195Scope:		kernel
1196Notes:
1197
1198Branch:		kent-audio1
1199Description:	Audio converter pipeline
1200Status:		Terminated; merged to -current
1201Start Date:	Tue Dec  7 2004
1202End Date:	Tue Jan 11 2005
1203Base Tag:	kent-audio1-base
1204Maintainer:	TAMURA Kent <kent@NetBSD.org>
1205Scope:		kernel (audio device drivers)
1206Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
1207		Please consult with the maintainer before committing
1208		to this branch.
1209
1210Branch:		kqueue
1211Description:	kqueue kernel event notification mechanism (from FreeBSD)
1212Status:		Terminated; merged to -current
1213Start Date:	Tue Jul 10 23:08:38 EST 2001
1214End Date:	Tue Oct 24 09:14:14 GMT 2002
1215Base Tag:	kqueue-base
1216Maintainer:	Jaromir Dolecek <jdolecek@NetBSD.org>
1217Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
1218Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
1219		local internal changes to better suit NetBSD, and
1220		enhancements such as looking up filters by name or
1221		number, and dynamic registration of "user" filters.
1222
1223Branch:		ktrace-lwp
1224Description:	ktrace support for lwp ids.
1225Status:		Terminated; merged to -current
1226Start Date:	Wed Jul  2 15:27:30 UTC 2003
1227End Date:	Sun Dec 11 12:25:29 UTC 2005
1228Base Tag:	ktrace-lwp-base
1229Maintainer:	Darren Reed <darrenr@NetBSD.org>
1230Scope:		sys
1231Notes:		
1232
1233Branch:		marc-pcmcia
1234Description:	PCMCIA support
1235Status:		Terminated; merged to -current
1236Start Date:
1237End Date:
1238Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
1239Maintainer:	Marc Horowitz <marc@NetBSD.org>
1240Scope:		kernel
1241Notes:
1242
1243Branch:		matt-armv6
1244Description:	Rototill the arm code to support features present in the
1245		v6 of the ARM Architecture.  Additionally, clean up things
1246		along the way to use common practices.
1247Status:		Terminated; merged to -current
1248Start Date:	2007-08-27
1249End Date:	2008-04-27
1250Base Tag:	matt-armv6-base
1251Maintainer:	Matt Thomas <matt@NetBSD.org>
1252Scope:		kernel & userland
1253Notes:	
1254
1255Branch:		minoura_x68k_bus_h
1256Description:	bus_space(9) and bus_dma(9) implementation for x68k
1257Status:		Terminated; merged to -current
1258Start Date:	23 Dec 1998
1259End Date:	16 Mar 1999
1260Base Tag:	minoura_x68k_bus_h-base
1261Maintainer:	Minoura Makoto <minoura@NetBSD.org>
1262Scope:		sys/arch/x68k
1263Notes:
1264
1265Branch:		minoura-xpg4dl
1266Description:	Citrus Project locale subsystem
1267Status:		Terminated; (partly) merged to -current
1268Start Date:	28 March 2000
1269End Date:
1270Base Tag:	minoura-xpg4dl-base
1271Maintainer:	Minoura Makoto <minoura@NetBSD.org>
1272Scope:		basesrc, syssrc, sharesrc
1273Notes:		Citrus Project is developing dynamically-loadable, codeset-
1274		independent locale subsystem.  Part of the implementation
1275		(LC_CTYPE) called XPG4DL is now integrated to -current.
1276
1277Branch:		mjf-devfs
1278Description:	device file system supporting dynamic device nodes
1279Status:		Terminated
1280Start Date:	12 November 2007
1281End Date:	21 February 2008
1282Base Tag:	mjf-devfs-base
1283Maintainer:	Matt Fleming <mjf@NetBSD.org>
1284Scope:		kernel and userland
1285Notes:		This branch will move away from the static device nodes that
1286		are created with MAKEDEV scripts and allow nodes to be created
1287		and removed dynamically as devices are attached and detached
1288		from the machine.
1289
1290Branch:		mrg-vm-swap
1291Description:	dynamic swap allocation, swap-to-files support
1292Status:		Terminated; abandoned for mrg-vm-swap2
1293Start Date:	12 February 1997
1294End Date:	15 March 1997
1295Base Tag:	[none]
1296Maintainer:	Matthew R. Green <mrg@NetBSD.org>
1297Scope:		kernel
1298Notes:
1299
1300Branch:		mrg-vm-swap2
1301Description:	dynamic swap allocation, swap-to-files support
1302Status:		Terminated; merged to -current
1303Start Date:	4 May 1997
1304End Date:	12 June 1997
1305Base Tag:	mrg-vm-swap2-base
1306Maintainer:	Matthew R. Green <mrg@NetBSD.org>
1307Scope:		kernel
1308Notes:
1309
1310Branch:		nathanw_sa
1311Description:	Scheduler activations
1312Status:		Terminated; merged to -current
1313Start Date:	5 March 2001
1314End Date:	18 January 2003
1315Base Tag:	nathanw_sa_base
1316Maintainer:	Nathan Williams <nathanw@NetBSD.org>
1317Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
1318		bin/ps usr.bin/systat usr.bin/top usr.bin/w
1319		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
1320Notes:		The idea of scheduler activations is described in the
1321		classic paper by Anderson et al., in ACM Transactions
1322		a on Computer Systems volume 10 issue 1 (1992),which
1323		can be found at
1324		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
1325		Many ideas in the implementation are based on the
1326		implementation of scheduler activations added to Mach
1327		3.0 and described by Davis et al. in the University of
1328		Washington CS tech report 92-08-93, which can be found
1329		at
1330		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
1331
1332		My USENIX paper on the subject can be found at
1333		http://web.mit.edu/nathanw/www/usenix/
1334
1335		Please consult with the maintainer before committing
1336		to this branch.
1337		Other tags starting with nathanw_sa reserved for
1338		branch management and are not guaranteed to be stable.
1339
1340		Trunk tagged with "nathanw_sa_before_merge" prior to
1341		merging branch down to trunk.  Branch tagged with
1342		"nathanw_sa_end" to indicate the ending revision of
1343		the branch.
1344
1345Branch:		newlock
1346Description:	New locking primitives, based on Solaris's
1347Status:		Terminated
1348Start Date:	March 9, 2002
1349End Date:	February 12, 2007
1350Base Tag:	newlock-base
1351Maintainer:	Jason R. Thorpe <thorpej@NetBSD.org>
1352Scope:		Kernel
1353Notes:		The goal is to replace the existing lockmgr() and
1354		simple_lock() based locking mechanisms with the
1355		primitives found in Solaris: mutexes and rwlocks.
1356		Superseded by the newlock2 branch.
1357
1358Branch:		newlock2
1359Description:	New locking primitives, based on Solaris's
1360Status:		Terminated
1361Start Date:	September 9, 2006
1362End Date:	February 12, 2007
1363Base Tag:	newlock2-base
1364Maintainer:	Andrew Doran <ad@NetBSD.org>
1365Scope:		Kernel
1366Notes:		As per the newlock branch, however given the amount of time
1367		the original branch has lain dormant, a new one has been
1368		created.  Goals:
1369		- Implement new locking primitives on most-used ports.
1370		- Minor locking improvements.
1371		- Remove spinlockmgr().
1372
1373Branch:		nick-csl-alignment
1374Description:	Provide correctly aligned __cpu_simple_lock_t for hppa
1375Status: 	Terminated; merged to -current
1376Start Date:	2007-07-18
1377End Date:
1378Base Tag:	nick-csl-alignment-base5
1379Maintainer:	Nick Hudson <skrll@NetBSD.org>
1380Scope:		sys, lib/libpthread, lib/libpthread_dbg
1381Notes:	
1382
1383Branch:		perseant-lfsv2
1384Description:	LFS incompatible on-disk data structure changes
1385Status:		Terminated
1386Start Date:	27 June 2001
1387End Date:	16 July 2001
1388Base Tag:	perseant-lfsv2-base
1389Maintainer:	Konrad Schroder <perseant@NetBSD.org>
1390Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
1391Notes:		This branch should be short-lived, I expect to merge as soon
1392		as the data structures required for unremove are in and tested.
1393
1394Branch:		ppcoea-renovation
1395Description:	General renovation and cleanup of all OEA PowerPC ports.
1396Status:		Terminated; merged to -current
1397Start Date:	30 April 2007
1398End Date:	15 October 2007
1399Base Tag:	ppcoea-renovation-base
1400Maintainer:	Tim Rightnour <garbled@netbsd.org>
1401Scope:		src/sys/arch
1402Notes:		This branch is for a general cleanup of all OEA-based PowerPC
1403		ports. OEA (Operating Environment Architecture) PowerPC refers
1404		to the 601, 603, 604, and similar chips.  Specifically, not the
1405		403/401 and other embedded chips. The general concept is to get
1406		them all compiling, and sharing as much code as possible.  All
1407		developers are welcome to commit to this branch.
1408
1409Branch:		thorpej-devvp
1410Description:	replace dev_t with struct vnode * in devsw entry points
1411Status:		Terminated
1412Start Date:	Sep 6 2001
1413End Date:	???
1414Base Tag:	thorpej-devvp-base
1415Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
1416Scope:		syssrc
1417Notes:		Kernels built from this branch are not expected
1418		to function correctly at this time.
1419
1420		Ports known to compile on this branch:
1421			alpha
1422			i386
1423
1424Branch:		peter-altq
1425Description:	New ALTQ framework:
1426		- sync with KAME sources
1427		- share mtag/name mapping functions
1428		- separate altq + pf attachment
1429Status:		Terminated; merged to -current
1430Start Date:	March 16, 2006
1431End Date:	October 12, 2006
1432Base Tag:	peter-altq-base
1433Maintainer:	Peter Postma <peter@NetBSD.org>,
1434		Martin Husemann <martin@NetBSD.org>,
1435		Matthias Scheler <tron@NetBSD.org>
1436Scope:		dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
1437Notes:		Only the first item in the description was finished
1438		in this branch.
1439
1440Branch:		rmind-uvmplock
1441Description:	Reorganize locking in UVM and improve x86 pmap(9)
1442Status:		Terminated; merged to -current
1443Start Date:	15 March 2010
1444End Date:	12 June 2011
1445Base Tag:	rmind-uvmplock-base
1446Maintainer:	Mindaugas Rasiukevicius <rmind@netbsd.org>
1447Scope:		Kernel
1448Notes:		Goals:
1449
1450		- Reorganize locking in UVM and serialize pmap(9) operations
1451		  on same page(s).  New lock order: [vmpage-lock] -> pmap-lock.
1452		  Based on the patch from ad@.
1453		- Simplify locking in pmap(9) modules by removing P->V locking.
1454		- Use mutex_obj(9) on vmobjlock (and thus vnode_t::v_interlock)
1455		  to share locks among UVM objects where necessary.
1456		- Rewrite and optimize x86 TLB shootdown code.
1457		- Unify /dev/mem et al in MI code and provide required locking.
1458
1459		Future work:
1460
1461		- Optimize pmap_remove() with tracking in struct vm_map_entry.
1462
1463Branch:		sommerfeld_i386mp_1
1464Description:	Multiprocessor support for i386 using Intel MP BIOS.
1465Status:		Terminated; merged to -current
1466Start Date:	21 Feb 2000
1467End Date:	01 Oct 2002
1468Base Tag:	sommerfeld_i386mpbase_1
1469Maintainer:	Bill Sommerfeld <sommerfeld@NetBSD.org>
1470Scope:		sys/arch/i386
1471Notes:
1472		Code committed to the branch has booted to multiuser 
1473		on at least one system.
1474
1475		Not guaranteed to compile against mainline since -current
1476		may have changed incompatibly with the last branch update;
1477		use "cvs update -D" to roll-back the rest of the tree to match.
1478
1479		Please get explicit permission from the maintainer 
1480		before each commit, or your changes will be backed out.
1481		Other tags starting with sommerfeld_ are private to 
1482		the developer and are guaranteed to be unstable.
1483		Only the maintainer should move tags.
1484
1485		Note that this branch uses a DIFFERENT scheme for 
1486		syncing with the mainline.  the maintainer uses some private
1487		scripts for keeping them in sync; if you make commits 
1488		to the branch to "resynchronize" things, you'll
1489		probably do it wrong; instead, ask the maintainer to
1490		resynchronize things.
1491
1492		See sys/arch/i386/TODO on the branch for a list of known
1493		issues with the branch.
1494
1495Branch:		thorpej-mips-cache
1496Description:	overhaul MIPS cache support code
1497Status:		Terminated; merged to -current
1498Start Date:	Oct 23 2001
1499End Date:	Nov 14 2001
1500Base Tag:	thorpej-mips-cache-base
1501Scope:		syssrc
1502Notes:		This branch needs more debugging, testing, and more
1503		ports need to be converted to the new world order.
1504
1505		The following processors have had cache ops
1506		written:
1507
1508			* R2000/R3000 (cache_r3k) -- light testing,
1509			  needs to be beat on a lot more to make
1510			  sure it's working.
1511
1512			* R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org
1513			  tracked down a bug, which has been fixed.
1514
1515			  Confirmed working on R4000-with-L2.
1516
1517			  Confirmed working on R4400-no-L2 and
1518			  R4400-with-L2.
1519
1520			* R4600/R5000 (cache_r5k) -- shin@NetBSD.org
1521			  has committed fixes to this code.
1522
1523			  Confirmed working on R4600 v2 (SGI IP-22 with
1524			  no SysAD L2 cache).
1525
1526			  Confirmed working on RM5260 (Algorithmics P-5064).
1527
1528			* TX39 (cache_tx39) -- uch@NetBSD.org has
1529			  committed fixes to this code.  Awaiting
1530			  confirmation that it is working properly.
1531
1532			* R5900 (cache_r5900) -- uch@NetBSD.org has
1533			  written this code and tested it on a
1534			  PlayStation 2.
1535
1536		The following ports have been updated to compile (and
1537		use optimized-for-processor bus_dma routines).  Those
1538		that have been tested and work are marked with [WORKING].
1539
1540			* algor		[WORKING]
1541
1542			* arc		[WORKING]
1543
1544			* pmax		[WORKING]
1545
1546			* playstation2	[WORKING]
1547					Needs optimized bus_dmamap_sync().
1548
1549			* hpcmips	[need verification that this is working]
1550					Needs optimized bus_dmamap_sync().
1551
1552			* sgimips	[WORKING]
1553					Needs optimized bus_dmamap_sync().
1554
1555			* cobalt	[need testing]
1556
1557			* mipsco	[need testing]
1558
1559			* newsmips	[need testing]
1560
1561Branch:		thorpej_scsipi
1562Description:	SCSI/ATAPI midlayer rewrite.
1563Status:		Terminated; merged to -current
1564Start Date:
1565End Date:	Apr 25 2001
1566Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
1567Maintainer:	Manuel Bouyer <bouyer@NetBSD.org>,
1568		Jason Thorpe <thorpej@NetBSD.org>
1569Scope:		syssrc
1570Notes:		When a change from -current is pulled up please move the
1571		thorpej_scsipi_base tag to the revision you're syncing with.
1572		thorpej_scsipi_nbase is private to maintainer (only
1573		used when syncing the whole branch with HEAD).
1574		Just before the merge, syssrc has been tagged with
1575		thorpej_scsipi_beforemerge
1576
1577Branch:		thorpej-signal
1578Description:	?
1579Status:		?
1580Start Date:
1581End Date:
1582Base Tag:	thorpej-signal-base
1583Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
1584Scope:		kernel
1585Notes:
1586
1587Branch:		thorpej-setroot
1588Description:	?
1589Status:		Terminated; merged to -current
1590Start Date:
1591End Date:
1592Base Tag:
1593Maintainer:	Jason Thorpe <thorpej@NetBSD.org>
1594Scope:		kernel
1595Notes:
1596
1597Branch:		simonb-timecounters
1598Description:	Port FreeBSD timecounters to NetBSD
1599Status:		Terminated
1600Start Date:	Sat Feb 04 2006
1601End Date:	Wed Jun 07 2006
1602Base Tag:	simonb-timecounters-base
1603Maintainer:	Simon Burge <simonb@NetBSD.org>,
1604		Frank Kardel <kardel@NetBSD.org>
1605Scope:		sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
1606Notes:		early (partial conversion) commit to -current
1607		ok'ed by core@ on 20060605 for testing and further
1608		simplified conversion
1609
1610Branch:		simonb-wapbl
1611Description:	Wasabi's journaling filesystem support
1612Status:		Terminated; merged to -current
1613Start Date:	Tue Jun 10 2008
1614End Date:	Thu Jul 31 2008
1615Base Tag:	simonb-wapbl-base
1616Maintainer:	Simon Burge <simonb@NetBSD.org>
1617Scope:		src/distrib/sets/lists/comp src/distrib/utils/sysinst
1618		src/include
1619		src/sbin/fsck_ffs src/sbin/fsdb src/sbin/mount_ffs
1620		src/sbin/tunefs src/usr.sbin/dumpfs src/sys
1621Notes:		Still has a number of issues:
1622		 - Some heavy workload performance issues on SMP machines.
1623		   Work around this issue by turning on WAPBL_DEBUG_SERIALIZE
1624		   in rev 1.1.2.11 of vfs_wapbl.c.
1625		 - Removing large files (sparse only?) takes a long time.
1626		   Eg, a file created with
1627		      dd if=/dev/zero of=foox bs=1 count=1 seek=11261748520550
1628		   takes 0:00.00 to remove on my test box without logging and
1629		   0:22.25 to remove with logging.  No disk IO during this...
1630		 - sysinst should use in-fs logs now, not end-of-partition logs.
1631
1632Branch:		uebayasi-xip
1633Description:	Support eXecute-In-Place (XIP)
1634Status:		Active
1635Start Date:	8 February 2010
1636End Date:	
1637Base Tag:	uebayasi-xip-base6 (2010-11-15 UTC)
1638Maintainer:	Masao Uebayashi <uebayasi@NetBSD.org>
1639Scope:		src/external/gpl3/binutils/usr.sbin/mdsetimage/mdsetimage.8
1640		src/include
1641		src/sbin/mount
1642		src/sbin/mount_ffs
1643		src/share/man/man4
1644		src/share/man/man5/statvfs.5
1645		src/share/man/man9
1646		src/sys/arch
1647		src/sys/common/pmap
1648		src/sys/conf
1649		src/sys/dev/flash.c
1650		src/sys/dev/flashvar.h
1651		src/sys/dev/md.c
1652		src/sys/dev/md.h
1653		src/sys/dev/md_root.c
1654		src/sys/dev/xmd.c
1655		src/sys/kern/vfs_syscalls.c
1656		src/sys/miscfs/genfs/genfs_io.c
1657		src/sys/miscfs/specfs/specdev.h
1658		src/sys/sys
1659		src/sys/ufs/ffs/ffs_vfsops.c
1660		src/sys/uvm
1661		src/usr.sbin/mdsetimage/mdsetimage.8
1662Notes:		Goals:
1663		- Clean up oddities in fault handler
1664		- Add a notion of device page
1665		- Teach XIP vnode VOP_GETPAGES
1666		- Hook XIP mount option
1667		- Teach some pmaps to handle device page
1668
1669Branch:		vmlocking
1670Description:	Make VM and file system framework MP safe
1671Status:		Terminated
1672Start Date:	13 March 2007
1673End Date:	4 December 2007
1674Base Tag:	vmlocking-base
1675Maintainer:	Andrew Doran <ad@NetBSD.org>
1676Scope:		kernel
1677Notes:		Superseded by vmlocking2 branch.
1678
1679Branch:		vmlocking2
1680Description:	Make VM and file system framework MP safe
1681Status:		Terminated
1682Start Date:	4 December 2007
1683End Date:	2 January 2008
1684Base Tag:	vmlocking2-base3
1685Maintainer:	Andrew Doran <ad@NetBSD.org>
1686Scope:		kernel
1687Notes:		Goals:
1688
1689		- Make VM system / trap handling MP safe.
1690		- Replace simplelocks with mutexes.
1691		- Make file system framework MP safe.
1692
1693		Status by architecture:
1694
1695		  alpha		done
1696		  i386		done
1697		  amd64		done
1698		  mips		done
1699		  sparc		need pmap/trap locking changes	
1700		  sparc64	done
1701		  arm		done
1702		  powerpc	done
1703		  hppa		done
1704		  sh3		done
1705		  m68k		done
1706		  xen		need pmap/trap locking changes
1707
1708		Remaining MI work to do:
1709
1710		- Check aliased vnode handling. There may be problems.
1711
1712		Remaining problems:
1713
1714		- LFS stalls due to v_numoutput leak.
1715
1716Branch:		wrstuden-devbsize
1717Description:	Modify buffer cache to deal with different devices having
1718		different block sizes. Also DEV_BSIZE would go away.
1719Status:		Terminated
1720Start Date:	Aug or Sept 1999
1721End Date:	1 Apr 2000
1722Base tag:	wrstuden-devbsize-base
1723Maintainer:	Bill Studenmund <wrstuden@NetBSD.org>
1724Scope:		kernel
1725Notes:		No longer active due to lack of time, and introduction
1726		of UBC. In terms of UBC, the primary cache for
1727		file data is the VM cache, which needs to operate
1728		in terms of VM pages. As no existing device has native
1729		pages the same size as our VM pages, there already is
1730		a mapping going on between the VM system and the
1731		underlying blocks. So it would be easier and cleaner
1732		to adjust that to deal w/ different block sizes.
1733		Also with UBC, all i/o is in terms of bytes at an offset
1734		with a certain length, so the exact block size isn't a big
1735		deal.
1736
1737		Any other wrstuden-devbsize tag may (and should) go away.
1738
1739Branch:		yamt-idlelwp
1740Description:	idle lwp, and some changes depending on it.
1741
1742		1. separate context switching and thread scheduling.
1743		   (cf. gmcgarry_ctxsw)
1744		2. implement idle lwp.
1745		3. clean up related MD/MI interfaces.
1746		4. make scheduler(s) modular.
1747
1748Status:		Terminated; merged to -current
1749Start Date:	Fri Feb 17 2007
1750End Date:	Thu May 17 2007
1751Base Tag:	yamt-idlelwp-base8
1752Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1753Scope:		src/sys  (src/common is tagged but not branched)
1754Notes:		
1755		Status of ports:
1756		  alpha			[ Done, UP tested, MP not tested ]
1757		  i386			[ Done, tested ]
1758		  amd64			[ Done, tested ]
1759		  mips			[ Done, both MIPS1 and MIPS3 tested]
1760		  sparc			[ Done, UP tested, MP might have
1761					  some problem after newlock2 merge ]
1762		  sparc64		[ Done, tested ]
1763		  arm			[ Done, SA1 tested. See PR 36548 ]
1764		  macppc/powerpc	[ Done, OEA tested ]
1765		  hppa			[ Done, tested ]
1766		  sh3			[ Done, tested ]
1767		  vax			[ Done, UP tested, MP untested ]
1768		  m68k			[ Done, tested on several ports ]
1769		  ns32k			[ broken ]
1770		  ia64			[ broken ]
1771		  pdp10			[ broken ]
1772
1773		How to adapt a port?
1774
1775		- unify cpu_switch, cpu_exit, cpu_switchto into
1776		  a single cpu_switchto.  see cpu_switchto.9.
1777
1778		- implement cpu_idle.  see cpu_idle.9.
1779
1780		- add a flag argument to cpu_need_resched.
1781		  handle RESCHED_IMMED flag, which means "cause a preemption
1782		  as soon as possible."  eg. in the case of MULTIPROCESSOR,
1783		  send an IPI to the target cpu.
1784
1785		- "curlwp == NULL" is not a valid check for idle state anymore.
1786		  use "(curlwp->l_flag & LW_IDLE) != 0" instead.  curlwp is
1787		  almost always non-NULL, with exceptions like early on boot.
1788
1789		- remove idle pcbs.
1790
1791		- (if MULTIPROCESSOR) tweak processor trampoline code.
1792
1793		- (if MULTIPROCESSOR) call mi_cpu_attach when attaching
1794		  secondary processors.
1795
1796		- (if schedhz!=0) call schedclock regardless of the value of
1797		  curlwp.
1798
1799		- of course, update MD users of scheduler/switching API.
1800
1801Branch:		yamt-lazymbuf
1802Description:	change the way to share mbuf external storage so that
1803		it can work without kernel_lock.
1804Status:		Terminated; merged to -current
1805Start Date:	Wed Jul  6 2005
1806End Date:	Mon Mar 24 2008
1807Base Tag:	yamt-lazymbuf-base14
1808Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1809Scope:		src/sys  (src/common is tagged but not branched)
1810Notes:		
1811
1812Branch:		yamt-km, yamt-km-doc
1813Description:	simplify/improve kernel memory management and bootstrap
1814Status:		Terminated; merged to -current
1815Start Date:	Tue Jan 25 2005
1816End Date:	Fri Apr  1 2005
1817Base Tag:	yamt-km-base{,2,3,4}, yamt-km-doc-base
1818Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1819Scope:		yamt-km: src/sys
1820		yamt-km-doc: src/share/man/man9/uvm.9
1821Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
1822
1823		the followings are per-port status.
1824		(account names mean "tested by".)
1825
1826		works enough to go to multiuser:
1827			alpha, i386, xen (yamt@)
1828			pc532 (simonb@)
1829			alpha, i386, mac68k, macppc, pmax, shark,
1830			    sparc, sparc64, sun3, x68k (chs@)
1831			cobalt, dreamcast, hp300, news68k, newsmips,
1832			    sun3x (tsutsui@)
1833			amiga (mhitch@)
1834			cats, hp700 (skrll@)
1835			xen (bouyer@)
1836
1837		known to have the same problem as trunk:
1838			vax (chs@, stuck while running kvm_mkdb)
1839
1840		known to have a problem:
1841			luna68k (and, if any, other m68k ports which use TTR)
1842			needs to be revisited.
1843			-> for luna68k, although not tested,
1844			   Sysmap has been moved to avoid kva conflict with
1845			   I/O ranges.
1846
1847		buildable:
1848			src/sys/arch/acorn26/conf/GENERIC
1849			src/sys/arch/acorn32/conf/GENERIC
1850			src/sys/arch/algor/conf/P6032
1851			src/sys/arch/alpha/conf/GENERIC
1852			src/sys/arch/alpha/conf/GENERIC.MP
1853			src/sys/arch/amd64/conf/GENERIC
1854			src/sys/arch/amd64/conf/GENERIC.MP
1855			src/sys/arch/amiga/conf/GENERIC
1856			src/sys/arch/arc/conf/GENERIC
1857			src/sys/arch/atari/conf/MILAN-PCIIDE
1858			src/sys/arch/bebox/conf/GENERIC
1859			src/sys/arch/cats/conf/GENERIC
1860			src/sys/arch/cesfic/conf/GENERIC
1861			src/sys/arch/cobalt/conf/GENERIC
1862			src/sys/arch/dreamcast/conf/GENERIC
1863			src/sys/arch/evbarm/conf/TS7200
1864			src/sys/arch/evbppc/conf/WALNUT
1865			src/sys/arch/evbsh3/conf/COMPUTEXEVB
1866			src/sys/arch/evbsh5/conf/CAYMAN64
1867			src/sys/arch/hp300/conf/GENERIC
1868			src/sys/arch/hp700/conf/GENERIC
1869			src/sys/arch/hpcarm/conf/JORNADA728
1870			src/sys/arch/hpcmips/conf/GENERIC
1871			src/sys/arch/hpcsh/conf/GENERIC
1872			src/sys/arch/hpcsh/conf/HPW650PA
1873			src/sys/arch/i386/conf/GENERIC
1874			src/sys/arch/i386/conf/GENERIC.MP
1875			src/sys/arch/i386/conf/XEN0
1876			src/sys/arch/i386/conf/XENU
1877			src/sys/arch/ibmnws/conf/GENERIC
1878			src/sys/arch/iyonix/conf/GENERIC
1879			src/sys/arch/luna68k/conf/GENERIC
1880			src/sys/arch/mac68k/conf/GENERIC
1881			src/sys/arch/macppc/conf/GENERIC
1882			src/sys/arch/macppc/conf/GENERIC.MP
1883			src/sys/arch/mipsco/conf/GENERIC
1884			src/sys/arch/mmeye/conf/GENERIC
1885			src/sys/arch/mvme68k/conf/GENERIC
1886			src/sys/arch/netwinder/conf/GENERIC
1887			src/sys/arch/news68k/conf/GENERIC
1888			src/sys/arch/newsmips/conf/GENERIC
1889			src/sys/arch/next68k/conf/GENERIC
1890			src/sys/arch/ofppc/conf/GENERIC
1891			src/sys/arch/pc532/conf/GENERIC
1892			src/sys/arch/pmax/conf/GENERIC
1893			src/sys/arch/prep/conf/GENERIC
1894			src/sys/arch/sandpoint/conf/GENERIC
1895			src/sys/arch/sbmips/conf/GENERIC
1896			src/sys/arch/sgimips/conf/GENERIC32_IP3x
1897			src/sys/arch/shark/conf/GENERIC
1898			src/sys/arch/sparc/conf/GENERIC
1899			src/sys/arch/sparc/conf/GENERIC.MP
1900			src/sys/arch/sparc64/conf/GENERIC
1901			src/sys/arch/sparc64/conf/GENERIC.MP
1902			src/sys/arch/sun2/conf/GENERIC
1903			src/sys/arch/sun3/conf/GENERIC
1904			src/sys/arch/vax/conf/GENERIC
1905			src/sys/arch/vax/conf/GENERIC.MP
1906			src/sys/arch/x68k/conf/GENERIC
1907
1908			src/sys/arch/playstation2/conf/GENERIC
1909
1910Branch:		yamt-pdpolicy
1911Description:	play with page replacement policy
1912		- separate page replacement policy from the rest of kernel
1913		- implement alternative replacement policy
1914		- related read-ahead adjustment?
1915Status:		Terminated; merged to -current
1916Start Date:	Sun Mar  5 2006
1917End Date:	Sat Sep 16 2006
1918Base Tag:	yamt-pdpolicy-base9
1919Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1920Scope:		src/sys  (src/common is tagged but not branched)
1921Notes:		
1922
1923Branch:		yamt-pf42
1924Description:	import newer pf from OpenBSD 4.2
1925Status:		Terminated; merged to -current
1926Start Date:	Sat Apr 19 2008
1927End Date:	Wed Jun 18 2008
1928Base Tag:	yamt-pf42-base4
1929Maintainer:	Peter Postma <peter@NetBSD.org>,
1930		YAMAMOTO Takashi <yamt@NetBSD.org>
1931Scope:		src
1932Notes:		see sys/dist/pf/net/TODO
1933
1934Branch:		yamt-readahead
1935Description:	play with file readahead
1936Status:		Terminated; merged to -current
1937Start Date:	Mon Nov 14 2005
1938End Date:	Wed Nov 30 2005
1939Base Tag:	yamt-readahead-base3
1940Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1941Scope:		src/sys
1942Notes:		
1943
1944Branch:		yamt-uio_vmspace
1945Description:	uio_lwp/uio_segflg -> uio_vmspace
1946Status:		Terminated; merged to -current
1947Start Date:	Mon Dec 31 2005
1948End Date:	Wed Mar  1 2006
1949Base Tag:	yamt-uio_vmspace-base5
1950Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1951Scope:		src/sys
1952Notes:		
1953
1954Branch:		yamt-splraiseipl
1955Description:	finish implementing splraiseipl (and makeiplcookie).
1956		http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
1957
1958		- completes workqueue(9) and netbt.
1959		- fix PR/33218.
1960
1961Status:		Terminated; merged to -current
1962Start Date:	Mon Sep 18 2006
1963End Date:	Fri Dec 22 2006
1964Base Tag:	yamt-splraiseipl-base5
1965Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
1966Scope:		src/sys  (src/common is tagged but not branched)
1967Notes:		
1968		tested (by who):
1969			alpha		(yamt)
1970			alpha		(pavel)
1971			amd64		(reported privately)
1972			cobalt		(tsutsui)
1973			ews4800mips	(tsutsui)
1974			hp300		(tsutsui)
1975			hpcarm		(reported privately)
1976			i386		(yamt)
1977			macppc		(tsutsui)
1978			news68k		(tsutsui)
1979			sgimips(IP32)	(tsutsui)
1980			sparc(sun4c)	(tsutsui)
1981			sun2		(tsutsui)
1982			sun3		(tsutsui)
1983			sun3x		(tsutsui)
1984			xen		(yamt)
1985
1986		compile-tested:
1987			acorn26
1988			acorn32
1989			algor
1990			amiga
1991			arc
1992			atari
1993			bebox
1994			cats
1995			cesfic
1996			dreamcast
1997			evbarm
1998			evbmips
1999			evbppc(marvell)
2000			evbppc(ibm4xx)
2001			evbsh3
2002			hp700
2003			hpcmips
2004			hpcsh
2005			ia64
2006			ibmnws
2007			iyonix
2008			landisk
2009			luna68k
2010			mac68k
2011			mmeye
2012			mvme68k
2013			mvmeppc
2014			mipsco
2015			netwinder
2016			newsmips
2017			next68k
2018			ofppc
2019			pc532
2020			pmax
2021			pmppc
2022			prep
2023			sandpoint
2024			sbmips
2025			shark
2026			sparc
2027			sparc64
2028			vax
2029			x68k
2030			zaurus
2031
2032		not tested:
2033			pdp10 (i don't know how to build)
2034			sh5 (not buildable with an unrelated problem.)
2035
2036    compile  CAYMAN64/netbsd32_sa.o
2037    cc1: warnings being treated as errors
2038    /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c: In function 'netbsd32_sa_ucsp':
2039    /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c:126: warning: implicit declaration of function '_UC_MACHINE32_SP'
2040    --- netbsd32_sa.o ---
2041    *** [netbsd32_sa.o] Error code 1
2042    1 error
2043
2044		notyet:
2045			amigappc
2046			playstation2
2047
2048Branch:		yamt-vop
2049Description:	remove several VOPs
2050Status:		Terminated; merged to -current
2051Start Date:	Wed Oct 19 2005
2052End Date:	Wed Nov  2 2005
2053Base Tag:	yamt-vop-base3
2054Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
2055Scope:		src/sys
2056Notes:		http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
2057
2058Branch:		yamt-x86pmap
2059Description:	merge i386 and amd64 pmap
2060Status:		Terminated; merged to -current
2061Start Date:	Mon Sep 24 2007
2062End Date:	Fri Oct 19 2007
2063Base Tag:	yamt-x86pmap-base4
2064Maintainer:	YAMAMOTO Takashi <yamt@NetBSD.org>
2065Scope:		src/sys  (src/common is tagged but not branched)
2066Notes:		
2067
2068Branch:		gdamore-uart
2069Description:	Add register table support to com driver.
2070Status:		Active
2071Start Date:	14 June 2006
2072End Date:	13 July 2006
2073Base Tag:	gdamore-uart-base
2074Maintainer:	Garrett D'Amore <gdamore@NetBSD.org>
2075Scope:		kernel
2076Notes:		Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
2077		com support, and also removes a nasty hack from Atheros com.
2078
2079Branch:		christos-time_t
2080Description:	Change time_t and dev_t to 64 bit quantities; fix timeval
2081		and timespec.
2082Status:		merged
2083Start Date:	29 March 2008
2084End Date:	10 January 2009
2085Base Tag:	christos-time_t-base
2086Maintainer:	Christos Zoulas <christos@NetBSD.org>
2087Scope:		kernel, libc, libutil, userland
2088Notes:		Requires a major bump of all libraries except libc, libutil.
2089
2090Branch:		rtr-xorg-branch
2091Description:	xorg & static build alterations to src/x11
2092Status:		Dead; replaced by src/external/mit/xorg
2093Start Date:	Nov 15 2004
2094End Date:	?
2095Base tag:	rtr-xorg-branch-base
2096Maintainer:	Tyler R. Retzlaff <rtr@NetBSD.org>
2097Scope:		x11
2098		distrib/sets/lists
2099		share/mk/bsd.x11.mk
2100		share/mk/bsd.own.mk
2101		etc/mtree/NetBSD.dist
2102Notes:		Requires parts of xsrc/xfree (HEAD)
2103		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
2104		Requires xorg (XORG-6_8_1)
2105
2106Branch:		gmcgarry_ctxsw
2107Description:	Separate scheduler from context-switch code
2108Status:		Dead; replaced by cpu_switchto / yamt-idlelwp branch
2109Start Date:	18 December 2002
2110End Date:
2111Base Tag:	gmcgarry_ctxsw_base
2112Maintainer:	Gregory McGarry <gmcgarry@NetBSD.org>
2113Scope:		kernel
2114Notes:		Removing knowledge of the scheduler and its run queues
2115		from the machine-dependent context switch code is the
2116		first step in cleaning up the scheduler.  It is necessary
2117		for the newlock branch, making the scheduler SMP friendly,
2118		adding real-time scheduler extensions, and reducing the
2119		number of code paths for LWP and proc switching.
2120
2121Branch:		nick-hppapmap
2122Description:	Update of hppa pmap with OpenBSD code.
2123Status: 	Terminated; merged to -current
2124Start Date:	27 October 2008
2125End Date:	30 April 2009
2126Base Tag:	nick-hppapmap-base3
2127Maintainer:	Nick Hudson <skrll@NetBSD.org>
2128Scope:		sys/
2129Notes:		Port of the OpenBSD pmap including support for PA2.0 CPUs in
2130		32-bit mode.
2131
2132Branch:		thorpej-atomic
2133Description:	Implementation of an atomic memory operations API modeled
2134		after the one in Solaris 10.
2135Status:		Terminated; merged to -current
2136Start Date:	Apr 11 2007
2137End Date:	Nov 18 2007
2138Base tag:	thorpej-atomic-base
2139Maintainer:	Jason Thorpe <thorpej@netbsd.org>
2140Scope:		src/common
2141		src/sys
2142Notes:		Base atomic primitives need to be implemented for
2143		all of the supported architectures:
2144
2145		alpha		DONE
2146		arm		DONE
2147		hppa
2148		i386		DONE
2149		ia64
2150		m68k		DONE (except for 68010)
2151		mips
2152		ns32k
2153		powerpc		DONE except for membar_*()
2154		powerpc64	DONE except for membar_*()
2155		sh3
2156		sparc		DONE except for membar_*()
2157		sparc64		DONE except for membar_*()
2158		vax
2159		x86_64		DONE
2160
2161		Tested:
2162
2163		alpha		NO
2164		arm		NO
2165		hppa		NO
2166		i386		NO
2167		ia64		NO
2168		m68k		NO
2169		mips		NO
2170		ns32k		NO
2171		powerpc		NO
2172		powerpc64	NO
2173		sh3		NO
2174		sparc		NO
2175		sparc64		NO
2176		vax		NO
2177		x86_64		NO
2178
2179		TODO:
2180
2181		all		- Need to replace mb_*() with membar_*().
2182
2183				- Audit MUTEX_CAS() and RWLOCK_CAS() uses
2184				  to see of membar_enter() is required here.
2185
2186				- Talk to ad@ -- figure out of non-atomic
2187				  mutex / rwlock release is actually safe.
2188
2189		arm		- Consider using a RAS technique like
2190				  MIPS uses for _lock_cas() and the mutex
2191				  stubs.  Possibly do more than one atomic
2192				  op as a RAS.  Possibly implement mutex
2193				  stubs using the technique.
2194
2195		m68k		- Need to do 68010 support.
2196		
2197		i386		- Need to change when x86_patch() is called
2198				  so we can test ncpus.
2199
2200		powerpc		- Figure out if we need barriers in the
2201				  atomic ops themselves (hopefully not!)
2202
2203		x86_64		- Need to change when x86_patch() is called
2204				  so we can test ncpus.
2205
2206########################################################################
2207# Other:
2208########################################################################
2209
2210Branch:		magnum
2211Description:	?
2212Status:		?
2213Start Date:
2214End Date:
2215Base Tag:	magnum-base
2216Maintainer:	?
2217Scope:		kernel
2218Notes:
2219
2220