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