BRANCHES revision 1.114 1 # $NetBSD: BRANCHES,v 1.114 2006/10/07 02:53:57 tsutsui 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 hp300, news68k, sparc(sun4c), sun2,
410 sun3, sun3x (tsutsui)
411
412 compile-tested:
413 amd64, sparc, sparc64 (GENERIC),
414 vax, evbarm, evbmips, evbsh3, iyonix, acorn26,
415 hp700, evbppc (marvell, ibm4xx),
416 mac68k, x68k, hpcarm, shark, acorn32,
417 cats, netwinder, algor, arc, ews4800mips, hpcmips,
418 newsmips, luna68k, cobalt, pmax, sbmips, hpcsh,
419 landisk, next68k, macppc
420
421 not tested:
422 pdp10 (i don't know how to build)
423 sparc64 (GENERIC.MP seems to have an unrelated problem)
424 cesfic (GENERIC fails to build with the following
425 error. i don't know if it's related to my changes.)
426
427 build compat/libcompat.a
428 making sure the 68040 FPSP is up to date...
429 netbsd.s: Assembler messages:
430 netbsd.s:92: Error: can't resolve `0' {*UND* section} - `LOCAL_SIZE' {*UND* section}
431 netbsd.s:125: Error: can't resolve `0' {*UND* section} - `LOCAL_SIZE' {*UND* section}
432 netbsd.s:163: Error: can't resolve `0' {.text section} - `LOCAL_SIZE' {*UND* section}
433
434 amiga (GENERIC fails with the following error.)
435
436 `libcompat.a' is up to date.
437 making sure the 68040 FPSP is up to date...
438 do_func.s: Assembler messages:
439 do_func.s:564: Error: undefined symbol `neg_mask' in operation
440 do_func.s:564: Error: undefined symbol `inf_mask' in operation
441 do_func.s:591: Error: undefined symbol `neg_mask' in operation
442 do_func.s:591: Error: undefined symbol `z_mask' in operation
443
444 *** Failed target: do_func.o
445 *** 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
446 *** Error code 1
447
448 notyet:
449 others
450
451
452 ########################################################################
453 # Individual developers' branches (Terminated):
454 ########################################################################
455
456 Branch: bouyer-scsipi
457 Description: Integration of atapi support
458 Status: Terminated
459 Start Date:
460 End Date:
461 Base Tag:
462 Maintainer: Manuel Bouyer <bouyer (a] NetBSD.org>
463 Scope: kernel
464 Notes: Superseded by thorpej_scsipi
465
466 Branch: bouyer-xen2
467 Description: update xen port to xen 2.0, with support for domain0 operations
468 Status: Terminated
469 Start Date: Dec 13 2004
470 End Date: Mar 10 2005
471 Base Tag: netbsd-2-base
472 Maintainer: Manuel Bouyer <bouyer (a] NetBSD.org>
473 Scope: src/sys/arch/xen
474 Notes:
475
476 Branch: chap-midi
477 Description: Renovation of MIDI support
478 Status: Terminated; merged to -current
479 Start Date: 19 May 2006
480 End Date: 30 Jun 2006
481 Base Tag: chap-midi-base
482 Maintainer: Chapman Flack <chap (a] NetBSD.org>
483 Scope: sys, share/man, usr.bin
484 Notes:
485
486 Branch: chs-ubc
487 Description: Unified Buffer Cache
488 Status: Terminated
489 Start Date:
490 End Date:
491 Base Tag: chs-ubc-base
492 Maintainer: Chuck Silvers <chs (a] NetBSD.org>
493 Scope: kernel
494 Notes:
495
496 Branch: chs-ubc2
497 Description: Unified Buffer Cache
498 Status: Terminated; merged to -current
499 Start Date:
500 End Date:
501 Base Tag: chs-ubc2-base, chs-ubc2-newbase
502 Maintainer: Chuck Silvers <chs (a] NetBSD.org>
503 Scope: kernel
504 Notes:
505
506 Branch: cjs-build-against-obj-dir
507 Description: ?
508 Status: ?
509 Start Date:
510 End Date:
511 Base Tag:
512 Maintainer: Curt Sampson <cjs (a] NetBSD.org>
513 Scope: Entire tree.
514 Notes:
515
516 Branch: eeh-paddr_t
517 Description: use separate types for virtual vs. physical addresses
518 Status: Terminated; merged to -current
519 Start Date:
520 End Date:
521 Base Tag: eeh-paddr_t-base
522 Maintainer: Eduardo Horvath <eeh (a] NetBSD.org>
523 Scope: kernel
524 Notes: This is needed to support 32-bit kernels on sparc64.
525
526 Branch: elad-kernelauth
527 Description: Native NetBSD implementation of Apple's kernel authorization
528 based on TN2127. This is a "clean-room" implementation to
529 avoid any licensing issues.
530 Status: Terminated; merged to -current
531 Start Date: Tue Mar 7 2006
532 End Date: Mon May 15 2006
533 Base Tag: elad-kernelauth-base
534 Maintainer: Elad Efrat <elad (a] NetBSD.org>
535 Scope: src/sys, src/share/man/man9/Makefile,
536 src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
537 Notes:
538
539 Branch: fvdl-softdep
540 Description: FFS soft dependencies
541 Status: Terminated; merged to -current
542 Start Date:
543 End Date:
544 Base Tag: fvdl-softdep-base
545 Maintainer: Frank van der Linden <fvdl (a] NetBSD.org>
546 Scope: kernel
547 Notes:
548
549 Branch: gehenna-devsw
550 Description: auto-generation of devsw table
551 Status: Terminated
552 Start Date: 16 May 2002
553 End Date: 6 Sep 2002
554 Base Tag: gehenna-devsw-base
555 Maintainer: MAEKAWA Masahide <gehenna (a] NetBSD.org>
556 Scope: syssrc
557 Notes: The goal is to get rid of the existing device switch tables in
558 port-dependent conf.c and to generate them dynamically by
559 config(8).
560
561 Branch: is-newarp
562 Description: ARP for non-Ethernet
563 Status: Terminated; merged before NetBSD 1.3
564 Start Date: 1996/10/13
565 End Date: 1997/03/15
566 Base Tag: is-newarp-base
567 Maintainer: Ignatios Souvatzis <is (a] NetBSD.org>
568 Scope: kernel
569 Notes:
570
571 Branch: kenh-if-detach
572 Description: Interface detach support.
573 Status: ?
574 Start Date:
575 End Date:
576 Base Tag: kenh-if-detach-base
577 Maintainer: Ken Hornstein <kenh (a] NetBSD.org>
578 Scope: kernel
579 Notes:
580
581 Branch: kent-audio1
582 Description: Audio converter pipeline
583 Status: Terminated; merged to -current
584 Start Date: Tue Dec 7 2004
585 End Date: Tue Jan 11 2005
586 Base Tag: kent-audio1-base
587 Maintainer: TAMURA Kent <kent (a] NetBSD.org>
588 Scope: kernel (audio device drivers)
589 Notes: http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
590 Please consult with the maintainer before committing
591 to this branch.
592
593 Branch: kqueue
594 Description: kqueue kernel event notification mechanism (from FreeBSD)
595 Status: Terminated; merged to -current
596 Start Date: Tue Jul 10 23:08:38 EST 2001
597 End Date: Tue Oct 24 09:14:14 GMT 2002
598 Base Tag: kqueue-base
599 Maintainer: Jaromir Dolecek <jdolecek (a] NetBSD.org>
600 Scope: kernel, libc/sys, share/man/man9, usr.bin/fstat
601 Notes: Integration of FreeBSD's kqueue(2) mechanism, with various
602 local internal changes to better suit NetBSD, and
603 enhancements such as looking up filters by name or
604 number, and dynamic registration of "user" filters.
605 The work is complete as is, but is awaiting more
606 feedback from various kernel gurus before going mainline.
607
608 Branch: ktrace-lwp
609 Description: ktrace support for lwp ids.
610 Status: Terminated; merged to -current
611 Start Date: Wed Jul 2 15:27:30 UTC 2003
612 End Date: Sun Dec 11 12:25:29 UTC 2005
613 Base Tag: ktrace-lwp-base
614 Maintainer: Darren Reed <darrenr (a] NetBSD.org>
615 Scope: sys
616 Notes:
617
618 Branch: marc-pcmcia
619 Description: PCMCIA support
620 Status: Terminated; merged to -current
621 Start Date:
622 End Date:
623 Base Tag: marc-pcmcia-base, marc-pcmcia-bp
624 Maintainer: Marc Horowitz <marc (a] NetBSD.org>
625 Scope: kernel
626 Notes:
627
628 Branch: minoura_x68k_bus_h
629 Description: bus_space(9) and bus_dma(9) implementation for x68k
630 Status: Terminated; merged to -current
631 Start Date: 23 Dec 1998
632 End Date: 16 Mar 1999
633 Base Tag: minoura_x68k_bus_h-base
634 Maintainer: Minoura Makoto <minoura (a] NetBSD.org>
635 Scope: sys/arch/x68k
636 Notes:
637
638 Branch: minoura-xpg4dl
639 Description: Citrus Project locale subsystem
640 Status: Terminated; (partly) merged to -current
641 Start Date: 28 March 2000
642 End Date:
643 Base Tag: minoura-xpg4dl-base
644 Maintainer: Minoura Makoto <minoura (a] NetBSD.org>
645 Scope: basesrc, syssrc, sharesrc
646 Notes: Citrus Project is developing dynamically-loadable, codeset-
647 independent locale subsystem. Part of the implementation
648 (LC_CTYPE) called XPG4DL is now integrated to -current.
649
650 Branch: mrg-vm-swap
651 Description: dynamic swap allocation, swap-to-files support
652 Status: Terminated; abondoned for mrg-vm-swap2
653 Start Date: 12 February 1997
654 End Date: 15 March 1997
655 Base Tag: [none]
656 Maintainer: Matthew R. Green <mrg (a] NetBSD.org>
657 Scope: kernel
658 Notes:
659
660 Branch: mrg-vm-swap2
661 Description: dynamic swap allocation, swap-to-files support
662 Status: Terminated; merged to -current
663 Start Date: 4 May 1997
664 End Date: 12 June 1997
665 Base Tag: mrg-vm-swap2-base
666 Maintainer: Matthew R. Green <mrg (a] NetBSD.org>
667 Scope: kernel
668 Notes:
669
670 Branch: nathanw_sa
671 Description: Scheduler activations
672 Status: Terminated; merged to -current
673 Start Date: 5 March 2001
674 End Date: 18 January 2003
675 Base Tag: nathanw_sa_base
676 Maintainer: Nathan Williams <nathanw (a] NetBSD.org>
677 Scope: kernel, libc, libkvm, libpthread, libpthread_dbg, include,
678 bin/ps usr.bin/systat usr.bin/top usr.bin/w
679 gnu/dist/toolchain/gdb gnu/usr.bin/gdb
680 Notes: The idea of scheduler activations is described in the
681 classic paper by Anderson et al., in ACM Transactions
682 a on Computer Systems volume 10 issue 1 (1992),which
683 can be found at
684 http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
685 Many ideas in the implementation are based on the
686 implementation of scheduler activations added to Mach
687 3.0 and described by Davis et al. in the University of
688 Washington CS tech report 92-08-93, which can be found
689 at
690 ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
691
692 My USENIX paper on the subject can be found at
693 http://web.mit.edu/nathanw/www/usenix/
694
695 Please consult with the maintainer before committing
696 to this branch.
697 Other tags starting with nathanw_sa reserved for
698 branch management and are not guaranteed to be stable.
699
700 Trunk tagged with "nathanw_sa_before_merge" prior to
701 merging branch down to trunk. Branch tagged with
702 "nathanw_sa_end" to indicate the ending revision of
703 the branch.
704
705 Branch: perseant-lfsv2
706 Description: LFS incompatible on-disk data structure changes
707 Status: Terminated
708 Start Date: 27 June 2001
709 End Date: 16 July 2001
710 Base Tag: perseant-lfsv2-base
711 Maintainer: Konrad Schroder <perseant (a] NetBSD.org>
712 Scope: basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
713 Notes: This branch should be short-lived, I expect to merge as soon
714 as the data structures required for unremove are in and tested.
715
716 Branch: sommerfeld_i386mp_1
717 Description: Multiprocessor support for i386 using Intel MP BIOS.
718 Status: Terminated; merged to -current
719 Start Date: 21 Feb 2000
720 End Date: 01 Oct 2002
721 Base Tag: sommerfeld_i386mpbase_1
722 Maintainer: Bill Sommerfeld <sommerfeld (a] NetBSD.org>
723 Scope: sys/arch/i386
724 Notes:
725 Code committed to the branch has booted to multiuser
726 on at least one system.
727
728 Not guaranteed to compile against mainline since -current
729 may have changed incompatibly with the last branch update;
730 use "cvs update -D" to roll-back the rest of the tree to match.
731
732 Please get explicit permission from the maintainer
733 before each commit, or your changes will be backed out.
734 Other tags starting with sommerfeld_ are private to
735 the developer and are guaranteed to be unstable.
736 Only the maintainer should move tags.
737
738 Note that this branch uses a DIFFERENT scheme for
739 synching with the mainline. the maintainer uses some private
740 scripts for keeping them in synch; if you make commits
741 to the branch to "resynchronize" things, you'll
742 probably do it wrong; instead, ask the maintainer to
743 resynchronize things.
744
745 See sys/arch/i386/TODO on the branch for a list of known
746 issues with the branch.
747
748 Branch: thorpej-mips-cache
749 Description: overhaul MIPS cache support code
750 Status: Terminated; merged to -current
751 Start Date: Oct 23 2001
752 End Date: Nov 14 2001
753 Base Tag: thorpej-mips-cache-base
754 Scope: syssrc
755 Notes: This branch needs more debugging, testing, and more
756 ports need to be converted to the new world order.
757
758 The following processors have had cache ops
759 written:
760
761 * R2000/R3000 (cache_r3k) -- light testing,
762 needs to be beat on a lot more to make
763 sure it's working.
764
765 * R4000/R4400 (cache_r4k) -- mhitch (a] NetBSD.org
766 tracked down a bug, which has been fixed.
767
768 Confirmed working on R4000-with-L2.
769
770 Confirmed working on R4400-no-L2 and
771 R4400-with-L2.
772
773 * R4600/R5000 (cache_r5k) -- shin (a] NetBSD.org
774 has committed fixes to this code.
775
776 Confirmed working on R4600 v2 (SGI IP-22 with
777 no SysAD L2 cache).
778
779 Confirmed working on RM5260 (Algorithmics P-5064).
780
781 * TX39 (cache_tx39) -- uch (a] NetBSD.org has
782 committed fixes to this code. Awaiting
783 confirmation that it is working properly.
784
785 * R5900 (cache_r5900) -- uch (a] NetBSD.org has
786 written this code and tested it on a
787 PlayStation 2.
788
789 The following ports have been updated to compile (and
790 use optimized-for-processor bus_dma routines). Those
791 that have been tested and work are marked with [WORKING].
792
793 * algor [WORKING]
794
795 * arc [WORKING]
796
797 * pmax [WORKING]
798
799 * playstation2 [WORKING]
800 Needs optimized bus_dmamap_sync().
801
802 * hpcmips [need verification that this is working]
803 Needs optimized bus_dmamap_sync().
804
805 * sgimips [WORKING]
806 Needs optimized bus_dmamap_sync().
807
808 * cobalt [need testing]
809
810 * mipsco [need testing]
811
812 * newsmips [need testing]
813
814 Branch: thorpej_scsipi
815 Description: SCSI/ATAPI midlayer rewrite.
816 Status: Terminated; merged to -current
817 Start Date:
818 End Date: Apr 25 2001
819 Base Tag: thorpej_scsipi_base, thorpej_scsipi_nbase
820 Maintainer: Manuel Bouyer <bouyer (a] NetBSD.org>,
821 Jason Thorpe <thorpej (a] NetBSD.org>
822 Scope: syssrc
823 Notes: When a change from -current is pulled up please move the
824 thorpej_scsipi_base tag to the revision you're syncing with.
825 thorpej_scsipi_nbase is private to maintainer (only
826 used when syncing the whole branch with HEAD).
827 Just before the merge, syssrc has been tagged with
828 thorpej_scsipi_beforemerge
829
830 Branch: thorpej-signal
831 Description: ?
832 Status: ?
833 Start Date:
834 End Date:
835 Base Tag: thorpej-signal-base
836 Maintainer: Jason Thorpe <thorpej (a] NetBSD.org>
837 Scope: kernel
838 Notes:
839
840 Branch: thorpej-setroot
841 Description: ?
842 Status: Terminated; merged to -current
843 Start Date:
844 End Date:
845 Base Tag:
846 Maintainer: Jason Thorpe <thorpej (a] NetBSD.org>
847 Scope: kernel
848 Notes:
849
850 Branch: simonb-timecounters
851 Description: Port FreeBSD timecounters to NetBSD
852 Status: Terminated
853 Start Date: Sat Feb 04 2006
854 End Date: Wed Jun 07 2006
855 Base Tag: simonb-timecounters-base
856 Maintainer: Simon Burge <simonb (a] NetBSD.org>,
857 Frank Kardel <kardel (a] NetBSD.org>
858 Scope: sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
859 Notes: early (partial conversion) commit to -current
860 ok'ed by core@ on 20060605 for testing and further
861 simplified conversion
862
863 Branch: wrstuden-devbsize
864 Description: Modify buffer cache to deal with different devices having
865 different block sizes. Also DEV_BSIZE would go away.
866 Status: Terminated
867 Start Date: Aug or Sept 1999
868 End Date: 1 Apr 2000
869 Base tag: wrstuden-devbsize-base
870 Maintainer: Bill Studenmund <wrstuden (a] NetBSD.org>
871 Scope: kernel
872 Notes: No longer active due to lack of time, and introduction
873 of UBC. In terms of UBC, the primary cache for
874 file data is the VM cache, which needs to operate
875 in terms of VM pages. As no existing device has native
876 pages the same size as our VM pages, there already is
877 a mapping going on between the VM system and the
878 underlying blocks. So it would be easier and cleaner
879 to adjust that to deal w/ different block sizes.
880 Also with UBC, all i/o is in terms of bytes at an offset
881 with a certain length, so the exact block size isn't a big
882 deal.
883
884 Any other wrstuden-devbsize tag may (and should) go away.
885
886 Branch: yamt-km, yamt-km-doc
887 Description: simplify/improve kernel memory management and bootstrap
888 Status: Terminated; merged to -current
889 Start Date: Tue Jan 25 2005
890 End Date: Fri Apr 1 2005
891 Base Tag: yamt-km-base{,2,3,4}, yamt-km-doc-base
892 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
893 Scope: yamt-km: src/sys
894 yamt-km-doc: src/share/man/man9/uvm.9
895 Notes: http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
896
897 the followings are per-port status.
898 (account names mean "tested by".)
899
900 works enough to go to multiuser:
901 alpha, i386, xen (yamt@)
902 pc532 (simonb@)
903 alpha, i386, mac68k, macppc, pmax, shark,
904 sparc, sparc64, sun3, x68k (chs@)
905 cobalt, dreamcast, hp300, news68k, newsmips,
906 sun3x (tsutsui@)
907 amiga (mhitch@)
908 cats, hp700 (skrll@)
909 xen (bouyer@)
910
911 known to have the same problem as trunk:
912 vax (chs@, stuck while running kvm_mkdb)
913
914 known to have a problem:
915 luna68k (and, if any, other m68k ports which use TTR)
916 needs to be revisited.
917 -> for luna68k, although not tested,
918 Sysmap has been moved to avoid kva conflict with
919 I/O ranges.
920
921 buildable:
922 src/sys/arch/acorn26/conf/GENERIC
923 src/sys/arch/acorn32/conf/GENERIC
924 src/sys/arch/algor/conf/P6032
925 src/sys/arch/alpha/conf/GENERIC
926 src/sys/arch/alpha/conf/GENERIC.MP
927 src/sys/arch/amd64/conf/GENERIC
928 src/sys/arch/amd64/conf/GENERIC.MP
929 src/sys/arch/amiga/conf/GENERIC
930 src/sys/arch/arc/conf/GENERIC
931 src/sys/arch/atari/conf/MILAN-PCIIDE
932 src/sys/arch/bebox/conf/GENERIC
933 src/sys/arch/cats/conf/GENERIC
934 src/sys/arch/cesfic/conf/GENERIC
935 src/sys/arch/cobalt/conf/GENERIC
936 src/sys/arch/dreamcast/conf/GENERIC
937 src/sys/arch/evbarm/conf/TS7200
938 src/sys/arch/evbppc/conf/WALNUT
939 src/sys/arch/evbsh3/conf/COMPUTEXEVB
940 src/sys/arch/evbsh5/conf/CAYMAN64
941 src/sys/arch/hp300/conf/GENERIC
942 src/sys/arch/hp700/conf/GENERIC
943 src/sys/arch/hpcarm/conf/JORNADA728
944 src/sys/arch/hpcmips/conf/GENERIC
945 src/sys/arch/hpcsh/conf/GENERIC
946 src/sys/arch/hpcsh/conf/HPW650PA
947 src/sys/arch/i386/conf/GENERIC
948 src/sys/arch/i386/conf/GENERIC.MP
949 src/sys/arch/i386/conf/XEN0
950 src/sys/arch/i386/conf/XENU
951 src/sys/arch/ibmnws/conf/GENERIC
952 src/sys/arch/iyonix/conf/GENERIC
953 src/sys/arch/luna68k/conf/GENERIC
954 src/sys/arch/mac68k/conf/GENERIC
955 src/sys/arch/macppc/conf/GENERIC
956 src/sys/arch/macppc/conf/GENERIC.MP
957 src/sys/arch/mipsco/conf/GENERIC
958 src/sys/arch/mmeye/conf/GENERIC
959 src/sys/arch/mvme68k/conf/GENERIC
960 src/sys/arch/netwinder/conf/GENERIC
961 src/sys/arch/news68k/conf/GENERIC
962 src/sys/arch/newsmips/conf/GENERIC
963 src/sys/arch/next68k/conf/GENERIC
964 src/sys/arch/ofppc/conf/GENERIC
965 src/sys/arch/pc532/conf/GENERIC
966 src/sys/arch/pmax/conf/GENERIC
967 src/sys/arch/prep/conf/GENERIC
968 src/sys/arch/sandpoint/conf/GENERIC
969 src/sys/arch/sbmips/conf/GENERIC
970 src/sys/arch/sgimips/conf/GENERIC32_IP3x
971 src/sys/arch/shark/conf/GENERIC
972 src/sys/arch/sparc/conf/GENERIC
973 src/sys/arch/sparc/conf/GENERIC.MP
974 src/sys/arch/sparc64/conf/GENERIC
975 src/sys/arch/sparc64/conf/GENERIC.MP
976 src/sys/arch/sun2/conf/GENERIC
977 src/sys/arch/sun3/conf/GENERIC
978 src/sys/arch/vax/conf/GENERIC
979 src/sys/arch/vax/conf/GENERIC.MP
980 src/sys/arch/x68k/conf/GENERIC
981
982 src/sys/arch/playstation2/conf/GENERIC
983
984 Branch: yamt-pdpolicy
985 Description: play with page replacement policy
986 - separate page replacement policy from the rest of kernel
987 - implement alternative replacement policy
988 - related read-ahead adjustment?
989 Status: Terminated; merged to -current
990 Start Date: Sun Mar 5 2006
991 End Date: Sat Sep 16 2006
992 Base Tag: yamt-pdpolicy-base9
993 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
994 Scope: src/sys (src/common is tagged but not branched)
995 Notes:
996
997 Branch: yamt-readahead
998 Description: play with file readahead
999 Status: Terminated; merged to -current
1000 Start Date: Mon Nov 14 2005
1001 End Date: Wed Nov 30 2005
1002 Base Tag: yamt-readahead-base3
1003 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
1004 Scope: src/sys
1005 Notes:
1006
1007 Branch: yamt-uio_vmspace
1008 Description: uio_lwp/uio_segflg -> uio_vmspace
1009 Status: Terminated; merged to -current
1010 Start Date: Mon Dec 31 2005
1011 End Date: Wed Mar 1 2006
1012 Base Tag: yamt-uio_vmspace-base5
1013 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
1014 Scope: src/sys
1015 Notes:
1016
1017 Branch: yamt-vop
1018 Description: remove several VOPs
1019 Status: Terminated; merged to -current
1020 Start Date: Wed Oct 19 2005
1021 End Date: Wed Nov 2 2005
1022 Base Tag: yamt-vop-base3
1023 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
1024 Scope: src/sys
1025 Notes: http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
1026
1027 Branch: gdamore-uart
1028 Description: Add register table support to com driver.
1029 Status: Active
1030 Start Date: 14 June 2006
1031 End Date: 13 July 2006
1032 Base Tag: gdamore-uart-base
1033 Maintainer: Garrett D'Amore <gdamore (a] NetBSD.org>
1034 Scope: kernel
1035 Notes: Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
1036 com support, and also removes a nasty hack from Atheros com.
1037
1038
1039 ########################################################################
1040 # Other:
1041 ########################################################################
1042
1043 Branch: magnum
1044 Description: ?
1045 Status: ?
1046 Start Date:
1047 End Date:
1048 Base Tag: magnum-base
1049 Maintainer: ?
1050 Scope: kernel
1051 Notes:
1052
1053