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