BRANCHES revision 1.161 1 # $NetBSD: BRANCHES,v 1.161 2007/03/13 17:31:46 ad 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 2007
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: vmlocking
421 Description: Make memory allocators and trap handling MP safe
422 Status: Active
423 Start Date: 13 March 2007
424 End Date:
425 Base Tag: vmlocking-base
426 Maintainer: Andrew Doran <ad (a] NetBSD.org>
427 Scope: kernel
428 Notes:
429 - Replace all simplelocks with mutexes
430 - Remove spinlockmgr
431 - Make memory allocators MP safe
432 - Make trap handling MP safe
433
434 Most of the locks replaced are now sleep/adaptive locks or
435 spin locks at IPL_VM. Assuming audio interrupt handlers
436 are made MP safe there are far fewer potential deadlocks
437 against the kernel lock.
438
439 v_interlock becomes an adaptive mutex so now acquring
440 it can potentially block, similarly for other locks
441 that were before simplelocks. This needs to be audited
442 carefully.
443
444 Use vnodes in general needs to be audited, as vnodes can
445 now be inspected without the kernel lock held.
446
447 Acquiring locks in the pmap module can now block, meaning
448 that the current pmap, cpu or lazy pmap status can change
449 out from underneath the requestor. This also needs to be
450 audited.
451
452 Currently, i386 has the necessary modifications, and has
453 trap handling and a few calls to allocators out from under
454 the kernel lock. There are still problems that need to be
455 debugged.
456
457 Need to check that whenever a lock is initialized, it is
458 also destroyed.
459
460 Lots of testing required.
461
462 Branch: yamt-idlelwp
463 Description: idle lwp, and some changes depending on it.
464
465 1. separate context switching and thread scheduling.
466 (cf. gmcgarry_ctxsw)
467 2. implement idle lwp.
468 3. clean up related MD/MI interfaces.
469 4. implement interrupt LWPs.
470 5. make scheduler(s) modular.
471
472 Status: Active
473 Start Date: Fri Feb 17 2007
474 End Date:
475 Base Tag: yamt-idlelwp-base3
476 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
477 Scope: src/sys (src/common is tagged but not branched)
478 Notes:
479
480 Branch: yamt-lazymbuf
481 Description: implement and evaluate lazy mapping of mbuf external data pages
482 it's intended as the first step of larger changes.
483 1. support operations (esp. bus_dma load) on
484 unmapped mbuf.
485 2. unify mbuf and buf.
486 (or, at least some parts of them)
487 3. then it should be trivial to implement
488 i/o coalescing, etc.
489 Status: Active
490 Start Date: Wed Jul 6 2005
491 End Date:
492 Base Tag: yamt-lazymbuf-base4
493 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
494 Scope: src/sys (src/common is tagged but not branched)
495 Notes:
496
497
498 ########################################################################
499 # Individual developers' branches (Terminated):
500 ########################################################################
501
502 Branch: bouyer-scsipi
503 Description: Integration of atapi support
504 Status: Terminated
505 Start Date:
506 End Date:
507 Base Tag:
508 Maintainer: Manuel Bouyer <bouyer (a] NetBSD.org>
509 Scope: kernel
510 Notes: Superseded by thorpej_scsipi
511
512 Branch: bouyer-xen2
513 Description: update xen port to xen 2.0, with support for domain0 operations
514 Status: Terminated
515 Start Date: Dec 13 2004
516 End Date: Mar 10 2005
517 Base Tag: netbsd-2-base
518 Maintainer: Manuel Bouyer <bouyer (a] NetBSD.org>
519 Scope: src/sys/arch/xen
520 Notes:
521
522 Branch: chap-midi
523 Description: Renovation of MIDI support
524 Status: Terminated; merged to -current
525 Start Date: 19 May 2006
526 End Date: 30 Jun 2006
527 Base Tag: chap-midi-base
528 Maintainer: Chapman Flack <chap (a] NetBSD.org>
529 Scope: sys, share/man, usr.bin
530 Notes:
531
532 Branch: chs-ubc
533 Description: Unified Buffer Cache
534 Status: Terminated
535 Start Date:
536 End Date:
537 Base Tag: chs-ubc-base
538 Maintainer: Chuck Silvers <chs (a] NetBSD.org>
539 Scope: kernel
540 Notes:
541
542 Branch: chs-ubc2
543 Description: Unified Buffer Cache
544 Status: Terminated; merged to -current
545 Start Date:
546 End Date:
547 Base Tag: chs-ubc2-base, chs-ubc2-newbase
548 Maintainer: Chuck Silvers <chs (a] NetBSD.org>
549 Scope: kernel
550 Notes:
551
552 Branch: cjs-build-against-obj-dir
553 Description: ?
554 Status: ?
555 Start Date:
556 End Date:
557 Base Tag:
558 Maintainer: Curt Sampson <cjs (a] NetBSD.org>
559 Scope: Entire tree.
560 Notes:
561
562 Branch: eeh-paddr_t
563 Description: use separate types for virtual vs. physical addresses
564 Status: Terminated; merged to -current
565 Start Date:
566 End Date:
567 Base Tag: eeh-paddr_t-base
568 Maintainer: Eduardo Horvath <eeh (a] NetBSD.org>
569 Scope: kernel
570 Notes: This is needed to support 32-bit kernels on sparc64.
571
572 Branch: elad-kernelauth
573 Description: Native NetBSD implementation of Apple's kernel authorization
574 based on TN2127. This is a "clean-room" implementation to
575 avoid any licensing issues.
576 Status: Terminated; merged to -current
577 Start Date: Tue Mar 7 2006
578 End Date: Mon May 15 2006
579 Base Tag: elad-kernelauth-base
580 Maintainer: Elad Efrat <elad (a] NetBSD.org>
581 Scope: src/sys, src/share/man/man9/Makefile,
582 src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi
583 Notes:
584
585 Branch: fvdl-softdep
586 Description: FFS soft dependencies
587 Status: Terminated; merged to -current
588 Start Date:
589 End Date:
590 Base Tag: fvdl-softdep-base
591 Maintainer: Frank van der Linden <fvdl (a] NetBSD.org>
592 Scope: kernel
593 Notes:
594
595 Branch: gehenna-devsw
596 Description: auto-generation of devsw table
597 Status: Terminated
598 Start Date: 16 May 2002
599 End Date: 6 Sep 2002
600 Base Tag: gehenna-devsw-base
601 Maintainer: MAEKAWA Masahide <gehenna (a] NetBSD.org>
602 Scope: syssrc
603 Notes: The goal is to get rid of the existing device switch tables in
604 port-dependent conf.c and to generate them dynamically by
605 config(8).
606
607 Branch: is-newarp
608 Description: ARP for non-Ethernet
609 Status: Terminated; merged before NetBSD 1.3
610 Start Date: 1996/10/13
611 End Date: 1997/03/15
612 Base Tag: is-newarp-base
613 Maintainer: Ignatios Souvatzis <is (a] NetBSD.org>
614 Scope: kernel
615 Notes:
616
617 Branch: kenh-if-detach
618 Description: Interface detach support.
619 Status: ?
620 Start Date:
621 End Date:
622 Base Tag: kenh-if-detach-base
623 Maintainer: Ken Hornstein <kenh (a] NetBSD.org>
624 Scope: kernel
625 Notes:
626
627 Branch: kent-audio1
628 Description: Audio converter pipeline
629 Status: Terminated; merged to -current
630 Start Date: Tue Dec 7 2004
631 End Date: Tue Jan 11 2005
632 Base Tag: kent-audio1-base
633 Maintainer: TAMURA Kent <kent (a] NetBSD.org>
634 Scope: kernel (audio device drivers)
635 Notes: http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
636 Please consult with the maintainer before committing
637 to this branch.
638
639 Branch: kqueue
640 Description: kqueue kernel event notification mechanism (from FreeBSD)
641 Status: Terminated; merged to -current
642 Start Date: Tue Jul 10 23:08:38 EST 2001
643 End Date: Tue Oct 24 09:14:14 GMT 2002
644 Base Tag: kqueue-base
645 Maintainer: Jaromir Dolecek <jdolecek (a] NetBSD.org>
646 Scope: kernel, libc/sys, share/man/man9, usr.bin/fstat
647 Notes: Integration of FreeBSD's kqueue(2) mechanism, with various
648 local internal changes to better suit NetBSD, and
649 enhancements such as looking up filters by name or
650 number, and dynamic registration of "user" filters.
651 The work is complete as is, but is awaiting more
652 feedback from various kernel gurus before going mainline.
653
654 Branch: ktrace-lwp
655 Description: ktrace support for lwp ids.
656 Status: Terminated; merged to -current
657 Start Date: Wed Jul 2 15:27:30 UTC 2003
658 End Date: Sun Dec 11 12:25:29 UTC 2005
659 Base Tag: ktrace-lwp-base
660 Maintainer: Darren Reed <darrenr (a] NetBSD.org>
661 Scope: sys
662 Notes:
663
664 Branch: marc-pcmcia
665 Description: PCMCIA support
666 Status: Terminated; merged to -current
667 Start Date:
668 End Date:
669 Base Tag: marc-pcmcia-base, marc-pcmcia-bp
670 Maintainer: Marc Horowitz <marc (a] NetBSD.org>
671 Scope: kernel
672 Notes:
673
674 Branch: minoura_x68k_bus_h
675 Description: bus_space(9) and bus_dma(9) implementation for x68k
676 Status: Terminated; merged to -current
677 Start Date: 23 Dec 1998
678 End Date: 16 Mar 1999
679 Base Tag: minoura_x68k_bus_h-base
680 Maintainer: Minoura Makoto <minoura (a] NetBSD.org>
681 Scope: sys/arch/x68k
682 Notes:
683
684 Branch: minoura-xpg4dl
685 Description: Citrus Project locale subsystem
686 Status: Terminated; (partly) merged to -current
687 Start Date: 28 March 2000
688 End Date:
689 Base Tag: minoura-xpg4dl-base
690 Maintainer: Minoura Makoto <minoura (a] NetBSD.org>
691 Scope: basesrc, syssrc, sharesrc
692 Notes: Citrus Project is developing dynamically-loadable, codeset-
693 independent locale subsystem. Part of the implementation
694 (LC_CTYPE) called XPG4DL is now integrated to -current.
695
696 Branch: mjf-ufs-trans
697 Description: filesystem transactions for ufs
698 Status: Active
699 Start Date: 12 March 2007
700 End Date:
701 Base Tag: mjf-ufs-trans-base
702 Maintainer: Matt Fleming <mjf (a] NetBSD.org>
703 Scope: kernel
704 Notes:
705
706 Branch: mrg-vm-swap
707 Description: dynamic swap allocation, swap-to-files support
708 Status: Terminated; abondoned for mrg-vm-swap2
709 Start Date: 12 February 1997
710 End Date: 15 March 1997
711 Base Tag: [none]
712 Maintainer: Matthew R. Green <mrg (a] NetBSD.org>
713 Scope: kernel
714 Notes:
715
716 Branch: mrg-vm-swap2
717 Description: dynamic swap allocation, swap-to-files support
718 Status: Terminated; merged to -current
719 Start Date: 4 May 1997
720 End Date: 12 June 1997
721 Base Tag: mrg-vm-swap2-base
722 Maintainer: Matthew R. Green <mrg (a] NetBSD.org>
723 Scope: kernel
724 Notes:
725
726 Branch: nathanw_sa
727 Description: Scheduler activations
728 Status: Terminated; merged to -current
729 Start Date: 5 March 2001
730 End Date: 18 January 2003
731 Base Tag: nathanw_sa_base
732 Maintainer: Nathan Williams <nathanw (a] NetBSD.org>
733 Scope: kernel, libc, libkvm, libpthread, libpthread_dbg, include,
734 bin/ps usr.bin/systat usr.bin/top usr.bin/w
735 gnu/dist/toolchain/gdb gnu/usr.bin/gdb
736 Notes: The idea of scheduler activations is described in the
737 classic paper by Anderson et al., in ACM Transactions
738 a on Computer Systems volume 10 issue 1 (1992),which
739 can be found at
740 http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
741 Many ideas in the implementation are based on the
742 implementation of scheduler activations added to Mach
743 3.0 and described by Davis et al. in the University of
744 Washington CS tech report 92-08-93, which can be found
745 at
746 ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
747
748 My USENIX paper on the subject can be found at
749 http://web.mit.edu/nathanw/www/usenix/
750
751 Please consult with the maintainer before committing
752 to this branch.
753 Other tags starting with nathanw_sa reserved for
754 branch management and are not guaranteed to be stable.
755
756 Trunk tagged with "nathanw_sa_before_merge" prior to
757 merging branch down to trunk. Branch tagged with
758 "nathanw_sa_end" to indicate the ending revision of
759 the branch.
760
761 Branch: perseant-lfsv2
762 Description: LFS incompatible on-disk data structure changes
763 Status: Terminated
764 Start Date: 27 June 2001
765 End Date: 16 July 2001
766 Base Tag: perseant-lfsv2-base
767 Maintainer: Konrad Schroder <perseant (a] NetBSD.org>
768 Scope: basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
769 Notes: This branch should be short-lived, I expect to merge as soon
770 as the data structures required for unremove are in and tested.
771
772 Branch: peter-altq
773 Description: New ALTQ framework:
774 - sync with KAME sources
775 - share mtag/name mapping functions
776 - separate altq + pf attachment
777 Status: Terminated; merged to -current
778 Start Date: March 16, 2006
779 End Date: October 12, 2006
780 Base Tag: peter-altq-base
781 Maintainer: Peter Postma <peter (a] NetBSD.org>,
782 Martin Husemann <martin (a] NetBSD.org>,
783 Matthias Scheler <tron (a] NetBSD.org>
784 Scope: dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq
785 Notes: Only the first item in the description was finished
786 in this branch.
787
788 Branch: sommerfeld_i386mp_1
789 Description: Multiprocessor support for i386 using Intel MP BIOS.
790 Status: Terminated; merged to -current
791 Start Date: 21 Feb 2000
792 End Date: 01 Oct 2002
793 Base Tag: sommerfeld_i386mpbase_1
794 Maintainer: Bill Sommerfeld <sommerfeld (a] NetBSD.org>
795 Scope: sys/arch/i386
796 Notes:
797 Code committed to the branch has booted to multiuser
798 on at least one system.
799
800 Not guaranteed to compile against mainline since -current
801 may have changed incompatibly with the last branch update;
802 use "cvs update -D" to roll-back the rest of the tree to match.
803
804 Please get explicit permission from the maintainer
805 before each commit, or your changes will be backed out.
806 Other tags starting with sommerfeld_ are private to
807 the developer and are guaranteed to be unstable.
808 Only the maintainer should move tags.
809
810 Note that this branch uses a DIFFERENT scheme for
811 synching with the mainline. the maintainer uses some private
812 scripts for keeping them in synch; if you make commits
813 to the branch to "resynchronize" things, you'll
814 probably do it wrong; instead, ask the maintainer to
815 resynchronize things.
816
817 See sys/arch/i386/TODO on the branch for a list of known
818 issues with the branch.
819
820 Branch: thorpej-mips-cache
821 Description: overhaul MIPS cache support code
822 Status: Terminated; merged to -current
823 Start Date: Oct 23 2001
824 End Date: Nov 14 2001
825 Base Tag: thorpej-mips-cache-base
826 Scope: syssrc
827 Notes: This branch needs more debugging, testing, and more
828 ports need to be converted to the new world order.
829
830 The following processors have had cache ops
831 written:
832
833 * R2000/R3000 (cache_r3k) -- light testing,
834 needs to be beat on a lot more to make
835 sure it's working.
836
837 * R4000/R4400 (cache_r4k) -- mhitch (a] NetBSD.org
838 tracked down a bug, which has been fixed.
839
840 Confirmed working on R4000-with-L2.
841
842 Confirmed working on R4400-no-L2 and
843 R4400-with-L2.
844
845 * R4600/R5000 (cache_r5k) -- shin (a] NetBSD.org
846 has committed fixes to this code.
847
848 Confirmed working on R4600 v2 (SGI IP-22 with
849 no SysAD L2 cache).
850
851 Confirmed working on RM5260 (Algorithmics P-5064).
852
853 * TX39 (cache_tx39) -- uch (a] NetBSD.org has
854 committed fixes to this code. Awaiting
855 confirmation that it is working properly.
856
857 * R5900 (cache_r5900) -- uch (a] NetBSD.org has
858 written this code and tested it on a
859 PlayStation 2.
860
861 The following ports have been updated to compile (and
862 use optimized-for-processor bus_dma routines). Those
863 that have been tested and work are marked with [WORKING].
864
865 * algor [WORKING]
866
867 * arc [WORKING]
868
869 * pmax [WORKING]
870
871 * playstation2 [WORKING]
872 Needs optimized bus_dmamap_sync().
873
874 * hpcmips [need verification that this is working]
875 Needs optimized bus_dmamap_sync().
876
877 * sgimips [WORKING]
878 Needs optimized bus_dmamap_sync().
879
880 * cobalt [need testing]
881
882 * mipsco [need testing]
883
884 * newsmips [need testing]
885
886 Branch: thorpej_scsipi
887 Description: SCSI/ATAPI midlayer rewrite.
888 Status: Terminated; merged to -current
889 Start Date:
890 End Date: Apr 25 2001
891 Base Tag: thorpej_scsipi_base, thorpej_scsipi_nbase
892 Maintainer: Manuel Bouyer <bouyer (a] NetBSD.org>,
893 Jason Thorpe <thorpej (a] NetBSD.org>
894 Scope: syssrc
895 Notes: When a change from -current is pulled up please move the
896 thorpej_scsipi_base tag to the revision you're syncing with.
897 thorpej_scsipi_nbase is private to maintainer (only
898 used when syncing the whole branch with HEAD).
899 Just before the merge, syssrc has been tagged with
900 thorpej_scsipi_beforemerge
901
902 Branch: thorpej-signal
903 Description: ?
904 Status: ?
905 Start Date:
906 End Date:
907 Base Tag: thorpej-signal-base
908 Maintainer: Jason Thorpe <thorpej (a] NetBSD.org>
909 Scope: kernel
910 Notes:
911
912 Branch: thorpej-setroot
913 Description: ?
914 Status: Terminated; merged to -current
915 Start Date:
916 End Date:
917 Base Tag:
918 Maintainer: Jason Thorpe <thorpej (a] NetBSD.org>
919 Scope: kernel
920 Notes:
921
922 Branch: simonb-timecounters
923 Description: Port FreeBSD timecounters to NetBSD
924 Status: Terminated
925 Start Date: Sat Feb 04 2006
926 End Date: Wed Jun 07 2006
927 Base Tag: simonb-timecounters-base
928 Maintainer: Simon Burge <simonb (a] NetBSD.org>,
929 Frank Kardel <kardel (a] NetBSD.org>
930 Scope: sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp
931 Notes: early (partial conversion) commit to -current
932 ok'ed by core@ on 20060605 for testing and further
933 simplified conversion
934
935 Branch: wrstuden-devbsize
936 Description: Modify buffer cache to deal with different devices having
937 different block sizes. Also DEV_BSIZE would go away.
938 Status: Terminated
939 Start Date: Aug or Sept 1999
940 End Date: 1 Apr 2000
941 Base tag: wrstuden-devbsize-base
942 Maintainer: Bill Studenmund <wrstuden (a] NetBSD.org>
943 Scope: kernel
944 Notes: No longer active due to lack of time, and introduction
945 of UBC. In terms of UBC, the primary cache for
946 file data is the VM cache, which needs to operate
947 in terms of VM pages. As no existing device has native
948 pages the same size as our VM pages, there already is
949 a mapping going on between the VM system and the
950 underlying blocks. So it would be easier and cleaner
951 to adjust that to deal w/ different block sizes.
952 Also with UBC, all i/o is in terms of bytes at an offset
953 with a certain length, so the exact block size isn't a big
954 deal.
955
956 Any other wrstuden-devbsize tag may (and should) go away.
957
958 Branch: yamt-km, yamt-km-doc
959 Description: simplify/improve kernel memory management and bootstrap
960 Status: Terminated; merged to -current
961 Start Date: Tue Jan 25 2005
962 End Date: Fri Apr 1 2005
963 Base Tag: yamt-km-base{,2,3,4}, yamt-km-doc-base
964 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
965 Scope: yamt-km: src/sys
966 yamt-km-doc: src/share/man/man9/uvm.9
967 Notes: http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
968
969 the followings are per-port status.
970 (account names mean "tested by".)
971
972 works enough to go to multiuser:
973 alpha, i386, xen (yamt@)
974 pc532 (simonb@)
975 alpha, i386, mac68k, macppc, pmax, shark,
976 sparc, sparc64, sun3, x68k (chs@)
977 cobalt, dreamcast, hp300, news68k, newsmips,
978 sun3x (tsutsui@)
979 amiga (mhitch@)
980 cats, hp700 (skrll@)
981 xen (bouyer@)
982
983 known to have the same problem as trunk:
984 vax (chs@, stuck while running kvm_mkdb)
985
986 known to have a problem:
987 luna68k (and, if any, other m68k ports which use TTR)
988 needs to be revisited.
989 -> for luna68k, although not tested,
990 Sysmap has been moved to avoid kva conflict with
991 I/O ranges.
992
993 buildable:
994 src/sys/arch/acorn26/conf/GENERIC
995 src/sys/arch/acorn32/conf/GENERIC
996 src/sys/arch/algor/conf/P6032
997 src/sys/arch/alpha/conf/GENERIC
998 src/sys/arch/alpha/conf/GENERIC.MP
999 src/sys/arch/amd64/conf/GENERIC
1000 src/sys/arch/amd64/conf/GENERIC.MP
1001 src/sys/arch/amiga/conf/GENERIC
1002 src/sys/arch/arc/conf/GENERIC
1003 src/sys/arch/atari/conf/MILAN-PCIIDE
1004 src/sys/arch/bebox/conf/GENERIC
1005 src/sys/arch/cats/conf/GENERIC
1006 src/sys/arch/cesfic/conf/GENERIC
1007 src/sys/arch/cobalt/conf/GENERIC
1008 src/sys/arch/dreamcast/conf/GENERIC
1009 src/sys/arch/evbarm/conf/TS7200
1010 src/sys/arch/evbppc/conf/WALNUT
1011 src/sys/arch/evbsh3/conf/COMPUTEXEVB
1012 src/sys/arch/evbsh5/conf/CAYMAN64
1013 src/sys/arch/hp300/conf/GENERIC
1014 src/sys/arch/hp700/conf/GENERIC
1015 src/sys/arch/hpcarm/conf/JORNADA728
1016 src/sys/arch/hpcmips/conf/GENERIC
1017 src/sys/arch/hpcsh/conf/GENERIC
1018 src/sys/arch/hpcsh/conf/HPW650PA
1019 src/sys/arch/i386/conf/GENERIC
1020 src/sys/arch/i386/conf/GENERIC.MP
1021 src/sys/arch/i386/conf/XEN0
1022 src/sys/arch/i386/conf/XENU
1023 src/sys/arch/ibmnws/conf/GENERIC
1024 src/sys/arch/iyonix/conf/GENERIC
1025 src/sys/arch/luna68k/conf/GENERIC
1026 src/sys/arch/mac68k/conf/GENERIC
1027 src/sys/arch/macppc/conf/GENERIC
1028 src/sys/arch/macppc/conf/GENERIC.MP
1029 src/sys/arch/mipsco/conf/GENERIC
1030 src/sys/arch/mmeye/conf/GENERIC
1031 src/sys/arch/mvme68k/conf/GENERIC
1032 src/sys/arch/netwinder/conf/GENERIC
1033 src/sys/arch/news68k/conf/GENERIC
1034 src/sys/arch/newsmips/conf/GENERIC
1035 src/sys/arch/next68k/conf/GENERIC
1036 src/sys/arch/ofppc/conf/GENERIC
1037 src/sys/arch/pc532/conf/GENERIC
1038 src/sys/arch/pmax/conf/GENERIC
1039 src/sys/arch/prep/conf/GENERIC
1040 src/sys/arch/sandpoint/conf/GENERIC
1041 src/sys/arch/sbmips/conf/GENERIC
1042 src/sys/arch/sgimips/conf/GENERIC32_IP3x
1043 src/sys/arch/shark/conf/GENERIC
1044 src/sys/arch/sparc/conf/GENERIC
1045 src/sys/arch/sparc/conf/GENERIC.MP
1046 src/sys/arch/sparc64/conf/GENERIC
1047 src/sys/arch/sparc64/conf/GENERIC.MP
1048 src/sys/arch/sun2/conf/GENERIC
1049 src/sys/arch/sun3/conf/GENERIC
1050 src/sys/arch/vax/conf/GENERIC
1051 src/sys/arch/vax/conf/GENERIC.MP
1052 src/sys/arch/x68k/conf/GENERIC
1053
1054 src/sys/arch/playstation2/conf/GENERIC
1055
1056 Branch: yamt-pdpolicy
1057 Description: play with page replacement policy
1058 - separate page replacement policy from the rest of kernel
1059 - implement alternative replacement policy
1060 - related read-ahead adjustment?
1061 Status: Terminated; merged to -current
1062 Start Date: Sun Mar 5 2006
1063 End Date: Sat Sep 16 2006
1064 Base Tag: yamt-pdpolicy-base9
1065 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
1066 Scope: src/sys (src/common is tagged but not branched)
1067 Notes:
1068
1069 Branch: yamt-readahead
1070 Description: play with file readahead
1071 Status: Terminated; merged to -current
1072 Start Date: Mon Nov 14 2005
1073 End Date: Wed Nov 30 2005
1074 Base Tag: yamt-readahead-base3
1075 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
1076 Scope: src/sys
1077 Notes:
1078
1079 Branch: yamt-uio_vmspace
1080 Description: uio_lwp/uio_segflg -> uio_vmspace
1081 Status: Terminated; merged to -current
1082 Start Date: Mon Dec 31 2005
1083 End Date: Wed Mar 1 2006
1084 Base Tag: yamt-uio_vmspace-base5
1085 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
1086 Scope: src/sys
1087 Notes:
1088
1089 Branch: yamt-splraiseipl
1090 Description: finish implementing splraiseipl (and makeiplcookie).
1091 http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html
1092
1093 - completes workqueue(9) and netbt.
1094 - fix PR/33218.
1095
1096 Status: Terminated; merged to -current
1097 Start Date: Mon Sep 18 2006
1098 End Date: Fri Dec 22 2006
1099 Base Tag: yamt-splraiseipl-base5
1100 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
1101 Scope: src/sys (src/common is tagged but not branched)
1102 Notes:
1103 tested (by who):
1104 alpha (yamt)
1105 alpha (pavel)
1106 amd64 (reported privately)
1107 cobalt (tsutsui)
1108 ews4800mips (tsutsui)
1109 hp300 (tsutsui)
1110 hpcarm (reported privately)
1111 i386 (yamt)
1112 macppc (tsutsui)
1113 news68k (tsutsui)
1114 sgimips(IP32) (tsutsui)
1115 sparc(sun4c) (tsutsui)
1116 sun2 (tsutsui)
1117 sun3 (tsutsui)
1118 sun3x (tsutsui)
1119 xen (yamt)
1120
1121 compile-tested:
1122 acorn26
1123 acorn32
1124 algor
1125 amiga
1126 arc
1127 atari
1128 bebox
1129 cats
1130 cesfic
1131 dreamcast
1132 evbarm
1133 evbmips
1134 evbppc(marvell)
1135 evbppc(ibm4xx)
1136 evbsh3
1137 hp700
1138 hpcmips
1139 hpcsh
1140 ia64
1141 ibmnws
1142 iyonix
1143 landisk
1144 luna68k
1145 mac68k
1146 mmeye
1147 mvme68k
1148 mvmeppc
1149 mipsco
1150 netwinder
1151 newsmips
1152 next68k
1153 ofppc
1154 pc532
1155 pmax
1156 pmppc
1157 prep
1158 sandpoint
1159 sbmips
1160 shark
1161 sparc
1162 sparc64
1163 vax
1164 x68k
1165 zaurus
1166
1167 not tested:
1168 pdp10 (i don't know how to build)
1169 sh5 (not buildable with an unrelated problem.)
1170
1171 compile CAYMAN64/netbsd32_sa.o
1172 cc1: warnings being treated as errors
1173 /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c: In function 'netbsd32_sa_ucsp':
1174 /exports/nbsd/src/sys/compat/netbsd32/netbsd32_sa.c:126: warning: implicit declaration of function '_UC_MACHINE32_SP'
1175 --- netbsd32_sa.o ---
1176 *** [netbsd32_sa.o] Error code 1
1177 1 error
1178
1179 notyet:
1180 amigappc
1181 playstation2
1182
1183 Branch: yamt-vop
1184 Description: remove several VOPs
1185 Status: Terminated; merged to -current
1186 Start Date: Wed Oct 19 2005
1187 End Date: Wed Nov 2 2005
1188 Base Tag: yamt-vop-base3
1189 Maintainer: YAMAMOTO Takashi <yamt (a] NetBSD.org>
1190 Scope: src/sys
1191 Notes: http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html
1192
1193 Branch: gdamore-uart
1194 Description: Add register table support to com driver.
1195 Status: Active
1196 Start Date: 14 June 2006
1197 End Date: 13 July 2006
1198 Base Tag: gdamore-uart-base
1199 Maintainer: Garrett D'Amore <gdamore (a] NetBSD.org>
1200 Scope: kernel
1201 Notes: Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c)
1202 com support, and also removes a nasty hack from Atheros com.
1203
1204 ########################################################################
1205 # Other:
1206 ########################################################################
1207
1208 Branch: magnum
1209 Description: ?
1210 Status: ?
1211 Start Date:
1212 End Date:
1213 Base Tag: magnum-base
1214 Maintainer: ?
1215 Scope: kernel
1216 Notes:
1217
1218