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