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