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