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