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