BRANCHES revision 1.11
1# $NetBSD: BRANCHES,v 1.11 2003/08/06 06:35:31 skrll 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: ktrace-lwp 302Description: ktrace support for lwp ids. 303Status: Active 304Start Date: Wed Jul 2 15:27:30 UTC 2003 305End Date: 306Base Tag: ktrace-lwp-base 307Maintainer: Darren Reed <darrenr@netbsd.org> 308Scope: sys 309Notes: 310 311Branch: marc-pcmcia 312Description: PCMCIA support 313Status: Terminated; merged to -current 314Start Date: 315End Date: 316Base Tag: marc-pcmcia-base, marc-pcmcia-bp 317Maintainer: Marc Horowitz <marc@NetBSD.org> 318Scope: kernel 319Notes: 320 321Branch: minoura_x68k_bus_h 322Description: bus_space(9) and bus_dma(9) implementation for x68k 323Status: Terminated; merged to -current 324Start Date: 23 Dec 1998 325End Date: 16 Mar 1999 326Base Tag: minoura_x68k_bus_h-base 327Maintainer: Minoura Makoto <minoura@NetBSD.org> 328Scope: sys/arch/x68k 329Notes: 330 331Branch: minoura-xpg4dl 332Description: Citrus Project locale subsystem 333Status: Terminated; (partly) merged to -current 334Start Date: 28 March 2000 335End Date: 336Base Tag: minoura-xpg4dl-base 337Maintainer: Minoura Makoto <minoura@NetBSD.org> 338Scope: basesrc, syssrc, sharesrc 339Notes: Citrus Project is developing dynamically-loadable, codeset- 340 independent locale subsystem. Part of the implementation 341 (LC_CTYPE) called XPG4DL is now integrated to -current. 342 343Branch: mrg-vm-swap 344Description: ? 345Status: ? 346Start Date: 347End Date: 348Base Tag: ? 349Maintainer: Matthew R. Green <mrg@NetBSD.org> 350Scope: kernel 351Notes: 352 353Branch: nathanw_sa 354Description: Scheduler activations 355Status: Active 356Start Date: 5 March 2001 357End Date: 18 January 2003 358Base Tag: nathanw_sa_base 359Maintainer: Nathan Williams <nathanw@NetBSD.org> 360Scope: kernel, libc, libkvm, libpthread, libpthread_dbg, include, 361 bin/ps usr.bin/systat usr.bin/top usr.bin/w 362 gnu/dist/toolchain/gdb gnu/usr.bin/gdb 363 364Notes: The idea of scheduler activations is described in the 365 classic paper by Anderson et al., in ACM Transactions 366 a on Computer Systems volume 10 issue 1 (1992),which 367 can be found at 368 http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/ 369 Many ideas in the implementation are based on the 370 implementation of scheduler activations added to Mach 371 3.0 and described by Davis et al. in the University of 372 Washington CS tech report 92-08-93, which can be found 373 at 374 ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z 375 376 My USENIX paper on the subject can be found at 377 http://web.mit.edu/nathanw/www/usenix/ 378 379 Please consult with the maintainer before committing 380 to this branch. 381 Other tags starting with nathanw_sa reserved for 382 branch management and are not guaranteed to be stable. 383 384 Trunk tagged with "nathanw_sa_before_merge" prior to 385 merging branch down to trunk. Branch tagged with 386 "nathanw_sa_end" to indicate the ending revision of 387 the branch. 388 389Branch: newlock 390Description: New locking primitives, based on Solaris's 391Status: Active 392Start Date: March 9, 2002 393End Date: 394Base Tag: newlock-base 395Maintainer: Jason R. Thorpe <thorpej@NetBSD.org> 396Scope: Kernel 397 398Notes: The goal is to replace the existing lockmgr() and 399 simple_lock() based locking mechanisms with the 400 primitives found in Solaris: mutexes and rwlocks. 401 402Branch: perseant-lfsv2 403Description: LFS incompatible on-disk data structure changes 404Status: Terminated 405Start Date: 27 June 2001 406End Date: 16 July 2001 407Base Tag: perseant-lfsv2-base 408Maintainer: Konrad Schroder <perseant@NetBSD.org> 409Scope: basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs 410Notes: This branch should be short-lived, I expect to merge as soon 411 as the data structures required for unremove are in and tested. 412 413Branch: pkgviews 414Description: package views, enabling multiple conflicting packages to co-exist 415Status: Active 416Start Date: 22 July 2002 417End Date: 418Base Tag: pkgviews 419Maintainer: Alistair Crooks <agc@NetBSD.org> 420Scope: pkgsrc, basesrc/usr.sbin/pkg_install 421Notes: A more flexible infrastructure for third-party packages by 422 allowing multiple conflicting packages and versions to co-exist 423 within the same tree 424 425Branch: sommerfeld_i386mp_1 426Description: Multiprocessor support for i386 using Intel MP BIOS. 427Status: Terminated; merged to -current 428Start Date: 21 Feb 2000 429End Date: 01 Oct 2002 430Base Tag: sommerfeld_i386mpbase_1 431Maintainer: Bill Sommerfeld <sommerfeld@NetBSD.org> 432Scope: sys/arch/i386 433Notes: 434 Code committed to the branch has booted to multiuser 435 on at least one system. 436 437 Not guaranteed to compile against mainline since -current 438 may have changed incompatibly with the last branch update; 439 use "cvs update -D" to roll-back the rest of the tree to match. 440 441 Please get explicit permission from the maintainer 442 before each commit, or your changes will be backed out. 443 Other tags starting with sommerfeld_ are private to 444 the developer and are guaranteed to be unstable. 445 Only the maintainer should move tags. 446 447 Note that this branch uses a DIFFERENT scheme for 448 synching with the mainline. the maintainer uses some private 449 scripts for keeping them in synch; if you make commits 450 to the branch to "resynchronize" things, you'll 451 probably do it wrong; instead, ask the maintainer to 452 resynchronize things. 453 454 See sys/arch/i386/TODO on the branch for a list of known 455 issues with the branch. 456 457Branch: thorpej-devvp 458Description: replace dev_t with struct vnode * in devsw entry points 459Status: Active 460Start Date: Sep 6 2001 461End Date: 462Base Tag: thorpej-devvp-base 463Maintainer: Jason Thorpe <thorpej@NetBSD.org> 464Scope: syssrc 465Notes: Kernels built from this branch are not expected 466 to function correctly at this time. 467 468 Ports known to compile on this branch: 469 alpha 470 i386 471 472Branch: thorpej-mips-cache 473Description: overhaul MIPS cache support code 474Status: Terminated; merged to -current 475Start Date: Oct 23 2001 476End Date: Nov 14 2001 477Base Tag: thorpej-mips-cache-base 478Scope: syssrc 479Notes: This branch needs more debugging, testing, and more 480 ports need to be converted to the new world order. 481 482 The following processors have had cache ops 483 written: 484 485 * R2000/R3000 (cache_r3k) -- light testing, 486 needs to be beat on a lot more to make 487 sure it's working. 488 489 * R4000/R4400 (cache_r4k) -- mhitch@NetBSD.org 490 tracked down a bug, which has been fixed. 491 492 Confirmed working on R4000-with-L2. 493 494 Confirmed working on R4400-no-L2 and 495 R4400-with-L2. 496 497 * R4600/R5000 (cache_r5k) -- shin@NetBSD.org 498 has committed fixes to this code. 499 500 Confirmed working on R4600 v2 (SGI IP-22 with 501 no SysAD L2 cache). 502 503 Confirmed working on RM5260 (Algorithmics P-5064). 504 505 * TX39 (cache_tx39) -- uch@NetBSD.org has 506 committed fixes to this code. Awaiting 507 confirmation that it is working properly. 508 509 * R5900 (cache_r5900) -- uch@NetBSD.org has 510 written this code and tested it on a 511 PlayStation 2. 512 513 The following ports have been updated to compile (and 514 use optimized-for-processor bus_dma routines). Those 515 that have been tested and work are marked with [WORKING]. 516 517 * algor [WORKING] 518 519 * arc [WORKING] 520 521 * pmax [WORKING] 522 523 * playstation2 [WORKING] 524 Needs optimized bus_dmamap_sync(). 525 526 * hpcmips [need verification that this is working] 527 Needs optimized bus_dmamap_sync(). 528 529 * sgimips [WORKING] 530 Needs optimized bus_dmamap_sync(). 531 532 * cobalt [need testing] 533 534 * mipsco [need testing] 535 536 * newsmips [need testing] 537 538Branch: thorpej_scsipi 539Description: SCSI/ATAPI midlayer rewrite. 540Status: Terminated; merged to -current 541Start Date: 542End Date: Apr 25 2001 543Base Tag: thorpej_scsipi_base, thorpej_scsipi_nbase 544Maintainer: Manuel Bouyer <bouyer@NetBSD.org>, 545 Jason Thorpe <thorpej@NetBSD.org> 546Scope: syssrc 547Notes: When a change from -current is pulled up please move the 548 thorpej_scsipi_base tag to the revision you're syncing with. 549 thorpej_scsipi_nbase is private to maintainer (only 550 used when syncing the whole branch with HEAD). 551 Just before the merge, syssrc has been tagged with 552 thorpej_scsipi_beforemerge 553 554Branch: thorpej-signal 555Description: ? 556Status: ? 557Start Date: 558End Date: 559Base Tag: thorpej-signal-base 560Maintainer: Jason Thorpe <thorpej@NetBSD.org> 561Scope: kernel 562Notes: 563 564Branch: thorpej-setroot 565Description: ? 566Status: Terminated; merged to -current 567Start Date: 568End Date: 569Base Tag: 570Maintainer: Jason Thorpe <thorpej@NetBSD.org> 571Scope: kernel 572Notes: 573 574 575Branch: wrstuden-devbsize 576Description: Modify buffer cache to deal with different devices having 577 different block sizes. Also DEV_BSIZE would go away. 578Status: Terminated 579Start Date: Aug or Sept 1999 580End Date: 1 Apr 2000 581Base tag: wrstuden-devbsize-base 582Maintainer: Bill Studenmund <wrstuden@NetBSD.org> 583Scope: kernel 584Notes: No longer active due to lack of time, and introduction 585 of UBC. In terms of UBC, the primary cache for 586 file data is the VM cache, which needs to operate 587 in terms of VM pages. As no existing device has native 588 pages the same size as our VM pages, there already is 589 a mapping going on between the VM system and the 590 underlying blocks. So it would be easier and cleaner 591 to adjust that to deal w/ different block sizes. 592 Also with UBC, all i/o is in terms of bytes at an offset 593 with a certain length, so the exact block size isn't a big 594 deal. 595 596 Any other wrstuden-devbsize tag may (and should) go away. 597 598 599 600# Other: 601 602Branch: magnum 603Description: ? 604Status: ? 605Start Date: 606End Date: 607Base Tag: magnum-base 608Maintainer: ? 609Scope: kernel 610Notes: 611