BRANCHES revision 1.111
1# $NetBSD: BRANCHES,v 1.111 2006/10/02 10:29:09 yamt Exp $ 2# 3# This file contains a list of branches that exist in the NetBSD CVS 4# tree and their current state. 5# 6# This list is necessarily incomplete. 7# 8# Within reason, developers may create branch and version tags at any 9# time for any purpose. To avoid name collisions, private tags should 10# have names which begin with the developer's NetBSD login name 11# followed by a - or _ character (e.g., thorpej_scsipi, 12# thorpej-signal) 13# 14# Any branch or version tag not listed here should be assumed to be 15# private to the developer who created it. It is inappropriate for 16# anyone other than that developer to commit, move tags, or otherwise 17# modify the contents of the branch. 18# 19# Please update this file when a new branch is ready for consumption 20# by folks other than the maintainer, or when the use or status of an 21# existing branch changes significantly. 22# 23# Format: 24# Branch: name of branch 25# Description: Purpose and intention of the branch 26# Status: Active/Terminated/Dormant 27# Start Date: date first instantiated 28# End Date: date it was Terminated/made_Dormant, if any 29# Base Tag: netbsd-1-5-base, etc. 30# Maintainer: Somebody to blame. 31# Scope: Portion of the tree covered. 32# Notes: Various other info, perhaps explanation of special tags, 33# who-may-commit policies, etc. 34# 35# There are four sections to this file: 36# Release branches 37# Individual developers' branches (Active/Dormant) 38# Individual developers' branches (Terminated), and 39# other 40# 41# Entries within each section should be alphabetized. 42# 43 44 45# Release branches: 46 47Branch: comdex-fall-1999 48Description: Special release branch for pre-1.5 release at 49 Fall 1999 COMDEX. 50Status: Terminated 51Start Date: 52End Date: 53Base Tag: comdex-fall-1999-base 54Maintainer: ? 55Scope: Entire tree. 56Notes: 57 58Branch: netbsd-0-9 59Description: The NetBSD 0.9 release branch 60Status: Terminated 61Start Date: 62End Date: 63Base Tag: netbsd-0-9-base 64Maintainer: Release Engineering <releng@NetBSD.org> 65Scope: Entire tree. 66Notes: 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 70Branch: netbsd-1-0 71Description: The NetBSD 1.0 release branch 72Status: Terminated 73Start Date: 74End Date: 75Base Tag: netbsd-1-0-base 76Maintainer: Release Engineering <releng@NetBSD.org> 77Scope: Entire tree. 78Notes: 79 Commits restricted to release engineering. 80 81Branch: netbsd-1-1 82Description: The NetBSD 1.1 release branch 83Status: Terminated 84Start Date: 85End Date: 86Base Tag: netbsd-1-1-base 87Maintainer: Release Engineering <releng@NetBSD.org> 88Scope: Entire tree. 89Notes: 90 Commits restricted to release engineering. 91 92Branch: netbsd-1-2 93Description: The NetBSD 1.2 release branch 94Status: Terminated 95Start Date: 96End Date: 97Base Tag: netbsd-1-2-base 98Maintainer: Release Engineering <releng@NetBSD.org> 99Scope: Entire tree. 100Notes: 101 Commits restricted to release engineering. 102 103Branch: netbsd-1-3 104Description: The NetBSD 1.3 release branch 105Status: Terminated 106Start Date: 107End Date: 108Base Tag: netbsd-1-3-base 109Maintainer: Release Engineering <releng@NetBSD.org> 110Scope: Entire tree. 111Notes: 112 Commits restricted to release engineering. 113 114Branch: netbsd-1-4 115Description: The NetBSD 1.4 release branch 116Status: Terminated 117Start Date: 1 Apr 2000 118End Date: 119Base Tag: netbsd-1-4-base 120Maintainer: 1.4 Release Engineering <releng-1-4@NetBSD.org> 121Scope: Entire tree. 122Notes: 123 Commits restricted to release engineering. 124 125Branch: netbsd-1-5 126Description: The NetBSD 1.5 release branch 127Status: Terminated 128Start Date: 20 Jun 2000 129End Date: 26 Jan 2005 130Base Tag: netbsd-1-5-base 131Maintainer: 1.5 Release Engineering <releng-1-5@NetBSD.org> 132Scope: Entire tree. 133Notes: 134 Commits restricted to release engineering. 135 136Branch: netbsd-1-6 137Description: The NetBSD 1.6 release branch 138Status: Terminated 139Start Date: 22 May 2002 140End Date: 141Base Tag: netbsd-1-6-base 142Maintainer: 1.6 Release Engineering <releng-1-6@NetBSD.org> 143Scope: Entire tree. 144Notes: 145 Commits restricted to Release Engineering. 146 147Branch: netbsd-2 148Description: The NetBSD 2 release branch 149Status: Active 150Start Date: 23 Dec 2004 151End Date: 152Base Tag: netbsd-2-base 153Maintainer: 2 Release Engineering <releng-2@NetBSD.org> 154Scope: Entire tree. (src + xsrc) 155Notes: 156 Commits restricted to Release Engineering. 157 158Branch: netbsd-2-0 159Description: Originally the NetBSD 2.0 release branch and now the branch 160 tracking security/critical fixes for the NetBSD 2.0 series 161Status: Active 162Start Date: 28 Mar 2004 and changed for security/critical function on 163 23 Dec 2004 164End Date: 165Base Tag: netbsd-2-0-base 166Maintainer: 2.0 Release Engineering <releng-2-0@NetBSD.org> 167Scope: Entire tree. (src + xsrc) 168Notes: 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 173Branch: netbsd-2-1 174Description: Tracking security/critical fixes for NetBSD 2.1 175Status: Active 176Start Date: 26 Oct 2005 177End Date: 178Base Tag: netbsd-2-1-RELEASE 179Maintainer: 2 Release Engineering <releng-2@NetBSD.org> 180Scope: Entire tree. (src + xsrc) 181Notes: 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 185Branch: netbsd-3 186Description: The NetBSD 3 release branch 187Status: Active 188Start Date: 16 Mar 2005 189End Date: 190Base Tag: netbsd-3-base 191Maintainer: 3 Release Engineering <releng-3@NetBSD.org> 192Scope: Entire tree. (src + xsrc) 193Notes: 194 Commits restricted to Release Engineering. 195 196Branch: netbsd-4 197Description: The NetBSD 4 release branch 198Status: Active 199Start Date: 8 Aug 2006 200End Date: 201Base Tag: netbsd-4-base 202Maintainer: 4 Release Engineering <releng-4@NetBSD.org> 203Scope: Entire tree. (src + xsrc) 204Notes: 205 Commits restricted to Release Engineering. 206 207######################################################################## 208# Individual developers' branches (Active/Dormant): 209######################################################################## 210 211Branch: bjh21-hydra 212Description: Simtec Hydra support and ARM SMP in general 213Status: Dormant 214Start Date: 18 Oct 2002 215End Date: 216Base Tag: bjh21-hydra-base 217Maintainer: Ben Harris <bjh21@NetBSD.org> 218Scope: sys/arch/arm sys/arch/acorn32 219Notes: This code was on a branch because it involves changes to 220 cpuswitch.S which would otherwise make merging the 221 nathanw_sa branch difficult. 222 223Branch: gmcgarry_ctxsw 224Description: Separate scheduler from context-switch code 225Status: Dormant 226Start Date: 18 December 2002 227End Date: 228Base Tag: gmcgarry_ctxsw_base 229Maintainer: Gregory McGarry <gmcgarry@NetBSD.org> 230Scope: kernel 231Notes: Removing knowledge of the schedular and its run queues 232 from the machine-dependent context switch code is the 233 first step in cleaning up the scheduler. It is necessary 234 for the newlock branch, making the scheduler SMP friendly, 235 adding real-time scheduler extensions, and reducing the 236 number of code paths for LWP and proc switching. 237 238Branch: gmcgarry_ucred 239Description: Integrate and encapsulate user credentials 240Status: Dormant 241Start Date: 18 December 2002 242End Date: 243Base Tag: gmcgarry_ucred_base 244Maintainer: Gregory McGarry <gmcgarry@NetBSD.org> 245Scope: kernel 246Notes: merge pcred and ucred and poolify 247 248Branch: kame 249Description: KAME Project 250Status: Dormant 251Start Date: 28 Jun 1999 252End Date: 253Base Tag: 254Maintainer: Jun-ichiro itojun Hagino <itojun@NetBSD.org> 255Scope: kernel 256Notes: http://www.kame.net 257 Used for "reference" purposes for early part of KAME 258 integration effort. The branch is not actively used, as I 259 (itojun) use patch(1) and diff(1) for the KAME syncs. 260 261Branch: kent-audio2 262Description: In-kernel audio mixer 263Status: Active 264Start Date: Sun Jan 16 2005 265End Date: 266Base Tag: kent-audio2-base 267Maintainer: TAMURA Kent <kent@NetBSD.org> 268Scope: kernel (audio device drivers) 269Notes: http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html 270 Please consult with the maintainer before committing 271 to this branch. 272 This branch is not expected to be compilable yet. 273 274Branch: matt-timespec 275Description: Convert the kernel to struct timespec as its primary time 276 storage mechanism. 277Status: Active 278Start Date: 2005-02-19 279End Date: 280Base Tag: 281Maintainer: Matt Thomas <matt@NetBSD.org> 282Scope: kernel 283Notes: 284 285Branch: newlock 286Description: New locking primitives, based on Solaris's 287Status: Dormant 288Start Date: March 9, 2002 289End Date: 290Base Tag: newlock-base 291Maintainer: Jason R. Thorpe <thorpej@NetBSD.org> 292Scope: Kernel 293Notes: The goal is to replace the existing lockmgr() and 294 simple_lock() based locking mechanisms with the 295 primitives found in Solaris: mutexes and rwlocks. 296 297Branch: newlock2 298Description: New locking primitives, based on Solaris's 299Status: Active 300Start Date: September 9, 2006 301End Date: 302Base Tag: newlock2-base 303Maintainer: Andrew Doran <ad@NetBSD.org> 304Scope: Kernel 305Notes: As per the newlock branch, however given the amount of time 306 the original branch has lain dormant, a new one has been 307 created. Goals: 308 - Implement new locking primitives on most-used ports. 309 - Minor locking improvements. 310 - Remove spinlockmgr(). 311 312Branch: peter-altq 313Description: New ALTQ framework: 314 - sync with KAME sources 315 - share mtag/name mapping functions 316 - separate altq + pf attachment 317Status: Active 318Start Date: March 16, 2006 319End Date: 320Base Tag: peter-altq-base 321Maintainer: Peter Postma <peter@NetBSD.org>, 322 Martin Husemann <martin@NetBSD.org>, 323 Matthias Scheler <tron@NetBSD.org> 324Scope: dist/pf dist/ipf distrib/sets/lists sys usr.sbin/altq 325Notes: 326 327Branch: pkgviews 328Description: package views, enabling multiple conflicting packages to co-exist 329Status: Active 330Start Date: 22 July 2002 331End Date: 332Base Tag: pkgviews 333Maintainer: Alistair Crooks <agc@NetBSD.org> 334Scope: pkgsrc, basesrc/usr.sbin/pkg_install 335Notes: A more flexible infrastructure for third-party packages by 336 allowing multiple conflicting packages and versions to co-exist 337 within the same tree 338 339Branch: rpaulo-netinet-merge-pcb 340Description: merge in6pcb with inpcb 341Status: Active 342Start Date: Wed Feb 01 2006 343End Date: 344Base Tag: rpaulo-netinet-merge-pcb-base 345Maintainer: Rui Paulo <rpaulo@NetBSD.org> 346Scope: src/sys 347Notes: 348 349Branch: rtr-xorg-branch 350Description: xorg & static build alterations to src/x11 351Status: Active 352Start Date: Nov 15 2004 353End Date: 354Base tag: rtr-xorg-branch-base 355Maintainer: Tyler R. Retzlaff <rtr@NetBSD.org> 356Scope: x11 357 distrib/sets/lists 358 share/mk/bsd.x11.mk 359 share/mk/bsd.own.mk 360 etc/mtree/NetBSD.dist 361Notes: Requires parts of xsrc/xfree (HEAD) 362 xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd 363 Requires xorg (XORG-6_8_1) 364 365Branch: thorpej-devvp 366Description: replace dev_t with struct vnode * in devsw entry points 367Status: Active 368Start Date: Sep 6 2001 369End Date: 370Base Tag: thorpej-devvp-base 371Maintainer: Jason Thorpe <thorpej@NetBSD.org> 372Scope: syssrc 373Notes: Kernels built from this branch are not expected 374 to function correctly at this time. 375 376 Ports known to compile on this branch: 377 alpha 378 i386 379 380Branch: yamt-lazymbuf 381Description: implement and evaluate lazy mapping of mbuf external data pages 382 it's intended as the first step of larger changes. 383 1. support operations (esp. bus_dma load) on 384 unmapped mbuf. 385 2. unify mbuf and buf. 386 (or, at least some parts of them) 387 3. then it should be trivial to implement 388 i/o coalescing, etc. 389Status: Active 390Start Date: Wed Jul 6 2005 391End Date: 392Base Tag: yamt-lazymbuf-base2 393Maintainer: YAMAMOTO Takashi <yamt@NetBSD.org> 394Scope: src/sys 395Notes: 396 397Branch: yamt-splraiseipl 398Description: finish implementing splraiseipl (and makeiplcookie). 399 http://mail-index.NetBSD.org/tech-kern/2006/07/01/0000.html 400Status: Active 401Start Date: Mon Sep 18 2006 402End Date: 403Base Tag: yamt-splraiseipl-base 404Maintainer: YAMAMOTO Takashi <yamt@NetBSD.org> 405Scope: src/sys (src/common is tagged but not branched) 406Notes: 407 tested: 408 alpha, i386, xen (yamt) 409 410 compile-tested: 411 sun2, sun3, amd64, sparc, sparc64 (GENERIC), 412 vax, evbarm, evbmips, evbsh3, iyonix, acorn26, 413 hp700, evbppc (marvell, ibm4xx), 414 mac68k, x68k, hpcarm, shark, acorn32, 415 cats, netwinder, algor, arc, ews4800mips, hpcmips, 416 newsmips, luna68k, cobalt, pmax, sbmips, hpcsh, 417 landisk, next68k, macppc 418 419 not tested: 420 pdp10 (i don't know how to build) 421 sparc64 (GENERIC.MP seems to have an unrelated problem) 422 cesfic (GENERIC fails to build with the following 423 error. i don't know if it's related to my changes.) 424 425 build compat/libcompat.a 426 making sure the 68040 FPSP is up to date... 427 netbsd.s: Assembler messages: 428 netbsd.s:92: Error: can't resolve `0' {*UND* section} - `LOCAL_SIZE' {*UND* section} 429 netbsd.s:125: Error: can't resolve `0' {*UND* section} - `LOCAL_SIZE' {*UND* section} 430 netbsd.s:163: Error: can't resolve `0' {.text section} - `LOCAL_SIZE' {*UND* section} 431 432 amiga (GENERIC fails with the following error.) 433 434`libcompat.a' is up to date. 435making sure the 68040 FPSP is up to date... 436do_func.s: Assembler messages: 437do_func.s:564: Error: undefined symbol `neg_mask' in operation 438do_func.s:564: Error: undefined symbol `inf_mask' in operation 439do_func.s:591: Error: undefined symbol `neg_mask' in operation 440do_func.s:591: Error: undefined symbol `z_mask' in operation 441 442*** Failed target: do_func.o 443*** Failed command: /exports/abhome/tools/bin/m68k--netbsdelf-gcc -x assembler-with-cpp -m68040 -Damiga -DFPCOPROC -I../../. -I/exports/nbsd/src/sys/../common/include -I/exports/nbsd/src/sys/arch -I/exports/nbsd/src/sys -nostdinc -DDRACO -DM68060 -DM68040 -DM68030 -DM68020 -DLKM -DMAXUSERS=8 -D_KERNEL -D_KERNEL_OPT -I/exports/nbsd/src/sys/lib/libkern/../../../common/lib/libc/quad -I/exports/nbsd/src/sys/lib/libkern/../../../common/lib/libc/string -I/exports/nbsd/src/sys/lib/libkern/../../../common/lib/libc/arch/m68k/string -I/exports/nbsd/src/sys/dist/ipf -c -o do_func.o do_func.s 444*** Error code 1 445 446 notyet: 447 others 448 449 450######################################################################## 451# Individual developers' branches (Terminated): 452######################################################################## 453 454Branch: bouyer-scsipi 455Description: Integration of atapi support 456Status: Terminated 457Start Date: 458End Date: 459Base Tag: 460Maintainer: Manuel Bouyer <bouyer@NetBSD.org> 461Scope: kernel 462Notes: Superseded by thorpej_scsipi 463 464Branch: bouyer-xen2 465Description: update xen port to xen 2.0, with support for domain0 operations 466Status: Terminated 467Start Date: Dec 13 2004 468End Date: Mar 10 2005 469Base Tag: netbsd-2-base 470Maintainer: Manuel Bouyer <bouyer@NetBSD.org> 471Scope: src/sys/arch/xen 472Notes: 473 474Branch: chap-midi 475Description: Renovation of MIDI support 476Status: Terminated; merged to -current 477Start Date: 19 May 2006 478End Date: 30 Jun 2006 479Base Tag: chap-midi-base 480Maintainer: Chapman Flack <chap@NetBSD.org> 481Scope: sys, share/man, usr.bin 482Notes: 483 484Branch: chs-ubc 485Description: Unified Buffer Cache 486Status: Terminated 487Start Date: 488End Date: 489Base Tag: chs-ubc-base 490Maintainer: Chuck Silvers <chs@NetBSD.org> 491Scope: kernel 492Notes: 493 494Branch: chs-ubc2 495Description: Unified Buffer Cache 496Status: Terminated; merged to -current 497Start Date: 498End Date: 499Base Tag: chs-ubc2-base, chs-ubc2-newbase 500Maintainer: Chuck Silvers <chs@NetBSD.org> 501Scope: kernel 502Notes: 503 504Branch: cjs-build-against-obj-dir 505Description: ? 506Status: ? 507Start Date: 508End Date: 509Base Tag: 510Maintainer: Curt Sampson <cjs@NetBSD.org> 511Scope: Entire tree. 512Notes: 513 514Branch: eeh-paddr_t 515Description: use separate types for virtual vs. physical addresses 516Status: Terminated; merged to -current 517Start Date: 518End Date: 519Base Tag: eeh-paddr_t-base 520Maintainer: Eduardo Horvath <eeh@NetBSD.org> 521Scope: kernel 522Notes: This is needed to support 32-bit kernels on sparc64. 523 524Branch: elad-kernelauth 525Description: Native NetBSD implementation of Apple's kernel authorization 526 based on TN2127. This is a "clean-room" implementation to 527 avoid any licensing issues. 528Status: Terminated; merged to -current 529Start Date: Tue Mar 7 2006 530End Date: Mon May 15 2006 531Base Tag: elad-kernelauth-base 532Maintainer: Elad Efrat <elad@NetBSD.org> 533Scope: src/sys, src/share/man/man9/Makefile, 534 src/share/man/man9/kauth.h, src/distrib/sets/lists/comp/mi 535Notes: 536 537Branch: fvdl-softdep 538Description: FFS soft dependencies 539Status: Terminated; merged to -current 540Start Date: 541End Date: 542Base Tag: fvdl-softdep-base 543Maintainer: Frank van der Linden <fvdl@NetBSD.org> 544Scope: kernel 545Notes: 546 547Branch: gehenna-devsw 548Description: auto-generation of devsw table 549Status: Terminated 550Start Date: 16 May 2002 551End Date: 6 Sep 2002 552Base Tag: gehenna-devsw-base 553Maintainer: MAEKAWA Masahide <gehenna@NetBSD.org> 554Scope: syssrc 555Notes: The goal is to get rid of the existing device switch tables in 556 port-dependent conf.c and to generate them dynamically by 557 config(8). 558 559Branch: is-newarp 560Description: ARP for non-Ethernet 561Status: Terminated; merged before NetBSD 1.3 562Start Date: 1996/10/13 563End Date: 1997/03/15 564Base Tag: is-newarp-base 565Maintainer: Ignatios Souvatzis <is@NetBSD.org> 566Scope: kernel 567Notes: 568 569Branch: kenh-if-detach 570Description: Interface detach support. 571Status: ? 572Start Date: 573End Date: 574Base Tag: kenh-if-detach-base 575Maintainer: Ken Hornstein <kenh@NetBSD.org> 576Scope: kernel 577Notes: 578 579Branch: kent-audio1 580Description: Audio converter pipeline 581Status: Terminated; merged to -current 582Start Date: Tue Dec 7 2004 583End Date: Tue Jan 11 2005 584Base Tag: kent-audio1-base 585Maintainer: TAMURA Kent <kent@NetBSD.org> 586Scope: kernel (audio device drivers) 587Notes: http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html 588 Please consult with the maintainer before committing 589 to this branch. 590 591Branch: kqueue 592Description: kqueue kernel event notification mechanism (from FreeBSD) 593Status: Terminated; merged to -current 594Start Date: Tue Jul 10 23:08:38 EST 2001 595End Date: Tue Oct 24 09:14:14 GMT 2002 596Base Tag: kqueue-base 597Maintainer: Jaromir Dolecek <jdolecek@NetBSD.org> 598Scope: kernel, libc/sys, share/man/man9, usr.bin/fstat 599Notes: Integration of FreeBSD's kqueue(2) mechanism, with various 600 local internal changes to better suit NetBSD, and 601 enhancements such as looking up filters by name or 602 number, and dynamic registration of "user" filters. 603 The work is complete as is, but is awaiting more 604 feedback from various kernel gurus before going mainline. 605 606Branch: ktrace-lwp 607Description: ktrace support for lwp ids. 608Status: Terminated; merged to -current 609Start Date: Wed Jul 2 15:27:30 UTC 2003 610End Date: Sun Dec 11 12:25:29 UTC 2005 611Base Tag: ktrace-lwp-base 612Maintainer: Darren Reed <darrenr@NetBSD.org> 613Scope: sys 614Notes: 615 616Branch: marc-pcmcia 617Description: PCMCIA support 618Status: Terminated; merged to -current 619Start Date: 620End Date: 621Base Tag: marc-pcmcia-base, marc-pcmcia-bp 622Maintainer: Marc Horowitz <marc@NetBSD.org> 623Scope: kernel 624Notes: 625 626Branch: minoura_x68k_bus_h 627Description: bus_space(9) and bus_dma(9) implementation for x68k 628Status: Terminated; merged to -current 629Start Date: 23 Dec 1998 630End Date: 16 Mar 1999 631Base Tag: minoura_x68k_bus_h-base 632Maintainer: Minoura Makoto <minoura@NetBSD.org> 633Scope: sys/arch/x68k 634Notes: 635 636Branch: minoura-xpg4dl 637Description: Citrus Project locale subsystem 638Status: Terminated; (partly) merged to -current 639Start Date: 28 March 2000 640End Date: 641Base Tag: minoura-xpg4dl-base 642Maintainer: Minoura Makoto <minoura@NetBSD.org> 643Scope: basesrc, syssrc, sharesrc 644Notes: Citrus Project is developing dynamically-loadable, codeset- 645 independent locale subsystem. Part of the implementation 646 (LC_CTYPE) called XPG4DL is now integrated to -current. 647 648Branch: mrg-vm-swap 649Description: dynamic swap allocation, swap-to-files support 650Status: Terminated; abondoned for mrg-vm-swap2 651Start Date: 12 February 1997 652End Date: 15 March 1997 653Base Tag: [none] 654Maintainer: Matthew R. Green <mrg@NetBSD.org> 655Scope: kernel 656Notes: 657 658Branch: mrg-vm-swap2 659Description: dynamic swap allocation, swap-to-files support 660Status: Terminated; merged to -current 661Start Date: 4 May 1997 662End Date: 12 June 1997 663Base Tag: mrg-vm-swap2-base 664Maintainer: Matthew R. Green <mrg@NetBSD.org> 665Scope: kernel 666Notes: 667 668Branch: nathanw_sa 669Description: Scheduler activations 670Status: Terminated; merged to -current 671Start Date: 5 March 2001 672End Date: 18 January 2003 673Base Tag: nathanw_sa_base 674Maintainer: Nathan Williams <nathanw@NetBSD.org> 675Scope: kernel, libc, libkvm, libpthread, libpthread_dbg, include, 676 bin/ps usr.bin/systat usr.bin/top usr.bin/w 677 gnu/dist/toolchain/gdb gnu/usr.bin/gdb 678Notes: The idea of scheduler activations is described in the 679 classic paper by Anderson et al., in ACM Transactions 680 a on Computer Systems volume 10 issue 1 (1992),which 681 can be found at 682 http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/ 683 Many ideas in the implementation are based on the 684 implementation of scheduler activations added to Mach 685 3.0 and described by Davis et al. in the University of 686 Washington CS tech report 92-08-93, which can be found 687 at 688 ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z 689 690 My USENIX paper on the subject can be found at 691 http://web.mit.edu/nathanw/www/usenix/ 692 693 Please consult with the maintainer before committing 694 to this branch. 695 Other tags starting with nathanw_sa reserved for 696 branch management and are not guaranteed to be stable. 697 698 Trunk tagged with "nathanw_sa_before_merge" prior to 699 merging branch down to trunk. Branch tagged with 700 "nathanw_sa_end" to indicate the ending revision of 701 the branch. 702 703Branch: perseant-lfsv2 704Description: LFS incompatible on-disk data structure changes 705Status: Terminated 706Start Date: 27 June 2001 707End Date: 16 July 2001 708Base Tag: perseant-lfsv2-base 709Maintainer: Konrad Schroder <perseant@NetBSD.org> 710Scope: basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs 711Notes: This branch should be short-lived, I expect to merge as soon 712 as the data structures required for unremove are in and tested. 713 714Branch: sommerfeld_i386mp_1 715Description: Multiprocessor support for i386 using Intel MP BIOS. 716Status: Terminated; merged to -current 717Start Date: 21 Feb 2000 718End Date: 01 Oct 2002 719Base Tag: sommerfeld_i386mpbase_1 720Maintainer: Bill Sommerfeld <sommerfeld@NetBSD.org> 721Scope: sys/arch/i386 722Notes: 723 Code committed to the branch has booted to multiuser 724 on at least one system. 725 726 Not guaranteed to compile against mainline since -current 727 may have changed incompatibly with the last branch update; 728 use "cvs update -D" to roll-back the rest of the tree to match. 729 730 Please get explicit permission from the maintainer 731 before each commit, or your changes will be backed out. 732 Other tags starting with sommerfeld_ are private to 733 the developer and are guaranteed to be unstable. 734 Only the maintainer should move tags. 735 736 Note that this branch uses a DIFFERENT scheme for 737 synching with the mainline. the maintainer uses some private 738 scripts for keeping them in synch; if you make commits 739 to the branch to "resynchronize" things, you'll 740 probably do it wrong; instead, ask the maintainer to 741 resynchronize things. 742 743 See sys/arch/i386/TODO on the branch for a list of known 744 issues with the branch. 745 746Branch: thorpej-mips-cache 747Description: overhaul MIPS cache support code 748Status: Terminated; merged to -current 749Start Date: Oct 23 2001 750End Date: Nov 14 2001 751Base Tag: thorpej-mips-cache-base 752Scope: syssrc 753Notes: This branch needs more debugging, testing, and more 754 ports need to be converted to the new world order. 755 756 The following processors have had cache ops 757 written: 758 759 * R2000/R3000 (cache_r3k) -- light testing, 760 needs to be beat on a lot more to make 761 sure it's working. 762 763 * R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org 764 tracked down a bug, which has been fixed. 765 766 Confirmed working on R4000-with-L2. 767 768 Confirmed working on R4400-no-L2 and 769 R4400-with-L2. 770 771 * R4600/R5000 (cache_r5k) -- shin@NetBSD.org 772 has committed fixes to this code. 773 774 Confirmed working on R4600 v2 (SGI IP-22 with 775 no SysAD L2 cache). 776 777 Confirmed working on RM5260 (Algorithmics P-5064). 778 779 * TX39 (cache_tx39) -- uch@NetBSD.org has 780 committed fixes to this code. Awaiting 781 confirmation that it is working properly. 782 783 * R5900 (cache_r5900) -- uch@NetBSD.org has 784 written this code and tested it on a 785 PlayStation 2. 786 787 The following ports have been updated to compile (and 788 use optimized-for-processor bus_dma routines). Those 789 that have been tested and work are marked with [WORKING]. 790 791 * algor [WORKING] 792 793 * arc [WORKING] 794 795 * pmax [WORKING] 796 797 * playstation2 [WORKING] 798 Needs optimized bus_dmamap_sync(). 799 800 * hpcmips [need verification that this is working] 801 Needs optimized bus_dmamap_sync(). 802 803 * sgimips [WORKING] 804 Needs optimized bus_dmamap_sync(). 805 806 * cobalt [need testing] 807 808 * mipsco [need testing] 809 810 * newsmips [need testing] 811 812Branch: thorpej_scsipi 813Description: SCSI/ATAPI midlayer rewrite. 814Status: Terminated; merged to -current 815Start Date: 816End Date: Apr 25 2001 817Base Tag: thorpej_scsipi_base, thorpej_scsipi_nbase 818Maintainer: Manuel Bouyer <bouyer@NetBSD.org>, 819 Jason Thorpe <thorpej@NetBSD.org> 820Scope: syssrc 821Notes: When a change from -current is pulled up please move the 822 thorpej_scsipi_base tag to the revision you're syncing with. 823 thorpej_scsipi_nbase is private to maintainer (only 824 used when syncing the whole branch with HEAD). 825 Just before the merge, syssrc has been tagged with 826 thorpej_scsipi_beforemerge 827 828Branch: thorpej-signal 829Description: ? 830Status: ? 831Start Date: 832End Date: 833Base Tag: thorpej-signal-base 834Maintainer: Jason Thorpe <thorpej@NetBSD.org> 835Scope: kernel 836Notes: 837 838Branch: thorpej-setroot 839Description: ? 840Status: Terminated; merged to -current 841Start Date: 842End Date: 843Base Tag: 844Maintainer: Jason Thorpe <thorpej@NetBSD.org> 845Scope: kernel 846Notes: 847 848Branch: simonb-timecounters 849Description: Port FreeBSD timecounters to NetBSD 850Status: Terminated 851Start Date: Sat Feb 04 2006 852End Date: Wed Jun 07 2006 853Base Tag: simonb-timecounters-base 854Maintainer: Simon Burge <simonb@NetBSD.org>, 855 Frank Kardel <kardel@NetBSD.org> 856Scope: sys, sbin/savecore, usr.bin/vmstat, usr.sbin/ntp 857Notes: early (partial conversion) commit to -current 858 ok'ed by core@ on 20060605 for testing and further 859 simplified conversion 860 861Branch: wrstuden-devbsize 862Description: Modify buffer cache to deal with different devices having 863 different block sizes. Also DEV_BSIZE would go away. 864Status: Terminated 865Start Date: Aug or Sept 1999 866End Date: 1 Apr 2000 867Base tag: wrstuden-devbsize-base 868Maintainer: Bill Studenmund <wrstuden@NetBSD.org> 869Scope: kernel 870Notes: No longer active due to lack of time, and introduction 871 of UBC. In terms of UBC, the primary cache for 872 file data is the VM cache, which needs to operate 873 in terms of VM pages. As no existing device has native 874 pages the same size as our VM pages, there already is 875 a mapping going on between the VM system and the 876 underlying blocks. So it would be easier and cleaner 877 to adjust that to deal w/ different block sizes. 878 Also with UBC, all i/o is in terms of bytes at an offset 879 with a certain length, so the exact block size isn't a big 880 deal. 881 882 Any other wrstuden-devbsize tag may (and should) go away. 883 884Branch: yamt-km, yamt-km-doc 885Description: simplify/improve kernel memory management and bootstrap 886Status: Terminated; merged to -current 887Start Date: Tue Jan 25 2005 888End Date: Fri Apr 1 2005 889Base Tag: yamt-km-base{,2,3,4}, yamt-km-doc-base 890Maintainer: YAMAMOTO Takashi <yamt@NetBSD.org> 891Scope: yamt-km: src/sys 892 yamt-km-doc: src/share/man/man9/uvm.9 893Notes: http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html 894 895 the followings are per-port status. 896 (account names mean "tested by".) 897 898 works enough to go to multiuser: 899 alpha, i386, xen (yamt@) 900 pc532 (simonb@) 901 alpha, i386, mac68k, macppc, pmax, shark, 902 sparc, sparc64, sun3, x68k (chs@) 903 cobalt, dreamcast, hp300, news68k, newsmips, 904 sun3x (tsutsui@) 905 amiga (mhitch@) 906 cats, hp700 (skrll@) 907 xen (bouyer@) 908 909 known to have the same problem as trunk: 910 vax (chs@, stuck while running kvm_mkdb) 911 912 known to have a problem: 913 luna68k (and, if any, other m68k ports which use TTR) 914 needs to be revisited. 915 -> for luna68k, although not tested, 916 Sysmap has been moved to avoid kva conflict with 917 I/O ranges. 918 919 buildable: 920 src/sys/arch/acorn26/conf/GENERIC 921 src/sys/arch/acorn32/conf/GENERIC 922 src/sys/arch/algor/conf/P6032 923 src/sys/arch/alpha/conf/GENERIC 924 src/sys/arch/alpha/conf/GENERIC.MP 925 src/sys/arch/amd64/conf/GENERIC 926 src/sys/arch/amd64/conf/GENERIC.MP 927 src/sys/arch/amiga/conf/GENERIC 928 src/sys/arch/arc/conf/GENERIC 929 src/sys/arch/atari/conf/MILAN-PCIIDE 930 src/sys/arch/bebox/conf/GENERIC 931 src/sys/arch/cats/conf/GENERIC 932 src/sys/arch/cesfic/conf/GENERIC 933 src/sys/arch/cobalt/conf/GENERIC 934 src/sys/arch/dreamcast/conf/GENERIC 935 src/sys/arch/evbarm/conf/TS7200 936 src/sys/arch/evbppc/conf/WALNUT 937 src/sys/arch/evbsh3/conf/COMPUTEXEVB 938 src/sys/arch/evbsh5/conf/CAYMAN64 939 src/sys/arch/hp300/conf/GENERIC 940 src/sys/arch/hp700/conf/GENERIC 941 src/sys/arch/hpcarm/conf/JORNADA728 942 src/sys/arch/hpcmips/conf/GENERIC 943 src/sys/arch/hpcsh/conf/GENERIC 944 src/sys/arch/hpcsh/conf/HPW650PA 945 src/sys/arch/i386/conf/GENERIC 946 src/sys/arch/i386/conf/GENERIC.MP 947 src/sys/arch/i386/conf/XEN0 948 src/sys/arch/i386/conf/XENU 949 src/sys/arch/ibmnws/conf/GENERIC 950 src/sys/arch/iyonix/conf/GENERIC 951 src/sys/arch/luna68k/conf/GENERIC 952 src/sys/arch/mac68k/conf/GENERIC 953 src/sys/arch/macppc/conf/GENERIC 954 src/sys/arch/macppc/conf/GENERIC.MP 955 src/sys/arch/mipsco/conf/GENERIC 956 src/sys/arch/mmeye/conf/GENERIC 957 src/sys/arch/mvme68k/conf/GENERIC 958 src/sys/arch/netwinder/conf/GENERIC 959 src/sys/arch/news68k/conf/GENERIC 960 src/sys/arch/newsmips/conf/GENERIC 961 src/sys/arch/next68k/conf/GENERIC 962 src/sys/arch/ofppc/conf/GENERIC 963 src/sys/arch/pc532/conf/GENERIC 964 src/sys/arch/pmax/conf/GENERIC 965 src/sys/arch/prep/conf/GENERIC 966 src/sys/arch/sandpoint/conf/GENERIC 967 src/sys/arch/sbmips/conf/GENERIC 968 src/sys/arch/sgimips/conf/GENERIC32_IP3x 969 src/sys/arch/shark/conf/GENERIC 970 src/sys/arch/sparc/conf/GENERIC 971 src/sys/arch/sparc/conf/GENERIC.MP 972 src/sys/arch/sparc64/conf/GENERIC 973 src/sys/arch/sparc64/conf/GENERIC.MP 974 src/sys/arch/sun2/conf/GENERIC 975 src/sys/arch/sun3/conf/GENERIC 976 src/sys/arch/vax/conf/GENERIC 977 src/sys/arch/vax/conf/GENERIC.MP 978 src/sys/arch/x68k/conf/GENERIC 979 980 src/sys/arch/playstation2/conf/GENERIC 981 982Branch: yamt-pdpolicy 983Description: play with page replacement policy 984 - separate page replacement policy from the rest of kernel 985 - implement alternative replacement policy 986 - related read-ahead adjustment? 987Status: Terminated; merged to -current 988Start Date: Sun Mar 5 2006 989End Date: Sat Sep 16 2006 990Base Tag: yamt-pdpolicy-base9 991Maintainer: YAMAMOTO Takashi <yamt@NetBSD.org> 992Scope: src/sys (src/common is tagged but not branched) 993Notes: 994 995Branch: yamt-readahead 996Description: play with file readahead 997Status: Terminated; merged to -current 998Start Date: Mon Nov 14 2005 999End Date: Wed Nov 30 2005 1000Base Tag: yamt-readahead-base3 1001Maintainer: YAMAMOTO Takashi <yamt@NetBSD.org> 1002Scope: src/sys 1003Notes: 1004 1005Branch: yamt-uio_vmspace 1006Description: uio_lwp/uio_segflg -> uio_vmspace 1007Status: Terminated; merged to -current 1008Start Date: Mon Dec 31 2005 1009End Date: Wed Mar 1 2006 1010Base Tag: yamt-uio_vmspace-base5 1011Maintainer: YAMAMOTO Takashi <yamt@NetBSD.org> 1012Scope: src/sys 1013Notes: 1014 1015Branch: yamt-vop 1016Description: remove several VOPs 1017Status: Terminated; merged to -current 1018Start Date: Wed Oct 19 2005 1019End Date: Wed Nov 2 2005 1020Base Tag: yamt-vop-base3 1021Maintainer: YAMAMOTO Takashi <yamt@NetBSD.org> 1022Scope: src/sys 1023Notes: http://mail-index.NetBSD.org/tech-kern/2005/09/27/0000.html 1024 1025Branch: gdamore-uart 1026Description: Add register table support to com driver. 1027Status: Active 1028Start Date: 14 June 2006 1029End Date: 13 July 2006 1030Base Tag: gdamore-uart-base 1031Maintainer: Garrett D'Amore <gdamore@NetBSD.org> 1032Scope: kernel 1033Notes: Results in consolidation of Alchemy (mips/dev/alchemy/aucom.c) 1034 com support, and also removes a nasty hack from Atheros com. 1035 1036 1037######################################################################## 1038# Other: 1039######################################################################## 1040 1041Branch: magnum 1042Description: ? 1043Status: ? 1044Start Date: 1045End Date: 1046Base Tag: magnum-base 1047Maintainer: ? 1048Scope: kernel 1049Notes: 1050 1051