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