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