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