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