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