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