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