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