BRANCHES revision 1.108 1 # $NetBSD: BRANCHES,v 1.108 2006/09/29 15:34:47 yamt 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
47 Branch: comdex-fall-1999
48 Description: Special release branch for pre-1.5 release at
49 Fall 1999 COMDEX.
50 Status: Terminated
51 Start Date:
52 End Date:
53 Base Tag: comdex-fall-1999-base
54 Maintainer: ?
55 Scope: Entire tree.
56 Notes:
57
58 Branch: netbsd-0-9
59 Description: The NetBSD 0.9 release branch
60 Status: Terminated
61 Start Date:
62 End Date:
63 Base Tag: netbsd-0-9-base
64 Maintainer: Release Engineering <releng (a] NetBSD.org>
65 Scope: Entire tree.
66 Notes: 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
70 Branch: netbsd-1-0
71 Description: The NetBSD 1.0 release branch
72 Status: Terminated
73 Start Date:
74 End Date:
75 Base Tag: netbsd-1-0-base
76 Maintainer: Release Engineering <releng (a] NetBSD.org>
77 Scope: Entire tree.
78 Notes:
79 Commits restricted to release engineering.
80
81 Branch: netbsd-1-1
82 Description: The NetBSD 1.1 release branch
83 Status: Terminated
84 Start Date:
85 End Date:
86 Base Tag: netbsd-1-1-base
87 Maintainer: Release Engineering <releng (a] NetBSD.org>
88 Scope: Entire tree.
89 Notes:
90 Commits restricted to release engineering.
91
92 Branch: netbsd-1-2
93 Description: The NetBSD 1.2 release branch
94 Status: Terminated
95 Start Date:
96 End Date:
97 Base Tag: netbsd-1-2-base
98 Maintainer: Release Engineering <releng (a] NetBSD.org>
99 Scope: Entire tree.
100 Notes:
101 Commits restricted to release engineering.
102
103 Branch: netbsd-1-3
104 Description: The NetBSD 1.3 release branch
105 Status: Terminated
106 Start Date:
107 End Date:
108 Base Tag: netbsd-1-3-base
109 Maintainer: Release Engineering <releng (a] NetBSD.org>
110 Scope: Entire tree.
111 Notes:
112 Commits restricted to release engineering.
113
114 Branch: netbsd-1-4
115 Description: The NetBSD 1.4 release branch
116 Status: Terminated
117 Start Date: 1 Apr 2000
118 End Date:
119 Base Tag: netbsd-1-4-base
120 Maintainer: 1.4 Release Engineering <releng-1-4 (a] NetBSD.org>
121 Scope: Entire tree.
122 Notes:
123 Commits restricted to release engineering.
124
125 Branch: netbsd-1-5
126 Description: The NetBSD 1.5 release branch
127 Status: Terminated
128 Start Date: 20 Jun 2000
129 End Date: 26 Jan 2005
130 Base Tag: netbsd-1-5-base
131 Maintainer: 1.5 Release Engineering <releng-1-5 (a] NetBSD.org>
132 Scope: Entire tree.
133 Notes:
134 Commits restricted to release engineering.
135
136 Branch: netbsd-1-6
137 Description: The NetBSD 1.6 release branch
138 Status: Terminated
139 Start Date: 22 May 2002
140 End Date:
141 Base Tag: netbsd-1-6-base
142 Maintainer: 1.6 Release Engineering <releng-1-6 (a] NetBSD.org>
143 Scope: Entire tree.
144 Notes:
145 Commits restricted to Release Engineering.
146
147 Branch: netbsd-2
148 Description: The NetBSD 2 release branch
149 Status: Active
150 Start Date: 23 Dec 2004
151 End Date:
152 Base Tag: netbsd-2-base
153 Maintainer: 2 Release Engineering <releng-2 (a] NetBSD.org>
154 Scope: Entire tree. (src + xsrc)
155 Notes:
156 Commits restricted to Release Engineering.
157
158 Branch: netbsd-2-0
159 Description: Originally the NetBSD 2.0 release branch and now the branch
160 tracking security/critical fixes for the NetBSD 2.0 series
161 Status: Active
162 Start Date: 28 Mar 2004 and changed for security/critical function on
163 23 Dec 2004
164 End Date:
165 Base Tag: netbsd-2-0-base
166 Maintainer: 2.0 Release Engineering <releng-2-0 (a] NetBSD.org>
167 Scope: Entire tree. (src + xsrc)
168 Notes: 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
173 Branch: netbsd-2-1
174 Description: Tracking security/critical fixes for NetBSD 2.1
175 Status: Active
176 Start Date: 26 Oct 2005
177 End Date:
178 Base Tag: netbsd-2-1-RELEASE
179 Maintainer: 2 Release Engineering <releng-2 (a] NetBSD.org>
180 Scope: Entire tree. (src + xsrc)
181 Notes: 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
185 Branch: netbsd-3
186 Description: The NetBSD 3 release branch
187 Status: Active
188 Start Date: 16 Mar 2005
189 End Date:
190 Base Tag: netbsd-3-base
191 Maintainer: 3 Release Engineering <releng-3 (a] NetBSD.org>
192 Scope: Entire tree. (src + xsrc)
193 Notes:
194 Commits restricted to Release Engineering.
195
196 Branch: netbsd-4
197 Description: The NetBSD 4 release branch
198 Status: Active
199 Start Date: 8 Aug 2006
200 End Date:
201 Base Tag: netbsd-4-base
202 Maintainer: 4 Release Engineering <releng-4 (a] NetBSD.org>
203 Scope: Entire tree. (src + xsrc)
204 Notes:
205 Commits restricted to Release Engineering.
206
207 ########################################################################
208 # Individual developers' branches (Active/Dormant):
209 ########################################################################
210
211 Branch: bjh21-hydra
212 Description: Simtec Hydra support and ARM SMP in general
213 Status: Dormant
214 Start Date: 18 Oct 2002
215 End Date:
216 Base Tag: bjh21-hydra-base
217 Maintainer: Ben Harris <bjh21 (a] NetBSD.org>
218 Scope: sys/arch/arm sys/arch/acorn32
219 Notes: This code was on a branch because it involves changes to
220 cpuswitch.S which would otherwise make merging the
221 nathanw_sa branch difficult.
222
223 Branch: gmcgarry_ctxsw
224 Description: Separate scheduler from context-switch code
225 Status: Dormant
226 Start Date: 18 December 2002
227 End Date:
228 Base Tag: gmcgarry_ctxsw_base
229 Maintainer: Gregory McGarry <gmcgarry (a] NetBSD.org>
230 Scope: kernel
231 Notes: Removing knowledge of the schedular and its run queues
232 from the machine-dependent context switch code is the
233 first step in cleaning up the scheduler. It is necessary
234 for the newlock branch, making the scheduler SMP friendly,
235 adding real-time scheduler extensions, and reducing the
236 number of code paths for LWP and proc switching.
237
238 Branch: gmcgarry_ucred
239 Description: Integrate and encapsulate user credentials
240 Status: Dormant
241 Start Date: 18 December 2002
242 End Date:
243 Base Tag: gmcgarry_ucred_base
244 Maintainer: Gregory McGarry <gmcgarry (a] NetBSD.org>
245 Scope: kernel
246 Notes: merge pcred and ucred and poolify
247
248 Branch: kame
249 Description: KAME Project
250 Status: Dormant
251 Start Date: 28 Jun 1999
252 End Date:
253 Base Tag:
254 Maintainer: Jun-ichiro itojun Hagino <itojun (a] NetBSD.org>
255 Scope: kernel
256 Notes: http://www.kame.net
257 Used for "reference" purposes for early part of KAME
258 integration effort. The branch is not actively used, as I
259 (itojun) use patch(1) and diff(1) for the KAME syncs.
260
261 Branch: kent-audio2
262 Description: In-kernel audio mixer
263 Status: Active
264 Start Date: Sun Jan 16 2005
265 End Date:
266 Base Tag: kent-audio2-base
267 Maintainer: TAMURA Kent <kent (a] NetBSD.org>
268 Scope: kernel (audio device drivers)
269 Notes: http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
270 Please consult with the maintainer before committing
271 to this branch.
272 This branch is not expected to be compilable yet.
273
274 Branch: matt-timespec
275 Description: Convert the kernel to struct timespec as its primary time
276 storage mechanism.
277 Status: Active
278 Start Date: 2005-02-19
279 End Date:
280 Base Tag:
281 Maintainer: Matt Thomas <matt (a] NetBSD.org>
282 Scope: kernel
283 Notes:
284
285 Branch: newlock
286 Description: New locking primitives, based on Solaris's
287 Status: Dormant
288 Start Date: March 9, 2002
289 End Date:
290 Base Tag: newlock-base
291 Maintainer: Jason R. Thorpe <thorpej (a] NetBSD.org>
292 Scope: Kernel
293 Notes: The goal is to replace the existing lockmgr() and
294 simple_lock() based locking mechanisms with the
295 primitives found in Solaris: mutexes and rwlocks.
296
297 Branch: newlock2
298 Description: New locking primitives, based on Solaris's
299 Status: Active
300 Start Date: September 9, 2006
301 End Date:
302 Base Tag: newlock2-base
303 Maintainer: Andrew Doran <ad (a] NetBSD.org>
304 Scope: Kernel
305 Notes: As per the newlock branch, however given the amount of time
306 the original branch has lain dormant, a new one has been
307 created. Goals:
308 - Implement new locking primitives on most-used ports.
309 - Minor locking improvements.
310 - Remove spinlockmgr().
311
312 Branch: peter-altq
313 Description: New ALTQ framework:
314 - sync with KAME sources
315 - share mtag/name mapping functions
316 - separate altq + pf attachment
317 Status: Active
318 Start Date: March 16, 2006
319 End Date:
320 Base Tag: peter-altq-base
321 Maintainer: Peter Postma <peter (a] NetBSD.org>,
322 Martin Husemann <martin (a] NetBSD.org>,
323 Matthias Scheler <tron (a] NetBSD.org>
324 Scope: dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
325 Notes:
326
327 Branch: pkgviews
328 Description: package views, enabling multiple conflicting packages to co-exist
329 Status: Active
330 Start Date: 22 July 2002
331 End Date:
332 Base Tag: pkgviews
333 Maintainer: Alistair Crooks <agc (a] NetBSD.org>
334 Scope: pkgsrc, basesrc/usr.sbin/pkg_install
335 Notes: A more flexible infrastructure for third-party packages by
336 allowing multiple conflicting packages and versions to co-exist
337 within the same tree
338
339 Branch: rpaulo-netinet-merge-pcb
340 Description: merge in6pcb with inpcb
341 Status: Active
342 Start Date: Wed Feb 01 2006
343 End Date:
344 Base Tag: rpaulo-netinet-merge-pcb-base
345 Maintainer: Rui Paulo <rpaulo (a] NetBSD.org>
346 Scope: src/sys
347 Notes:
348
349 Branch: rtr-xorg-branch
350 Description: xorg & static build alterations to src/x11
351 Status: Active
352 Start Date: Nov 15 2004
353 End Date:
354 Base tag: rtr-xorg-branch-base
355 Maintainer: Tyler R. Retzlaff <rtr (a] NetBSD.org>
356 Scope: x11
357 distrib/sets/lists
358 share/mk/bsd.x11.mk
359 share/mk/bsd.own.mk
360 etc/mtree/NetBSD.dist
361 Notes: Requires parts of xsrc/xfree (HEAD)
362 xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
363 Requires xorg (XORG-6_8_1)
364
365 Branch: thorpej-devvp
366 Description: replace dev_t with struct vnode * in devsw entry points
367 Status: Active
368 Start Date: Sep 6 2001
369 End Date:
370 Base Tag: thorpej-devvp-base
371 Maintainer: Jason Thorpe <thorpej (a] NetBSD.org>
372 Scope: syssrc
373 Notes: Kernels built from this branch are not expected
374 to function correctly at this time.
375
376 Ports known to compile on this branch:
377 alpha
378 i386
379
380 Branch: yamt-lazymbuf
381 Description: implement and evaluate lazy mapping of mbuf external data pages
382 it's intended as the first step of larger changes.
383 1. support operations (esp. bus_dma load) on
384 unmapped mbuf.
385 2. unify mbuf and buf.
386 (or, at least some parts of them)
387 3. then it should be trivial to implement
388 i/o coalescing, etc.
389 Status: Active
390 Start Date: Wed Jul 6 2005
391 End Date:
392 Base Tag: yamt-lazymbuf-base2
393 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
394 Scope: src/sys
395 Notes:
396
397 Branch: yamt-splraiseipl
398 Description: finish implementing splraiseipl (and makeiplcookie).
399 http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
400 Status: Active
401 Start Date: Mon Sep 18 2006
402 End Date:
403 Base Tag: yamt-splraiseipl-base
404 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
405 Scope: src/sys (src/common is tagged but not branched)
406 Notes:
407 tested:
408 alpha, i386, xen (yamt)
409
410 compile-tested:
411 sun2, sun3, amd64, sparc, sparc64 (GENERIC),
412 vax, evbarm, evbmips, evbsh3, iyonix, acorn26,
413 hp700, evbppc (marvell, ibm4xx),
414 mac68k, x68k, hpcarm, shark, acorn32,
415 cats, netwinder, algor, arc, ews4800mips, hpcmips,
416 newsmips, luna68k, cobalt, pmax, sbmips
417
418 not tested:
419 sparc64 (GENERIC.MP seems to have an unrelated problem)
420 cesfic (GENERIC fails to build with the following
421 error. i don't know if it's related to my changes.)
422
423 build compat/libcompat.a
424 making sure the 68040 FPSP is up to date...
425 netbsd.s: Assembler messages:
426 netbsd.s:92: Error: can't resolve `0' {*UND* section} - `LOCAL_SIZE' {*UND* section}
427 netbsd.s:125: Error: can't resolve `0' {*UND* section} - `LOCAL_SIZE' {*UND* section}
428 netbsd.s:163: Error: can't resolve `0' {.text section} - `LOCAL_SIZE' {*UND* section}
429
430 amiga (GENERIC fails with the following error.)
431
432 `libcompat.a' is up to date.
433 making sure the 68040 FPSP is up to date...
434 do_func.s: Assembler messages:
435 do_func.s:564: Error: undefined symbol `neg_mask' in operation
436 do_func.s:564: Error: undefined symbol `inf_mask' in operation
437 do_func.s:591: Error: undefined symbol `neg_mask' in operation
438 do_func.s:591: Error: undefined symbol `z_mask' in operation
439
440 *** Failed target: do_func.o
441 *** Failed command: /exports/abhome/tools/bin/m68k--netbsdelf-gcc -x assembler-with-cpp -m68040 -Damiga -DFPCOPROC -I../../. -I/exports/nbsd/src/sys/../common/include -I/exports/nbsd/src/sys/arch -I/exports/nbsd/src/sys -nostdinc -DDRACO -DM68060 -DM68040 -DM68030 -DM68020 -DLKM -DMAXUSERS=8 -D_KERNEL -D_KERNEL_OPT -I/exports/nbsd/src/sys/lib/libkern/../../../common/lib/libc/quad -I/exports/nbsd/src/sys/lib/libkern/../../../common/lib/libc/string -I/exports/nbsd/src/sys/lib/libkern/../../../common/lib/libc/arch/m68k/string -I/exports/nbsd/src/sys/dist/ipf -c -o do_func.o do_func.s
442 *** Error code 1
443
444 notyet:
445 others
446
447
448 ########################################################################
449 # Individual developers' branches (Terminated):
450 ########################################################################
451
452 Branch: bouyer-scsipi
453 Description: Integration of atapi support
454 Status: Terminated
455 Start Date:
456 End Date:
457 Base Tag:
458 Maintainer: Manuel Bouyer <bouyer (a] NetBSD.org>
459 Scope: kernel
460 Notes: Superseded by thorpej_scsipi
461
462 Branch: bouyer-xen2
463 Description: update xen port to xen 2.0, with support for domain0 operations
464 Status: Terminated
465 Start Date: Dec 13 2004
466 End Date: Mar 10 2005
467 Base Tag: netbsd-2-base
468 Maintainer: Manuel Bouyer <bouyer (a] NetBSD.org>
469 Scope: src/sys/arch/xen
470 Notes:
471
472 Branch: chap-midi
473 Description: Renovation of MIDI support
474 Status: Terminated; merged to -current
475 Start Date: 19 May 2006
476 End Date: 30 Jun 2006
477 Base Tag: chap-midi-base
478 Maintainer: Chapman Flack <chap (a] NetBSD.org>
479 Scope: sys, share/man, usr.bin
480 Notes:
481
482 Branch: chs-ubc
483 Description: Unified Buffer Cache
484 Status: Terminated
485 Start Date:
486 End Date:
487 Base Tag: chs-ubc-base
488 Maintainer: Chuck Silvers <chs (a] NetBSD.org>
489 Scope: kernel
490 Notes:
491
492 Branch: chs-ubc2
493 Description: Unified Buffer Cache
494 Status: Terminated; merged to -current
495 Start Date:
496 End Date:
497 Base Tag: chs-ubc2-base, chs-ubc2-newbase
498 Maintainer: Chuck Silvers <chs (a] NetBSD.org>
499 Scope: kernel
500 Notes:
501
502 Branch: cjs-build-against-obj-dir
503 Description: ?
504 Status: ?
505 Start Date:
506 End Date:
507 Base Tag:
508 Maintainer: Curt Sampson <cjs (a] NetBSD.org>
509 Scope: Entire tree.
510 Notes:
511
512 Branch: eeh-paddr_t
513 Description: use separate types for virtual vs. physical addresses
514 Status: Terminated; merged to -current
515 Start Date:
516 End Date:
517 Base Tag: eeh-paddr_t-base
518 Maintainer: Eduardo Horvath <eeh (a] NetBSD.org>
519 Scope: kernel
520 Notes: This is needed to support 32-bit kernels on sparc64.
521
522 Branch: elad-kernelauth
523 Description: Native NetBSD implementation of Apple's kernel authorization
524 based on TN2127. This is a "clean-room" implementation to
525 avoid any licensing issues.
526 Status: Terminated; merged to -current
527 Start Date: Tue Mar 7 2006
528 End Date: Mon May 15 2006
529 Base Tag: elad-kernelauth-base
530 Maintainer: Elad Efrat <elad (a] NetBSD.org>
531 Scope: src/sys, src/share/man/man9/Makefile,
532 src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
533 Notes:
534
535 Branch: fvdl-softdep
536 Description: FFS soft dependencies
537 Status: Terminated; merged to -current
538 Start Date:
539 End Date:
540 Base Tag: fvdl-softdep-base
541 Maintainer: Frank van der Linden <fvdl (a] NetBSD.org>
542 Scope: kernel
543 Notes:
544
545 Branch: gehenna-devsw
546 Description: auto-generation of devsw table
547 Status: Terminated
548 Start Date: 16 May 2002
549 End Date: 6 Sep 2002
550 Base Tag: gehenna-devsw-base
551 Maintainer: MAEKAWA Masahide <gehenna (a] NetBSD.org>
552 Scope: syssrc
553 Notes: The goal is to get rid of the existing device switch tables in
554 port-dependent conf.c and to generate them dynamically by
555 config(8).
556
557 Branch: is-newarp
558 Description: ARP for non-Ethernet
559 Status: Terminated; merged before NetBSD 1.3
560 Start Date: 1996/10/13
561 End Date: 1997/03/15
562 Base Tag: is-newarp-base
563 Maintainer: Ignatios Souvatzis <is (a] NetBSD.org>
564 Scope: kernel
565 Notes:
566
567 Branch: kenh-if-detach
568 Description: Interface detach support.
569 Status: ?
570 Start Date:
571 End Date:
572 Base Tag: kenh-if-detach-base
573 Maintainer: Ken Hornstein <kenh (a] NetBSD.org>
574 Scope: kernel
575 Notes:
576
577 Branch: kent-audio1
578 Description: Audio converter pipeline
579 Status: Terminated; merged to -current
580 Start Date: Tue Dec 7 2004
581 End Date: Tue Jan 11 2005
582 Base Tag: kent-audio1-base
583 Maintainer: TAMURA Kent <kent (a] NetBSD.org>
584 Scope: kernel (audio device drivers)
585 Notes: http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
586 Please consult with the maintainer before committing
587 to this branch.
588
589 Branch: kqueue
590 Description: kqueue kernel event notification mechanism (from FreeBSD)
591 Status: Terminated; merged to -current
592 Start Date: Tue Jul 10 23:08:38 EST 2001
593 End Date: Tue Oct 24 09:14:14 GMT 2002
594 Base Tag: kqueue-base
595 Maintainer: Jaromir Dolecek <jdolecek (a] NetBSD.org>
596 Scope: kernel, libc/sys, share/man/man9, usr.bin/fstat
597 Notes: Integration of FreeBSD's kqueue(2) mechanism, with various
598 local internal changes to better suit NetBSD, and
599 enhancements such as looking up filters by name or
600 number, and dynamic registration of "user" filters.
601 The work is complete as is, but is awaiting more
602 feedback from various kernel gurus before going mainline.
603
604 Branch: ktrace-lwp
605 Description: ktrace support for lwp ids.
606 Status: Terminated; merged to -current
607 Start Date: Wed Jul 2 15:27:30 UTC 2003
608 End Date: Sun Dec 11 12:25:29 UTC 2005
609 Base Tag: ktrace-lwp-base
610 Maintainer: Darren Reed <darrenr (a] NetBSD.org>
611 Scope: sys
612 Notes:
613
614 Branch: marc-pcmcia
615 Description: PCMCIA support
616 Status: Terminated; merged to -current
617 Start Date:
618 End Date:
619 Base Tag: marc-pcmcia-base, marc-pcmcia-bp
620 Maintainer: Marc Horowitz <marc (a] NetBSD.org>
621 Scope: kernel
622 Notes:
623
624 Branch: minoura_x68k_bus_h
625 Description: bus_space(9) and bus_dma(9) implementation for x68k
626 Status: Terminated; merged to -current
627 Start Date: 23 Dec 1998
628 End Date: 16 Mar 1999
629 Base Tag: minoura_x68k_bus_h-base
630 Maintainer: Minoura Makoto <minoura (a] NetBSD.org>
631 Scope: sys/arch/x68k
632 Notes:
633
634 Branch: minoura-xpg4dl
635 Description: Citrus Project locale subsystem
636 Status: Terminated; (partly) merged to -current
637 Start Date: 28 March 2000
638 End Date:
639 Base Tag: minoura-xpg4dl-base
640 Maintainer: Minoura Makoto <minoura (a] NetBSD.org>
641 Scope: basesrc, syssrc, sharesrc
642 Notes: Citrus Project is developing dynamically-loadable, codeset-
643 independent locale subsystem. Part of the implementation
644 (LC_CTYPE) called XPG4DL is now integrated to -current.
645
646 Branch: mrg-vm-swap
647 Description: dynamic swap allocation, swap-to-files support
648 Status: Terminated; abondoned for mrg-vm-swap2
649 Start Date: 12 February 1997
650 End Date: 15 March 1997
651 Base Tag: [none]
652 Maintainer: Matthew R. Green <mrg (a] NetBSD.org>
653 Scope: kernel
654 Notes:
655
656 Branch: mrg-vm-swap2
657 Description: dynamic swap allocation, swap-to-files support
658 Status: Terminated; merged to -current
659 Start Date: 4 May 1997
660 End Date: 12 June 1997
661 Base Tag: mrg-vm-swap2-base
662 Maintainer: Matthew R. Green <mrg (a] NetBSD.org>
663 Scope: kernel
664 Notes:
665
666 Branch: nathanw_sa
667 Description: Scheduler activations
668 Status: Terminated; merged to -current
669 Start Date: 5 March 2001
670 End Date: 18 January 2003
671 Base Tag: nathanw_sa_base
672 Maintainer: Nathan Williams <nathanw (a] NetBSD.org>
673 Scope: kernel, libc, libkvm, libpthread, libpthread_dbg, include,
674 bin/ps usr.bin/systat usr.bin/top usr.bin/w
675 gnu/dist/toolchain/gdb gnu/usr.bin/gdb
676 Notes: The idea of scheduler activations is described in the
677 classic paper by Anderson et al., in ACM Transactions
678 a on Computer Systems volume 10 issue 1 (1992),which
679 can be found at
680 http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
681 Many ideas in the implementation are based on the
682 implementation of scheduler activations added to Mach
683 3.0 and described by Davis et al. in the University of
684 Washington CS tech report 92-08-93, which can be found
685 at
686 ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
687
688 My USENIX paper on the subject can be found at
689 http://web.mit.edu/nathanw/www/usenix/
690
691 Please consult with the maintainer before committing
692 to this branch.
693 Other tags starting with nathanw_sa reserved for
694 branch management and are not guaranteed to be stable.
695
696 Trunk tagged with "nathanw_sa_before_merge" prior to
697 merging branch down to trunk. Branch tagged with
698 "nathanw_sa_end" to indicate the ending revision of
699 the branch.
700
701 Branch: perseant-lfsv2
702 Description: LFS incompatible on-disk data structure changes
703 Status: Terminated
704 Start Date: 27 June 2001
705 End Date: 16 July 2001
706 Base Tag: perseant-lfsv2-base
707 Maintainer: Konrad Schroder <perseant (a] NetBSD.org>
708 Scope: basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
709 Notes: This branch should be short-lived, I expect to merge as soon
710 as the data structures required for unremove are in and tested.
711
712 Branch: sommerfeld_i386mp_1
713 Description: Multiprocessor support for i386 using Intel MP BIOS.
714 Status: Terminated; merged to -current
715 Start Date: 21 Feb 2000
716 End Date: 01 Oct 2002
717 Base Tag: sommerfeld_i386mpbase_1
718 Maintainer: Bill Sommerfeld <sommerfeld (a] NetBSD.org>
719 Scope: sys/arch/i386
720 Notes:
721 Code committed to the branch has booted to multiuser
722 on at least one system.
723
724 Not guaranteed to compile against mainline since -current
725 may have changed incompatibly with the last branch update;
726 use "cvs update -D" to roll-back the rest of the tree to match.
727
728 Please get explicit permission from the maintainer
729 before each commit, or your changes will be backed out.
730 Other tags starting with sommerfeld_ are private to
731 the developer and are guaranteed to be unstable.
732 Only the maintainer should move tags.
733
734 Note that this branch uses a DIFFERENT scheme for
735 synching with the mainline. the maintainer uses some private
736 scripts for keeping them in synch; if you make commits
737 to the branch to "resynchronize" things, you'll
738 probably do it wrong; instead, ask the maintainer to
739 resynchronize things.
740
741 See sys/arch/i386/TODO on the branch for a list of known
742 issues with the branch.
743
744 Branch: thorpej-mips-cache
745 Description: overhaul MIPS cache support code
746 Status: Terminated; merged to -current
747 Start Date: Oct 23 2001
748 End Date: Nov 14 2001
749 Base Tag: thorpej-mips-cache-base
750 Scope: syssrc
751 Notes: This branch needs more debugging, testing, and more
752 ports need to be converted to the new world order.
753
754 The following processors have had cache ops
755 written:
756
757 * R2000/R3000 (cache_r3k) -- light testing,
758 needs to be beat on a lot more to make
759 sure it's working.
760
761 * R4000/R4400 (cache_r4k) -- mhitch (a] NetBSD.org
762 tracked down a bug, which has been fixed.
763
764 Confirmed working on R4000-with-L2.
765
766 Confirmed working on R4400-no-L2 and
767 R4400-with-L2.
768
769 * R4600/R5000 (cache_r5k) -- shin (a] NetBSD.org
770 has committed fixes to this code.
771
772 Confirmed working on R4600 v2 (SGI IP-22 with
773 no SysAD L2 cache).
774
775 Confirmed working on RM5260 (Algorithmics P-5064).
776
777 * TX39 (cache_tx39) -- uch (a] NetBSD.org has
778 committed fixes to this code. Awaiting
779 confirmation that it is working properly.
780
781 * R5900 (cache_r5900) -- uch (a] NetBSD.org has
782 written this code and tested it on a
783 PlayStation 2.
784
785 The following ports have been updated to compile (and
786 use optimized-for-processor bus_dma routines). Those
787 that have been tested and work are marked with [WORKING].
788
789 * algor [WORKING]
790
791 * arc [WORKING]
792
793 * pmax [WORKING]
794
795 * playstation2 [WORKING]
796 Needs optimized bus_dmamap_sync().
797
798 * hpcmips [need verification that this is working]
799 Needs optimized bus_dmamap_sync().
800
801 * sgimips [WORKING]
802 Needs optimized bus_dmamap_sync().
803
804 * cobalt [need testing]
805
806 * mipsco [need testing]
807
808 * newsmips [need testing]
809
810 Branch: thorpej_scsipi
811 Description: SCSI/ATAPI midlayer rewrite.
812 Status: Terminated; merged to -current
813 Start Date:
814 End Date: Apr 25 2001
815 Base Tag: thorpej_scsipi_base, thorpej_scsipi_nbase
816 Maintainer: Manuel Bouyer <bouyer (a] NetBSD.org>,
817 Jason Thorpe <thorpej (a] NetBSD.org>
818 Scope: syssrc
819 Notes: When a change from -current is pulled up please move the
820 thorpej_scsipi_base tag to the revision you're syncing with.
821 thorpej_scsipi_nbase is private to maintainer (only
822 used when syncing the whole branch with HEAD).
823 Just before the merge, syssrc has been tagged with
824 thorpej_scsipi_beforemerge
825
826 Branch: thorpej-signal
827 Description: ?
828 Status: ?
829 Start Date:
830 End Date:
831 Base Tag: thorpej-signal-base
832 Maintainer: Jason Thorpe <thorpej (a] NetBSD.org>
833 Scope: kernel
834 Notes:
835
836 Branch: thorpej-setroot
837 Description: ?
838 Status: Terminated; merged to -current
839 Start Date:
840 End Date:
841 Base Tag:
842 Maintainer: Jason Thorpe <thorpej (a] NetBSD.org>
843 Scope: kernel
844 Notes:
845
846 Branch: simonb-timecounters
847 Description: Port FreeBSD timecounters to NetBSD
848 Status: Terminated
849 Start Date: Sat Feb 04 2006
850 End Date: Wed Jun 07 2006
851 Base Tag: simonb-timecounters-base
852 Maintainer: Simon Burge <simonb (a] NetBSD.org>,
853 Frank Kardel <kardel (a] NetBSD.org>
854 Scope: sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
855 Notes: early (partial conversion) commit to -current
856 ok'ed by core@ on 20060605 for testing and further
857 simplified conversion
858
859 Branch: wrstuden-devbsize
860 Description: Modify buffer cache to deal with different devices having
861 different block sizes. Also DEV_BSIZE would go away.
862 Status: Terminated
863 Start Date: Aug or Sept 1999
864 End Date: 1 Apr 2000
865 Base tag: wrstuden-devbsize-base
866 Maintainer: Bill Studenmund <wrstuden (a] NetBSD.org>
867 Scope: kernel
868 Notes: No longer active due to lack of time, and introduction
869 of UBC. In terms of UBC, the primary cache for
870 file data is the VM cache, which needs to operate
871 in terms of VM pages. As no existing device has native
872 pages the same size as our VM pages, there already is
873 a mapping going on between the VM system and the
874 underlying blocks. So it would be easier and cleaner
875 to adjust that to deal w/ different block sizes.
876 Also with UBC, all i/o is in terms of bytes at an offset
877 with a certain length, so the exact block size isn't a big
878 deal.
879
880 Any other wrstuden-devbsize tag may (and should) go away.
881
882 Branch: yamt-km, yamt-km-doc
883 Description: simplify/improve kernel memory management and bootstrap
884 Status: Terminated; merged to -current
885 Start Date: Tue Jan 25 2005
886 End Date: Fri Apr 1 2005
887 Base Tag: yamt-km-base{,2,3,4}, yamt-km-doc-base
888 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
889 Scope: yamt-km: src/sys
890 yamt-km-doc: src/share/man/man9/uvm.9
891 Notes: http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
892
893 the followings are per-port status.
894 (account names mean "tested by".)
895
896 works enough to go to multiuser:
897 alpha, i386, xen (yamt@)
898 pc532 (simonb@)
899 alpha, i386, mac68k, macppc, pmax, shark,
900 sparc, sparc64, sun3, x68k (chs@)
901 cobalt, dreamcast, hp300, news68k, newsmips,
902 sun3x (tsutsui@)
903 amiga (mhitch@)
904 cats, hp700 (skrll@)
905 xen (bouyer@)
906
907 known to have the same problem as trunk:
908 vax (chs@, stuck while running kvm_mkdb)
909
910 known to have a problem:
911 luna68k (and, if any, other m68k ports which use TTR)
912 needs to be revisited.
913 -> for luna68k, although not tested,
914 Sysmap has been moved to avoid kva conflict with
915 I/O ranges.
916
917 buildable:
918 src/sys/arch/acorn26/conf/GENERIC
919 src/sys/arch/acorn32/conf/GENERIC
920 src/sys/arch/algor/conf/P6032
921 src/sys/arch/alpha/conf/GENERIC
922 src/sys/arch/alpha/conf/GENERIC.MP
923 src/sys/arch/amd64/conf/GENERIC
924 src/sys/arch/amd64/conf/GENERIC.MP
925 src/sys/arch/amiga/conf/GENERIC
926 src/sys/arch/arc/conf/GENERIC
927 src/sys/arch/atari/conf/MILAN-PCIIDE
928 src/sys/arch/bebox/conf/GENERIC
929 src/sys/arch/cats/conf/GENERIC
930 src/sys/arch/cesfic/conf/GENERIC
931 src/sys/arch/cobalt/conf/GENERIC
932 src/sys/arch/dreamcast/conf/GENERIC
933 src/sys/arch/evbarm/conf/TS7200
934 src/sys/arch/evbppc/conf/WALNUT
935 src/sys/arch/evbsh3/conf/COMPUTEXEVB
936 src/sys/arch/evbsh5/conf/CAYMAN64
937 src/sys/arch/hp300/conf/GENERIC
938 src/sys/arch/hp700/conf/GENERIC
939 src/sys/arch/hpcarm/conf/JORNADA728
940 src/sys/arch/hpcmips/conf/GENERIC
941 src/sys/arch/hpcsh/conf/GENERIC
942 src/sys/arch/hpcsh/conf/HPW650PA
943 src/sys/arch/i386/conf/GENERIC
944 src/sys/arch/i386/conf/GENERIC.MP
945 src/sys/arch/i386/conf/XEN0
946 src/sys/arch/i386/conf/XENU
947 src/sys/arch/ibmnws/conf/GENERIC
948 src/sys/arch/iyonix/conf/GENERIC
949 src/sys/arch/luna68k/conf/GENERIC
950 src/sys/arch/mac68k/conf/GENERIC
951 src/sys/arch/macppc/conf/GENERIC
952 src/sys/arch/macppc/conf/GENERIC.MP
953 src/sys/arch/mipsco/conf/GENERIC
954 src/sys/arch/mmeye/conf/GENERIC
955 src/sys/arch/mvme68k/conf/GENERIC
956 src/sys/arch/netwinder/conf/GENERIC
957 src/sys/arch/news68k/conf/GENERIC
958 src/sys/arch/newsmips/conf/GENERIC
959 src/sys/arch/next68k/conf/GENERIC
960 src/sys/arch/ofppc/conf/GENERIC
961 src/sys/arch/pc532/conf/GENERIC
962 src/sys/arch/pmax/conf/GENERIC
963 src/sys/arch/prep/conf/GENERIC
964 src/sys/arch/sandpoint/conf/GENERIC
965 src/sys/arch/sbmips/conf/GENERIC
966 src/sys/arch/sgimips/conf/GENERIC32_IP3x
967 src/sys/arch/shark/conf/GENERIC
968 src/sys/arch/sparc/conf/GENERIC
969 src/sys/arch/sparc/conf/GENERIC.MP
970 src/sys/arch/sparc64/conf/GENERIC
971 src/sys/arch/sparc64/conf/GENERIC.MP
972 src/sys/arch/sun2/conf/GENERIC
973 src/sys/arch/sun3/conf/GENERIC
974 src/sys/arch/vax/conf/GENERIC
975 src/sys/arch/vax/conf/GENERIC.MP
976 src/sys/arch/x68k/conf/GENERIC
977
978 src/sys/arch/playstation2/conf/GENERIC
979
980 Branch: yamt-pdpolicy
981 Description: play with page replacement policy
982 - separate page replacement policy from the rest of kernel
983 - implement alternative replacement policy
984 - related read-ahead adjustment?
985 Status: Terminated; merged to -current
986 Start Date: Sun Mar 5 2006
987 End Date: Sat Sep 16 2006
988 Base Tag: yamt-pdpolicy-base9
989 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
990 Scope: src/sys (src/common is tagged but not branched)
991 Notes:
992
993 Branch: yamt-readahead
994 Description: play with file readahead
995 Status: Terminated; merged to -current
996 Start Date: Mon Nov 14 2005
997 End Date: Wed Nov 30 2005
998 Base Tag: yamt-readahead-base3
999 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
1000 Scope: src/sys
1001 Notes:
1002
1003 Branch: yamt-uio_vmspace
1004 Description: uio_lwp/uio_segflg -> uio_vmspace
1005 Status: Terminated; merged to -current
1006 Start Date: Mon Dec 31 2005
1007 End Date: Wed Mar 1 2006
1008 Base Tag: yamt-uio_vmspace-base5
1009 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
1010 Scope: src/sys
1011 Notes:
1012
1013 Branch: yamt-vop
1014 Description: remove several VOPs
1015 Status: Terminated; merged to -current
1016 Start Date: Wed Oct 19 2005
1017 End Date: Wed Nov 2 2005
1018 Base Tag: yamt-vop-base3
1019 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
1020 Scope: src/sys
1021 Notes: http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
1022
1023 Branch: gdamore-uart
1024 Description: Add register table support to com driver.
1025 Status: Active
1026 Start Date: 14 June 2006
1027 End Date: 13 July 2006
1028 Base Tag: gdamore-uart-base
1029 Maintainer: Garrett D'Amore <gdamore (a] NetBSD.org>
1030 Scope: kernel
1031 Notes: Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
1032 com support, and also removes a nasty hack from Atheros com.
1033
1034
1035 ########################################################################
1036 # Other:
1037 ########################################################################
1038
1039 Branch: magnum
1040 Description: ?
1041 Status: ?
1042 Start Date:
1043 End Date:
1044 Base Tag: magnum-base
1045 Maintainer: ?
1046 Scope: kernel
1047 Notes:
1048
1049