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