BRANCHES revision 1.8
1# $NetBSD: BRANCHES,v 1.8 2002/12/18 05:03:34 gmcgarry 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 36# Release branches: 37 38Branch: comdex-fall-1999 39Description: Special release branch for pre-1.5 release at 40 Fall 1999 COMDEX. 41Status: Terminated 42Start Date: 43End Date: 44Base Tag: comdex-fall-1999-base 45Maintainer: ? 46Scope: Entire tree. 47Notes: 48 49Branch: netbsd-0-9 50Description: The NetBSD 0.9 release branch 51Status: Terminated 52Start Date: 53End Date: 54Base Tag: netbsd-0-9-base 55Maintainer: Release Engineering <releng@netbsd.org> 56Scope: Entire tree. 57Notes: Subsidiary tags of: netbsd-0-9-ALPHA, netbsd-0-9-ALPHA2, 58 netbsd-0-9-BETA, netbsd-0-9-RELEASE. 59 Commits restricted to release engineering. 60 61Branch: netbsd-1-0 62Description: The NetBSD 1.0 release branch 63Status: Terminated 64Start Date: 65End Date: 66Base Tag: netbsd-1-0-base 67Maintainer: Release Engineering <releng@netbsd.org> 68Scope: Entire tree. 69Notes: 70 Commits restricted to release engineering. 71 72Branch: netbsd-1-1 73Description: The NetBSD 1.1 release branch 74Status: Terminated 75Start Date: 76End Date: 77Base Tag: netbsd-1-1-base 78Maintainer: Release Engineering <releng@netbsd.org> 79Scope: Entire tree. 80Notes: 81 Commits restricted to release engineering. 82 83Branch: netbsd-1-2 84Description: The NetBSD 1.2 release branch 85Status: Terminated 86Start Date: 87End Date: 88Base Tag: netbsd-1-2-base 89Maintainer: Release Engineering <releng@netbsd.org> 90Scope: Entire tree. 91Notes: 92 Commits restricted to release engineering. 93 94Branch: netbsd-1-3 95Description: The NetBSD 1.3 release branch 96Status: Terminated 97Start Date: 98End Date: 99Base Tag: netbsd-1-3-base 100Maintainer: Release Engineering <releng@netbsd.org> 101Scope: Entire tree. 102Notes: 103 Commits restricted to release engineering. 104 105Branch: netbsd-1-4 106Description: The NetBSD 1.4 release branch 107Status: Active 108Start Date: 1 Apr 2000 109End Date: 110Base Tag: netbsd-1-4-base 111Maintainer: 1.4 Release Engineering <releng-1-4@netbsd.org> 112Scope: Entire tree. 113Notes: 114 Commits restricted to release engineering. 115 116Branch: netbsd-1-5 117Description: The NetBSD 1.5 release branch 118Status: Active 119Start Date: 20 Jun 2000 120End Date: 121Base Tag: netbsd-1-5-base 122Maintainer: 1.5 Release Engineering <releng-1-5@netbsd.org> 123Scope: Entire tree. 124Notes: 125 Commits restricted to release engineering. 126 127Branch: netbsd-1-6 128Description: The NetBSD 1.6 release branch 129Status: Active 130Start Date: 22 May 2002 131End Date: 132Base Tag: netbsd-1-6-base 133Maintainer: 1.6 Release Engineering <releng-1-6@netbsd.org> 134Scope: Entire tree. 135Notes: 136 Commits restricted to Release Engineering. 137 138 139# Individual developers' branches: 140 141 142Branch: bjh21-hydra 143Description: Simtec Hydra support and ARM SMP in general 144Status: Active 145Start Date: 18 Oct 2002 146End Date: 147Base Tag: bjh21-hydra-base 148Maintainer: Ben Harris <bjh21@netbsd.org> 149Scope: sys/arch/arm sys/arch/acorn32 150Notes: This code is on a branch because it involves changes to 151 cpuswitch.S which would otherwise make merging the 152 nathanw_sa branch difficult. This branch is expected 153 to be merged to the trunk shortly after nathanw_sa. 154 155Branch: bouyer-scsipi 156Description: Integration of atapi support 157Status: Terminated 158Start Date: 159End Date: 160Base Tag: 161Maintainer: Manuel Bouyer <bouyer@netbsd.org> 162Scope: kernel 163Notes: Superseded by thorpej_scsipi 164 165Branch: chs-ubc 166Description: ? Unified Buffer Cache 167Status: ? 168Start Date: 169End Date: 170Base Tag: chs-ubc-base 171Maintainer: Chuck Silvers <chs@netbsd.org> 172Scope: kernel 173Notes: 174 175Branch: chs-ubc2 176Description: ? Unified Buffer Cache 177Status: ? 178Start Date: 179End Date: 180Base Tag: chs-ubc2-base, chs-ubc2-newbase 181Maintainer: Chuck Silvers <chs@netbsd.org> 182Scope: kernel 183Notes: 184 185Branch: cjs-build-against-obj-dir 186Description: ? 187Status: ? 188Start Date: 189End Date: 190Base Tag: 191Maintainer: Curt Sampson <cjs@netbsd.org> 192Scope: Entire tree. 193Notes: 194 195Branch: eeh-paddr_t 196Description: ? 197Status: ? 198Start Date: 199End Date: 200Base Tag: eeh-paddr_t-base 201Maintainer: Eduardo Horvath <eeh@netbsd.org> 202Scope: kernel 203Notes: 204 205Branch: fvdl-softdep 206Description: FFS soft dependencies 207Status: ?Terminated 208Start Date: 209End Date: 210Base Tag: fvdl-softdep-base 211Maintainer: Frank van der Linden <fvdl@netbsd.org> 212Scope: kernel 213Notes: 214 215Branch: gehenna-devsw 216Description: auto-generation of devsw table 217Status: Terminated 218Start Date: 16 May 2002 219End Date: 6 Sep 2002 220Base Tag: gehenna-devsw-base 221Maintainer: MAEKAWA Masahide <gehenna@netbsd.org> 222Scope: syssrc 223Notes: The goal is to get rid of the existing device switch tables in 224 port-dependent conf.c and to generate them dynamically by 225 config(8). 226 227Branch: gmcgarry_ctxsw 228Description: Separate scheduler from context-switch code 229Status: Active 230Start Date: 18 December 2002 231End Date: 232Base Tag: gmcgarry_ctxsw_base 233Maintainer: Gregory McGarry <gmcgarry@netbsd.org> 234Scope: kernel 235Notes: Removing knowledge of the schedular and its run queues 236 from the machine-dependent context switch code is the 237 first step in cleaning up the scheduler. It is necessary 238 for the newlock branch, making the scheduler SMP friendly, 239 adding real-time scheduler extensions, and reducing the 240 number of code paths for LWP and proc switching. 241 242Branch: gmcgarry_ucred 243Description: Integrate and encapsulate user credentials 244Status: Active 245Start Date: 18 December 2002 246End Date: 247Base Tag: gmcgarry_ucred_base 248Maintainer: Gregory McGarry <gmcgarry@netbsd.org> 249Scope: kernel 250Notes: merge pcred and ucred and poolify 251 252Branch: is-newarp 253Description: ? 254Status: ? 255Start Date: 256End Date: 257Base Tag: is-newarp-base 258Maintainer: Ignatios Souvatzis <is@netbsd.org> 259Scope: kernel 260Notes: 261 262 263Branch: kame 264Description: KAME Project 265Status: Dormant 266Start Date: 28 Jun 1999 267End Date: 268Base Tag: 269Maintainer: Jun-ichiro itojun Hagino <itojun@netbsd.org> 270Scope: kernel 271Notes: http://www.kame.net 272 Used for "reference" purposes for early part of KAME 273 integration effort. The branch is not actively used, as I 274 (itojun) use patch(1) and diff(1) for the KAME syncs. 275 276Branch: kenh-if-detach 277Description: Interface detach support. 278Status: ? 279Start Date: 280End Date: 281Base Tag: kenh-if-detach-base 282Maintainer: Ken Hornstein <kenh@netbsd.org> 283Scope: kernel 284Notes: 285 286Branch: kqueue 287Description: kqueue kernel event notification mechanism (from FreeBSD) 288Status: Terminated; merged to -current 289Start Date: Tue Jul 10 23:08:38 EST 2001 290End Date: Tue Oct 24 09:14:14 GMT 2002 291Base Tag: kqueue-base 292Maintainer: Jaromir Dolecek <jdolecek@NetBSD.org> 293Scope: kernel, libc/sys, share/man/man9, usr.bin/fstat 294Notes: Integration of FreeBSD's kqueue(2) mechanism, with various 295 local internal changes to better suit NetBSD, and 296 enhancements such as looking up filters by name or 297 number, and dynamic registration of "user" filters. 298 The work is complete as is, but is awaiting more 299 feedback from various kernel gurus before going mainline. 300 301Branch: marc-pcmcia 302Description: PCMCIA support 303Status: Terminated; merged to -current 304Start Date: 305End Date: 306Base Tag: marc-pcmcia-base, marc-pcmcia-bp 307Maintainer: Marc Horowitz <marc@netbsd.org> 308Scope: kernel 309Notes: 310 311Branch: minoura_x68k_bus_h 312Description: bus_space(9) and bus_dma(9) implementation for x68k 313Status: Terminated; merged to -current 314Start Date: 23 Dec 1998 315End Date: 16 Mar 1999 316Base Tag: minoura_x68k_bus_h-base 317Maintainer: Minoura Makoto <minoura@netbsd.org> 318Scope: sys/arch/x68k 319Notes: 320 321Branch: minoura-xpg4dl 322Description: Citrus Project locale subsystem 323Status: Terminated; (partly) merged to -current 324Start Date: 28 March 2000 325End Date: 326Base Tag: minoura-xpg4dl-base 327Maintainer: Minoura Makoto <minoura@netbsd.org> 328Scope: basesrc, syssrc, sharesrc 329Notes: Citrus Project is developing dynamically-loadable, codeset- 330 independent locale subsystem. Part of the implementation 331 (LC_CTYPE) called XPG4DL is now integrated to -current. 332 333Branch: mrg-vm-swap 334Description: ? 335Status: ? 336Start Date: 337End Date: 338Base Tag: ? 339Maintainer: Matthew R. Green <mrg@netbsd.org> 340Scope: kernel 341Notes: 342 343Branch: nathanw_sa 344Description: Scheduler activations 345Status: Active 346Start Date: 5 March 2001 347End Date: 348Base Tag: nathanw_sa_base 349Maintainer: Nathan Williams <nathanw@netbsd.org> 350Scope: kernel, libc, libkvm, libpthread, libpthread_dbg, include, 351 bin/ps usr.bin/systat usr.bin/top usr.bin/w 352 gnu/dist/toolchain/gdb gnu/usr.bin/gdb 353 354Notes: The idea of scheduler activations is described in the 355 classic paper by Anderson et al., in ACM Transactions 356 a on Computer Systems volume 10 issue 1 (1992),which 357 can be found at 358 http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/ 359 Many ideas in the implementation are based on the 360 implementation of scheduler activations added to Mach 361 3.0 and described by Davis et al. in the University of 362 Washington CS tech report 92-08-93, which can be found 363 at 364 ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z 365 366 My USENIX paper on the subject can be found at 367 http://web.mit.edu/nathanw/www/usenix/ 368 369 Please consult with the maintainer before committing 370 to this branch. 371 Other tags starting with nathanw_sa reserved for 372 branch management and are not guaranteed to be stable. 373 374Branch: newlock 375Description: New locking primitives, based on Solaris's 376Status: Active 377Start Date: March 9, 2002 378End Date: 379Base Tag: newlock-base 380Maintainer: Jason R. Thorpe <thorpej@netbsd.org> 381Scope: Kernel 382 383Notes: The goal is to replace the existing lockmgr() and 384 simple_lock() based locking mechanisms with the 385 primitives found in Solaris: mutexes and rwlocks. 386 387Branch: perseant-lfsv2 388Description: LFS incompatible on-disk data structure changes 389Status: Terminated 390Start Date: 27 June 2001 391End Date: 16 July 2001 392Base Tag: perseant-lfsv2-base 393Maintainer: Konrad Schroder <perseant@netbsd.org> 394Scope: basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs 395Notes: This branch should be short-lived, I expect to merge as soon 396 as the data structures required for unremove are in and tested. 397 398Branch: pkgviews 399Description: package views, enabling multiple conflicting packages to co-exist 400Status: Active 401Start Date: 22 July 2002 402End Date: 403Base Tag: pkgviews 404Maintainer: Alistair Crooks <agc@netbsd.org> 405Scope: pkgsrc, basesrc/usr.sbin/pkg_install 406Notes: A more flexible infrastructure for third-party packages by 407 allowing multiple conflicting packages and versions to co-exist 408 within the same tree 409 410Branch: sommerfeld_i386mp_1 411Description: Multiprocessor support for i386 using Intel MP BIOS. 412Status: Terminated; merged to -current 413Start Date: 21 Feb 2000 414End Date: 01 Oct 2002 415Base Tag: sommerfeld_i386mpbase_1 416Maintainer: Bill Sommerfeld <sommerfeld@netbsd.org> 417Scope: sys/arch/i386 418Notes: 419 Code committed to the branch has booted to multiuser 420 on at least one system. 421 422 Not guaranteed to compile against mainline since -current 423 may have changed incompatibly with the last branch update; 424 use "cvs update -D" to roll-back the rest of the tree to match. 425 426 Please get explicit permission from the maintainer 427 before each commit, or your changes will be backed out. 428 Other tags starting with sommerfeld_ are private to 429 the developer and are guaranteed to be unstable. 430 Only the maintainer should move tags. 431 432 Note that this branch uses a DIFFERENT scheme for 433 synching with the mainline. the maintainer uses some private 434 scripts for keeping them in synch; if you make commits 435 to the branch to "resynchronize" things, you'll 436 probably do it wrong; instead, ask the maintainer to 437 resynchronize things. 438 439 See sys/arch/i386/TODO on the branch for a list of known 440 issues with the branch. 441 442Branch: thorpej-devvp 443Description: replace dev_t with struct vnode * in devsw entry points 444Status: Active 445Start Date: Sep 6 2001 446End Date: 447Base Tag: thorpej-devvp-base 448Maintainer: Jason Thorpe <thorpej@netbsd.org> 449Scope: syssrc 450Notes: Kernels built from this branch are not expected 451 to function correctly at this time. 452 453 Ports known to compile on this branch: 454 alpha 455 i386 456 457Branch: thorpej-mips-cache 458Description: overhaul MIPS cache support code 459Status: Terminated; merged to -current 460Start Date: Oct 23 2001 461End Date: Nov 14 2001 462Base Tag: thorpej-mips-cache-base 463Scope: syssrc 464Notes: This branch needs more debugging, testing, and more 465 ports need to be converted to the new world order. 466 467 The following processors have had cache ops 468 written: 469 470 * R2000/R3000 (cache_r3k) -- light testing, 471 needs to be beat on a lot more to make 472 sure it's working. 473 474 * R4000/R4400 (cache_r4k) -- mhitch@netbsd.org 475 tracked down a bug, which has been fixed. 476 477 Confirmed working on R4000-with-L2. 478 479 Confirmed working on R4400-no-L2 and 480 R4400-with-L2. 481 482 * R4600/R5000 (cache_r5k) -- shin@netbsd.org 483 has committed fixes to this code. 484 485 Confirmed working on R4600 v2 (SGI IP-22 with 486 no SysAD L2 cache). 487 488 Confirmed working on RM5260 (Algorithmics P-5064). 489 490 * TX39 (cache_tx39) -- uch@netbsd.org has 491 committed fixes to this code. Awaiting 492 confirmation that it is working properly. 493 494 * R5900 (cache_r5900) -- uch@netbsd.org has 495 written this code and tested it on a 496 PlayStation 2. 497 498 The following ports have been updated to compile (and 499 use optimized-for-processor bus_dma routines). Those 500 that have been tested and work are marked with [WORKING]. 501 502 * algor [WORKING] 503 504 * arc [WORKING] 505 506 * pmax [WORKING] 507 508 * playstation2 [WORKING] 509 Needs optimized bus_dmamap_sync(). 510 511 * hpcmips [need verification that this is working] 512 Needs optimized bus_dmamap_sync(). 513 514 * sgimips [WORKING] 515 Needs optimized bus_dmamap_sync(). 516 517 * cobalt [need testing] 518 519 * mipsco [need testing] 520 521 * newsmips [need testing] 522 523Branch: thorpej_scsipi 524Description: SCSI/ATAPI midlayer rewrite. 525Status: Terminated; merged to -current 526Start Date: 527End Date: Apr 25 2001 528Base Tag: thorpej_scsipi_base, thorpej_scsipi_nbase 529Maintainer: Manuel Bouyer <bouyer@netbsd.org>, 530 Jason Thorpe <thorpej@netbsd.org> 531Scope: syssrc 532Notes: When a change from -current is pulled up please move the 533 thorpej_scsipi_base tag to the revision you're syncing with. 534 thorpej_scsipi_nbase is private to maintainer (only 535 used when syncing the whole branch with HEAD). 536 Just before the merge, syssrc has been tagged with 537 thorpej_scsipi_beforemerge 538 539Branch: thorpej-signal 540Description: ? 541Status: ? 542Start Date: 543End Date: 544Base Tag: thorpej-signal-base 545Maintainer: Jason Thorpe <thorpej@netbsd.org> 546Scope: kernel 547Notes: 548 549Branch: thorpej-setroot 550Description: ? 551Status: Terminated; merged to -current 552Start Date: 553End Date: 554Base Tag: 555Maintainer: Jason Thorpe <thorpej@netbsd.org> 556Scope: kernel 557Notes: 558 559 560Branch: wrstuden-devbsize 561Description: Modify buffer cache to deal with different devices having 562 different block sizes. Also DEV_BSIZE would go away. 563Status: Terminated 564Start Date: Aug or Sept 1999 565End Date: 1 Apr 2000 566Base tag: wrstuden-devbsize-base 567Maintainer: Bill Studenmund <wrstuden@netbsd.org> 568Scope: kernel 569Notes: No longer active due to lack of time, and introduction 570 of UBC. In terms of UBC, the primary cache for 571 file data is the VM cache, which needs to operate 572 in terms of VM pages. As no existing device has native 573 pages the same size as our VM pages, there already is 574 a mapping going on between the VM system and the 575 underlying blocks. So it would be easier and cleaner 576 to adjust that to deal w/ different block sizes. 577 Also with UBC, all i/o is in terms of bytes at an offset 578 with a certain length, so the exact block size isn't a big 579 deal. 580 581 Any other wrstuden-devbsize tag may (and should) go away. 582 583 584 585# Other: 586 587Branch: magnum 588Description: ? 589Status: ? 590Start Date: 591End Date: 592Base Tag: magnum-base 593Maintainer: ? 594Scope: kernel 595Notes: 596