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