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