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