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