Home | History | Annotate | Line # | Download | only in doc
BRANCHES revision 1.36
      1  1.36       jmc #	$NetBSD: BRANCHES,v 1.36 2005/03/17 00:21:04 jmc Exp $
      2   1.1     lukem #
      3   1.1     lukem # This file contains a list of branches that exist in the NetBSD CVS
      4   1.1     lukem # tree and their current state.
      5   1.1     lukem #
      6   1.1     lukem # This list is necessarily incomplete.
      7   1.1     lukem # 
      8   1.1     lukem # Within reason, developers may create branch and version tags at any
      9   1.1     lukem # time for any purpose.  To avoid name collisions, private tags should
     10   1.1     lukem # have names which begin with the developer's NetBSD login name
     11   1.1     lukem # followed by a - or _ character (e.g., thorpej_scsipi,
     12   1.1     lukem # thorpej-signal)
     13   1.1     lukem # 
     14   1.1     lukem # Any branch or version tag not listed here should be assumed to be
     15   1.1     lukem # private to the developer who created it.  It is inappropriate for
     16   1.1     lukem # anyone other than that developer to commit, move tags, or otherwise
     17   1.1     lukem # modify the contents of the branch.
     18   1.1     lukem #
     19   1.1     lukem # Please update this file when a new branch is ready for consumption
     20   1.1     lukem # by folks other than the maintainer, or when the use or status of an
     21   1.1     lukem # existing branch changes significantly.
     22   1.1     lukem #
     23   1.1     lukem # Format:
     24   1.1     lukem #   Branch:	  name of branch
     25   1.1     lukem #   Description:  Purpose and intention of the branch
     26   1.1     lukem #   Status:	  Active/Terminated/Dormant
     27   1.1     lukem #   Start Date:	  date first instantiated
     28   1.1     lukem #   End Date:	  date it was Terminated/made_Dormant, if any
     29   1.1     lukem #   Base Tag:	  netbsd-1-5-base, etc.
     30   1.1     lukem #   Maintainer:	  Somebody to blame.
     31   1.1     lukem #   Scope:	  Portion of the tree covered.
     32   1.1     lukem #   Notes:	  Various other info, perhaps explanation of special tags,
     33   1.1     lukem #		  who-may-commit policies, etc.
     34   1.1     lukem 
     35   1.1     lukem 
     36   1.1     lukem # Release branches:
     37   1.1     lukem 
     38   1.1     lukem Branch:		comdex-fall-1999
     39   1.1     lukem Description:	Special release branch for pre-1.5 release at
     40   1.1     lukem 		Fall 1999 COMDEX.
     41   1.1     lukem Status:		Terminated
     42   1.1     lukem Start Date:
     43   1.1     lukem End Date:
     44   1.1     lukem Base Tag:	comdex-fall-1999-base
     45   1.1     lukem Maintainer:	?
     46   1.1     lukem Scope:		Entire tree.
     47   1.1     lukem Notes:
     48   1.1     lukem 
     49   1.1     lukem Branch:		netbsd-0-9
     50   1.1     lukem Description:	The NetBSD 0.9 release branch
     51   1.1     lukem Status:		Terminated
     52   1.1     lukem Start Date:
     53   1.1     lukem End Date:
     54   1.1     lukem Base Tag:	netbsd-0-9-base
     55  1.10      salo Maintainer:	Release Engineering <releng (a] NetBSD.org>
     56   1.1     lukem Scope:		Entire tree.
     57   1.1     lukem Notes:		Subsidiary tags of: netbsd-0-9-ALPHA, netbsd-0-9-ALPHA2,
     58   1.1     lukem 		netbsd-0-9-BETA, netbsd-0-9-RELEASE.
     59   1.1     lukem 		Commits restricted to release engineering.
     60   1.1     lukem 
     61   1.1     lukem Branch:		netbsd-1-0
     62   1.1     lukem Description:	The NetBSD 1.0 release branch
     63   1.1     lukem Status:		Terminated
     64   1.1     lukem Start Date:
     65   1.1     lukem End Date:
     66   1.1     lukem Base Tag:	netbsd-1-0-base
     67  1.10      salo Maintainer:	Release Engineering <releng (a] NetBSD.org>
     68   1.1     lukem Scope:		Entire tree.
     69   1.1     lukem Notes:
     70   1.1     lukem 		Commits restricted to release engineering.
     71   1.1     lukem 
     72   1.1     lukem Branch:		netbsd-1-1
     73   1.1     lukem Description:	The NetBSD 1.1 release branch
     74   1.1     lukem Status:		Terminated
     75   1.1     lukem Start Date:
     76   1.1     lukem End Date:
     77   1.1     lukem Base Tag:	netbsd-1-1-base
     78  1.10      salo Maintainer:	Release Engineering <releng (a] NetBSD.org>
     79   1.1     lukem Scope:		Entire tree.
     80   1.1     lukem Notes:
     81   1.1     lukem 		Commits restricted to release engineering.
     82   1.1     lukem 
     83   1.1     lukem Branch:		netbsd-1-2
     84   1.1     lukem Description:	The NetBSD 1.2 release branch
     85   1.1     lukem Status:		Terminated
     86   1.1     lukem Start Date:
     87   1.1     lukem End Date:
     88   1.1     lukem Base Tag:	netbsd-1-2-base
     89  1.10      salo Maintainer:	Release Engineering <releng (a] NetBSD.org>
     90   1.1     lukem Scope:		Entire tree.
     91   1.1     lukem Notes:
     92   1.1     lukem 		Commits restricted to release engineering.
     93   1.1     lukem 
     94   1.1     lukem Branch:		netbsd-1-3
     95   1.1     lukem Description:	The NetBSD 1.3 release branch
     96   1.1     lukem Status:		Terminated
     97   1.1     lukem Start Date:
     98   1.1     lukem End Date:
     99   1.1     lukem Base Tag:	netbsd-1-3-base
    100  1.10      salo Maintainer:	Release Engineering <releng (a] NetBSD.org>
    101   1.1     lukem Scope:		Entire tree.
    102   1.1     lukem Notes:
    103   1.1     lukem 		Commits restricted to release engineering.
    104   1.1     lukem 
    105   1.1     lukem Branch:		netbsd-1-4
    106   1.1     lukem Description:	The NetBSD 1.4 release branch
    107  1.13       jmc Status:		Terminated
    108   1.1     lukem Start Date:	1 Apr 2000
    109   1.1     lukem End Date:
    110   1.1     lukem Base Tag:	netbsd-1-4-base
    111  1.10      salo Maintainer:	1.4 Release Engineering <releng-1-4 (a] NetBSD.org>
    112   1.1     lukem Scope:		Entire tree.
    113   1.1     lukem Notes:
    114   1.1     lukem 		Commits restricted to release engineering.
    115   1.1     lukem 
    116   1.1     lukem Branch:		netbsd-1-5
    117   1.1     lukem Description:	The NetBSD 1.5 release branch
    118   1.1     lukem Status:		Active
    119   1.1     lukem Start Date:	20 Jun 2000
    120   1.1     lukem End Date:
    121   1.1     lukem Base Tag:	netbsd-1-5-base
    122  1.10      salo Maintainer:	1.5 Release Engineering <releng-1-5 (a] NetBSD.org>
    123   1.1     lukem Scope:		Entire tree.
    124   1.1     lukem Notes:
    125   1.1     lukem 		Commits restricted to release engineering.
    126   1.6     lukem 
    127   1.6     lukem Branch:		netbsd-1-6
    128   1.6     lukem Description:	The NetBSD 1.6 release branch
    129   1.6     lukem Status:		Active
    130   1.7     lukem Start Date:	22 May 2002
    131   1.6     lukem End Date:
    132   1.6     lukem Base Tag:	netbsd-1-6-base
    133  1.10      salo Maintainer:	1.6 Release Engineering <releng-1-6 (a] NetBSD.org>
    134   1.6     lukem Scope:		Entire tree.
    135   1.6     lukem Notes:
    136   1.6     lukem 		Commits restricted to Release Engineering.
    137   1.1     lukem 
    138  1.13       jmc Branch:		netbsd-2-0
    139  1.13       jmc Description:	The NetBSD 2.0 release branch
    140  1.13       jmc Status:		Active
    141  1.13       jmc Start Date:	28 Mar 2004
    142  1.13       jmc End Date:
    143  1.13       jmc Base Tag:	netbsd-2-0-base
    144  1.13       jmc Maintainer:	2.0 Release Engineering <releng-2-0 (a] NetBSD.org>
    145  1.13       jmc Scope:		Entire tree. (src + xsrc)
    146  1.13       jmc Notes:
    147  1.13       jmc 		Commits restricted to Release Engineering.
    148  1.13       jmc 
    149  1.36       jmc Branch:		netbsd-3
    150  1.36       jmc Description:	The NetBSD 3 release branch
    151  1.36       jmc Status:		Active
    152  1.36       jmc Start Date:	16 Mar 2005
    153  1.36       jmc End Date:
    154  1.36       jmc Base Tag:	netbsd-3-base
    155  1.36       jmc Maintainer:	3.0 Release Engineering <releng-3 (a] NetBSD.org>
    156  1.36       jmc Scope:		Entire tree. (src + xsrc)
    157  1.36       jmc Notes:
    158  1.36       jmc 		Commits restricted to Release Engineering.
    159   1.1     lukem 
    160   1.1     lukem # Individual developers' branches:
    161   1.1     lukem 
    162   1.4     bjh21 
    163   1.4     bjh21 Branch:		bjh21-hydra
    164   1.4     bjh21 Description:	Simtec Hydra support and ARM SMP in general
    165   1.4     bjh21 Status:		Active
    166   1.4     bjh21 Start Date:	18 Oct 2002
    167   1.4     bjh21 End Date:
    168   1.4     bjh21 Base Tag:	bjh21-hydra-base
    169  1.10      salo Maintainer:	Ben Harris <bjh21 (a] NetBSD.org>
    170   1.4     bjh21 Scope:		sys/arch/arm sys/arch/acorn32
    171   1.4     bjh21 Notes:		This code is on a branch because it involves changes to
    172   1.4     bjh21 		cpuswitch.S which would otherwise make merging the
    173   1.4     bjh21 		nathanw_sa branch difficult.  This branch is expected
    174   1.4     bjh21 		to be merged to the trunk shortly after nathanw_sa.
    175   1.1     lukem 
    176   1.1     lukem Branch:		bouyer-scsipi
    177   1.1     lukem Description:	Integration of atapi support
    178   1.1     lukem Status:		Terminated
    179   1.1     lukem Start Date:
    180   1.1     lukem End Date:
    181   1.1     lukem Base Tag:
    182  1.10      salo Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    183   1.1     lukem Scope:		kernel
    184   1.1     lukem Notes:		Superseded by thorpej_scsipi
    185   1.1     lukem 
    186   1.1     lukem Branch:		chs-ubc
    187   1.1     lukem Description:	? Unified Buffer Cache
    188   1.1     lukem Status:		?
    189   1.1     lukem Start Date:
    190   1.1     lukem End Date:
    191   1.1     lukem Base Tag:	chs-ubc-base
    192  1.10      salo Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    193   1.1     lukem Scope:		kernel
    194   1.1     lukem Notes:
    195   1.1     lukem 
    196   1.1     lukem Branch:		chs-ubc2
    197   1.1     lukem Description:	? Unified Buffer Cache
    198   1.1     lukem Status:		?
    199   1.1     lukem Start Date:
    200   1.1     lukem End Date:
    201   1.1     lukem Base Tag:	chs-ubc2-base, chs-ubc2-newbase
    202  1.10      salo Maintainer:	Chuck Silvers <chs (a] NetBSD.org>
    203   1.1     lukem Scope:		kernel
    204   1.1     lukem Notes:
    205   1.1     lukem 
    206   1.1     lukem Branch:		cjs-build-against-obj-dir
    207   1.1     lukem Description:	?
    208   1.1     lukem Status:		?
    209   1.1     lukem Start Date:
    210   1.1     lukem End Date:
    211   1.1     lukem Base Tag:
    212  1.10      salo Maintainer:	Curt Sampson <cjs (a] NetBSD.org>
    213   1.1     lukem Scope:		Entire tree.
    214   1.1     lukem Notes:
    215   1.1     lukem 
    216   1.1     lukem Branch:		eeh-paddr_t
    217   1.1     lukem Description:	?
    218   1.1     lukem Status:		?
    219   1.1     lukem Start Date:
    220   1.1     lukem End Date:
    221   1.1     lukem Base Tag:	eeh-paddr_t-base
    222  1.10      salo Maintainer:	Eduardo Horvath <eeh (a] NetBSD.org>
    223   1.1     lukem Scope:		kernel
    224   1.1     lukem Notes:
    225   1.1     lukem 
    226   1.1     lukem Branch:		fvdl-softdep
    227   1.1     lukem Description:	FFS soft dependencies
    228   1.1     lukem Status:		?Terminated
    229   1.1     lukem Start Date:
    230   1.1     lukem End Date:
    231   1.1     lukem Base Tag:	fvdl-softdep-base
    232  1.10      salo Maintainer:	Frank van der Linden <fvdl (a] NetBSD.org>
    233   1.1     lukem Scope:		kernel
    234   1.1     lukem Notes:
    235   1.1     lukem 
    236   1.1     lukem Branch:		gehenna-devsw
    237   1.1     lukem Description:	auto-generation of devsw table
    238   1.1     lukem Status:		Terminated
    239   1.1     lukem Start Date:	16 May 2002
    240   1.1     lukem End Date:	6 Sep 2002
    241   1.1     lukem Base Tag:	gehenna-devsw-base
    242  1.10      salo Maintainer:	MAEKAWA Masahide <gehenna (a] NetBSD.org>
    243   1.1     lukem Scope:		syssrc
    244   1.1     lukem Notes:		The goal is to get rid of the existing device switch tables in
    245   1.1     lukem 		port-dependent conf.c and to generate them dynamically by
    246   1.1     lukem 		config(8).
    247   1.8  gmcgarry 
    248   1.8  gmcgarry Branch:		gmcgarry_ctxsw
    249   1.8  gmcgarry Description:	Separate scheduler from context-switch code
    250   1.8  gmcgarry Status:		Active
    251   1.8  gmcgarry Start Date:	18 December 2002
    252   1.8  gmcgarry End Date:
    253   1.8  gmcgarry Base Tag:	gmcgarry_ctxsw_base
    254  1.10      salo Maintainer:	Gregory McGarry <gmcgarry (a] NetBSD.org>
    255   1.8  gmcgarry Scope:		kernel
    256   1.8  gmcgarry Notes:		Removing knowledge of the schedular and its run queues
    257   1.8  gmcgarry 		from the machine-dependent context switch code is the
    258   1.8  gmcgarry 		first step in cleaning up the scheduler.  It is necessary
    259   1.8  gmcgarry 		for the newlock branch, making the scheduler SMP friendly,
    260   1.8  gmcgarry 		adding real-time scheduler extensions, and reducing the
    261   1.8  gmcgarry 		number of code paths for LWP and proc switching.
    262   1.8  gmcgarry 
    263   1.8  gmcgarry Branch:		gmcgarry_ucred
    264   1.8  gmcgarry Description:	Integrate and encapsulate user credentials
    265   1.8  gmcgarry Status:		Active
    266   1.8  gmcgarry Start Date:	18 December 2002
    267   1.8  gmcgarry End Date:
    268   1.8  gmcgarry Base Tag:	gmcgarry_ucred_base
    269  1.10      salo Maintainer:	Gregory McGarry <gmcgarry (a] NetBSD.org>
    270   1.8  gmcgarry Scope:		kernel
    271   1.8  gmcgarry Notes:		merge pcred and ucred and poolify
    272   1.1     lukem 
    273   1.1     lukem Branch:		is-newarp
    274  1.23        is Description:	ARP for non-Ethernet
    275  1.23        is Status:		Terminated; merged before NetBSD 1.3
    276  1.23        is Start Date:	1996/10/13
    277  1.23        is End Date:	1997/03/15
    278   1.1     lukem Base Tag:	is-newarp-base
    279  1.10      salo Maintainer:	Ignatios Souvatzis <is (a] NetBSD.org>
    280   1.1     lukem Scope:		kernel
    281   1.1     lukem Notes:
    282   1.1     lukem 
    283   1.1     lukem 
    284   1.1     lukem Branch:		kame
    285   1.1     lukem Description:	KAME Project
    286   1.1     lukem Status:		Dormant
    287   1.1     lukem Start Date:	28 Jun 1999
    288   1.1     lukem End Date:
    289   1.1     lukem Base Tag:
    290  1.10      salo Maintainer:	Jun-ichiro itojun Hagino <itojun (a] NetBSD.org>
    291   1.1     lukem Scope:		kernel
    292   1.1     lukem Notes:		http://www.kame.net
    293   1.1     lukem 		Used for "reference" purposes for early part of KAME
    294   1.1     lukem 		integration effort.  The branch is not actively used, as I
    295   1.1     lukem 		(itojun) use patch(1) and diff(1) for the KAME syncs.
    296   1.1     lukem 
    297   1.1     lukem Branch:		kenh-if-detach
    298   1.1     lukem Description:	Interface detach support.
    299   1.1     lukem Status:		?
    300   1.1     lukem Start Date:
    301   1.1     lukem End Date:
    302   1.1     lukem Base Tag:	kenh-if-detach-base
    303  1.10      salo Maintainer:	Ken Hornstein <kenh (a] NetBSD.org>
    304   1.1     lukem Scope:		kernel
    305   1.1     lukem Notes:
    306   1.1     lukem 
    307  1.16      kent Branch:		kent-audio1
    308  1.16      kent Description:	Audio converter pipeline
    309  1.18      kent Status:		Terminated; merged to -current
    310  1.16      kent Start Date:	Tue Dec  7 2004
    311  1.17      kent End Date:	Tue Jan 11 2005
    312  1.17      kent Base Tag:	kent-audio1-base
    313  1.17      kent Maintainer:	TAMURA Kent <kent (a] NetBSD.org>
    314  1.17      kent Scope:		kernel (audio device drivers)
    315  1.17      kent Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
    316  1.17      kent 		Please consult with the maintainer before committing
    317  1.17      kent 		to this branch.
    318  1.17      kent 
    319  1.17      kent Branch:		kent-audio2
    320  1.17      kent Description:	In-kernel audio mixer
    321  1.17      kent Status:		Active
    322  1.17      kent Start Date:	Sun Jan 16 2005
    323  1.16      kent End Date:	
    324  1.17      kent Base Tag:	kent-audio2-base
    325  1.16      kent Maintainer:	TAMURA Kent <kent (a] NetBSD.org>
    326  1.16      kent Scope:		kernel (audio device drivers)
    327  1.16      kent Notes:		http://mail-index.netbsd.org/tech-kern/2004/12/03/0007.html
    328  1.16      kent 		Please consult with the maintainer before committing
    329  1.16      kent 		to this branch.
    330  1.16      kent 
    331   1.1     lukem Branch:		kqueue
    332   1.1     lukem Description:	kqueue kernel event notification mechanism (from FreeBSD)
    333   1.5  jdolecek Status:		Terminated; merged to -current
    334   1.1     lukem Start Date:	Tue Jul 10 23:08:38 EST 2001
    335   1.5  jdolecek End Date:	Tue Oct 24 09:14:14 GMT 2002
    336   1.1     lukem Base Tag:	kqueue-base
    337   1.1     lukem Maintainer:	Jaromir Dolecek <jdolecek (a] NetBSD.org>
    338   1.1     lukem Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
    339   1.1     lukem Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
    340   1.1     lukem 		local internal changes to better suit NetBSD, and
    341   1.1     lukem 		enhancements such as looking up filters by name or
    342   1.1     lukem 		number, and dynamic registration of "user" filters.
    343   1.1     lukem 		The work is complete as is, but is awaiting more
    344   1.1     lukem 		feedback from various kernel gurus before going mainline.
    345  1.11     skrll 
    346  1.11     skrll Branch:		ktrace-lwp
    347  1.11     skrll Description:	ktrace support for lwp ids.
    348  1.11     skrll Status:		Active
    349  1.11     skrll Start Date:	Wed Jul  2 15:27:30 UTC 2003
    350  1.11     skrll End Date:	
    351  1.11     skrll Base Tag:	ktrace-lwp-base
    352  1.12     grant Maintainer:	Darren Reed <darrenr (a] NetBSD.org>
    353  1.11     skrll Scope:		sys
    354  1.11     skrll Notes:		
    355   1.1     lukem 
    356   1.1     lukem Branch:		marc-pcmcia
    357   1.1     lukem Description:	PCMCIA support
    358   1.1     lukem Status:		Terminated; merged to -current
    359   1.1     lukem Start Date:
    360   1.1     lukem End Date:
    361   1.1     lukem Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
    362  1.10      salo Maintainer:	Marc Horowitz <marc (a] NetBSD.org>
    363   1.1     lukem Scope:		kernel
    364   1.1     lukem Notes:
    365   1.1     lukem 
    366   1.1     lukem Branch:		minoura_x68k_bus_h
    367   1.1     lukem Description:	bus_space(9) and bus_dma(9) implementation for x68k
    368   1.1     lukem Status:		Terminated; merged to -current
    369   1.1     lukem Start Date:	23 Dec 1998
    370   1.1     lukem End Date:	16 Mar 1999
    371   1.1     lukem Base Tag:	minoura_x68k_bus_h-base
    372  1.10      salo Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    373   1.1     lukem Scope:		sys/arch/x68k
    374   1.1     lukem Notes:
    375   1.1     lukem 
    376   1.1     lukem Branch:		minoura-xpg4dl
    377   1.1     lukem Description:	Citrus Project locale subsystem
    378   1.1     lukem Status:		Terminated; (partly) merged to -current
    379   1.1     lukem Start Date:	28 March 2000
    380   1.1     lukem End Date:
    381   1.1     lukem Base Tag:	minoura-xpg4dl-base
    382  1.10      salo Maintainer:	Minoura Makoto <minoura (a] NetBSD.org>
    383   1.1     lukem Scope:		basesrc, syssrc, sharesrc
    384   1.1     lukem Notes:		Citrus Project is developing dynamically-loadable, codeset-
    385   1.1     lukem 		independent locale subsystem.  Part of the implementation
    386   1.1     lukem 		(LC_CTYPE) called XPG4DL is now integrated to -current.
    387   1.1     lukem 
    388   1.1     lukem Branch:		mrg-vm-swap
    389   1.1     lukem Description:	?
    390   1.1     lukem Status:		?
    391   1.1     lukem Start Date:
    392   1.1     lukem End Date:
    393   1.1     lukem Base Tag:	?
    394  1.10      salo Maintainer:	Matthew R. Green <mrg (a] NetBSD.org>
    395   1.1     lukem Scope:		kernel
    396   1.1     lukem Notes:
    397   1.1     lukem 
    398   1.1     lukem Branch:		nathanw_sa
    399   1.1     lukem Description:	Scheduler activations
    400   1.1     lukem Status:		Active
    401   1.1     lukem Start Date:	5 March 2001
    402   1.9   thorpej End Date:	18 January 2003
    403   1.1     lukem Base Tag:	nathanw_sa_base
    404  1.10      salo Maintainer:	Nathan Williams <nathanw (a] NetBSD.org>
    405   1.1     lukem Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
    406   1.1     lukem 		bin/ps usr.bin/systat usr.bin/top usr.bin/w
    407   1.1     lukem 		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
    408   1.1     lukem 
    409   1.1     lukem Notes:		The idea of scheduler activations is described in the
    410   1.1     lukem 		classic paper by Anderson et al., in ACM Transactions
    411   1.1     lukem 		a on Computer Systems volume 10 issue 1 (1992),which
    412   1.1     lukem 		can be found at
    413   1.1     lukem 		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
    414   1.1     lukem 		Many ideas in the implementation are based on the
    415   1.1     lukem 		implementation of scheduler activations added to Mach
    416   1.1     lukem 		3.0 and described by Davis et al. in the University of
    417   1.1     lukem 		Washington CS tech report 92-08-93, which can be found
    418   1.1     lukem 		at
    419   1.1     lukem 		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
    420   1.1     lukem 
    421   1.1     lukem 		My USENIX paper on the subject can be found at
    422   1.1     lukem 		http://web.mit.edu/nathanw/www/usenix/
    423   1.1     lukem 
    424   1.1     lukem 		Please consult with the maintainer before committing
    425   1.1     lukem 		to this branch.
    426   1.1     lukem 		Other tags starting with nathanw_sa reserved for
    427   1.1     lukem 		branch management and are not guaranteed to be stable.
    428   1.9   thorpej 
    429   1.9   thorpej 		Trunk tagged with "nathanw_sa_before_merge" prior to
    430   1.9   thorpej 		merging branch down to trunk.  Branch tagged with
    431   1.9   thorpej 		"nathanw_sa_end" to indicate the ending revision of
    432   1.9   thorpej 		the branch.
    433   1.1     lukem 
    434   1.1     lukem Branch:		newlock
    435   1.1     lukem Description:	New locking primitives, based on Solaris's
    436   1.1     lukem Status:		Active
    437   1.1     lukem Start Date:	March 9, 2002
    438   1.1     lukem End Date:
    439   1.1     lukem Base Tag:	newlock-base
    440  1.10      salo Maintainer:	Jason R. Thorpe <thorpej (a] NetBSD.org>
    441   1.1     lukem Scope:		Kernel
    442   1.1     lukem 
    443   1.1     lukem Notes:		The goal is to replace the existing lockmgr() and
    444   1.1     lukem 		simple_lock() based locking mechanisms with the
    445   1.1     lukem 		primitives found in Solaris: mutexes and rwlocks.
    446   1.1     lukem 
    447   1.1     lukem Branch:		perseant-lfsv2
    448   1.1     lukem Description:	LFS incompatible on-disk data structure changes
    449   1.1     lukem Status:		Terminated
    450   1.1     lukem Start Date:	27 June 2001
    451   1.1     lukem End Date:	16 July 2001
    452   1.1     lukem Base Tag:	perseant-lfsv2-base
    453  1.10      salo Maintainer:	Konrad Schroder <perseant (a] NetBSD.org>
    454   1.1     lukem Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
    455   1.1     lukem Notes:		This branch should be short-lived, I expect to merge as soon
    456   1.1     lukem 		as the data structures required for unremove are in and tested.
    457   1.1     lukem 
    458   1.1     lukem Branch:	  	pkgviews
    459   1.1     lukem Description:  	package views, enabling multiple conflicting packages to co-exist
    460   1.1     lukem Status:		Active
    461   1.1     lukem Start Date:	22 July 2002
    462   1.1     lukem End Date:
    463   1.1     lukem Base Tag:	pkgviews
    464  1.10      salo Maintainer:	Alistair Crooks <agc (a] NetBSD.org>
    465   1.1     lukem Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
    466   1.1     lukem Notes:		A more flexible infrastructure for third-party packages by
    467   1.1     lukem 		allowing multiple conflicting packages and versions to co-exist
    468   1.1     lukem 		within the same tree
    469   1.1     lukem 
    470   1.1     lukem Branch:		sommerfeld_i386mp_1
    471   1.1     lukem Description:	Multiprocessor support for i386 using Intel MP BIOS.
    472   1.3  sommerfe Status:		Terminated; merged to -current
    473   1.1     lukem Start Date:	21 Feb 2000
    474   1.2      fvdl End Date:	01 Oct 2002
    475   1.1     lukem Base Tag:	sommerfeld_i386mpbase_1
    476  1.10      salo Maintainer:	Bill Sommerfeld <sommerfeld (a] NetBSD.org>
    477   1.1     lukem Scope:		sys/arch/i386
    478   1.1     lukem Notes:
    479   1.1     lukem 		Code committed to the branch has booted to multiuser 
    480   1.1     lukem 		on at least one system.
    481   1.1     lukem 
    482   1.1     lukem 		Not guaranteed to compile against mainline since -current
    483   1.1     lukem 		may have changed incompatibly with the last branch update;
    484   1.1     lukem 		use "cvs update -D" to roll-back the rest of the tree to match.
    485   1.1     lukem 
    486   1.1     lukem 		Please get explicit permission from the maintainer 
    487   1.1     lukem 		before each commit, or your changes will be backed out.
    488   1.1     lukem 		Other tags starting with sommerfeld_ are private to 
    489   1.1     lukem 		the developer and are guaranteed to be unstable.
    490   1.1     lukem 		Only the maintainer should move tags.
    491   1.1     lukem 
    492   1.1     lukem 		Note that this branch uses a DIFFERENT scheme for 
    493   1.1     lukem 		synching with the mainline.  the maintainer uses some private
    494   1.1     lukem 		scripts for keeping them in synch; if you make commits 
    495   1.1     lukem 		to the branch to "resynchronize" things, you'll
    496   1.1     lukem 		probably do it wrong; instead, ask the maintainer to
    497   1.1     lukem 		resynchronize things.
    498   1.1     lukem 
    499   1.1     lukem 		See sys/arch/i386/TODO on the branch for a list of known
    500   1.1     lukem 		issues with the branch.
    501   1.1     lukem 
    502   1.1     lukem Branch:		thorpej-devvp
    503   1.1     lukem Description:	replace dev_t with struct vnode * in devsw entry points
    504   1.1     lukem Status:		Active
    505   1.1     lukem Start Date:	Sep 6 2001
    506   1.1     lukem End Date:
    507   1.1     lukem Base Tag:	thorpej-devvp-base
    508  1.10      salo Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
    509   1.1     lukem Scope:		syssrc
    510   1.1     lukem Notes:		Kernels built from this branch are not expected
    511   1.1     lukem 		to function correctly at this time.
    512   1.1     lukem 
    513   1.1     lukem 		Ports known to compile on this branch:
    514   1.1     lukem 			alpha
    515   1.1     lukem 			i386
    516   1.1     lukem 
    517   1.1     lukem Branch:		thorpej-mips-cache
    518   1.1     lukem Description:	overhaul MIPS cache support code
    519   1.1     lukem Status:		Terminated; merged to -current
    520   1.1     lukem Start Date:	Oct 23 2001
    521   1.1     lukem End Date:	Nov 14 2001
    522   1.1     lukem Base Tag:	thorpej-mips-cache-base
    523   1.1     lukem Scope:		syssrc
    524   1.1     lukem Notes:		This branch needs more debugging, testing, and more
    525   1.1     lukem 		ports need to be converted to the new world order.
    526   1.1     lukem 
    527   1.1     lukem 		The following processors have had cache ops
    528   1.1     lukem 		written:
    529   1.1     lukem 
    530   1.1     lukem 			* R2000/R3000 (cache_r3k) -- light testing,
    531   1.1     lukem 			  needs to be beat on a lot more to make
    532   1.1     lukem 			  sure it's working.
    533   1.1     lukem 
    534  1.10      salo 			* R4000/R4400 (cache_r4k) -- mhitch (a] NetBSD.org
    535   1.1     lukem 			  tracked down a bug, which has been fixed.
    536   1.1     lukem 
    537   1.1     lukem 			  Confirmed working on R4000-with-L2.
    538   1.1     lukem 
    539   1.1     lukem 			  Confirmed working on R4400-no-L2 and
    540   1.1     lukem 			  R4400-with-L2.
    541   1.1     lukem 
    542  1.10      salo 			* R4600/R5000 (cache_r5k) -- shin (a] NetBSD.org
    543   1.1     lukem 			  has committed fixes to this code.
    544   1.1     lukem 
    545   1.1     lukem 			  Confirmed working on R4600 v2 (SGI IP-22 with
    546   1.1     lukem 			  no SysAD L2 cache).
    547   1.1     lukem 
    548   1.1     lukem 			  Confirmed working on RM5260 (Algorithmics P-5064).
    549   1.1     lukem 
    550  1.10      salo 			* TX39 (cache_tx39) -- uch (a] NetBSD.org has
    551   1.1     lukem 			  committed fixes to this code.  Awaiting
    552   1.1     lukem 			  confirmation that it is working properly.
    553   1.1     lukem 
    554  1.10      salo 			* R5900 (cache_r5900) -- uch (a] NetBSD.org has
    555   1.1     lukem 			  written this code and tested it on a
    556   1.1     lukem 			  PlayStation 2.
    557   1.1     lukem 
    558   1.1     lukem 		The following ports have been updated to compile (and
    559   1.1     lukem 		use optimized-for-processor bus_dma routines).  Those
    560   1.1     lukem 		that have been tested and work are marked with [WORKING].
    561   1.1     lukem 
    562   1.1     lukem 			* algor		[WORKING]
    563   1.1     lukem 
    564   1.1     lukem 			* arc		[WORKING]
    565   1.1     lukem 
    566   1.1     lukem 			* pmax		[WORKING]
    567   1.1     lukem 
    568   1.1     lukem 			* playstation2	[WORKING]
    569   1.1     lukem 					Needs optimized bus_dmamap_sync().
    570   1.1     lukem 
    571   1.1     lukem 			* hpcmips	[need verification that this is working]
    572   1.1     lukem 					Needs optimized bus_dmamap_sync().
    573   1.1     lukem 
    574   1.1     lukem 			* sgimips	[WORKING]
    575   1.1     lukem 					Needs optimized bus_dmamap_sync().
    576   1.1     lukem 
    577   1.1     lukem 			* cobalt	[need testing]
    578   1.1     lukem 
    579   1.1     lukem 			* mipsco	[need testing]
    580   1.1     lukem 
    581   1.1     lukem 			* newsmips	[need testing]
    582   1.1     lukem 
    583   1.1     lukem Branch:		thorpej_scsipi
    584   1.1     lukem Description:	SCSI/ATAPI midlayer rewrite.
    585   1.1     lukem Status:		Terminated; merged to -current
    586   1.1     lukem Start Date:
    587   1.1     lukem End Date:	Apr 25 2001
    588   1.1     lukem Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
    589  1.10      salo Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>,
    590  1.10      salo 		Jason Thorpe <thorpej (a] NetBSD.org>
    591   1.1     lukem Scope:		syssrc
    592   1.1     lukem Notes:		When a change from -current is pulled up please move the
    593   1.1     lukem 		thorpej_scsipi_base tag to the revision you're syncing with.
    594   1.1     lukem 		thorpej_scsipi_nbase is private to maintainer (only
    595   1.1     lukem 		used when syncing the whole branch with HEAD).
    596   1.1     lukem 		Just before the merge, syssrc has been tagged with
    597   1.1     lukem 		thorpej_scsipi_beforemerge
    598   1.1     lukem 
    599   1.1     lukem Branch:		thorpej-signal
    600   1.1     lukem Description:	?
    601   1.1     lukem Status:		?
    602   1.1     lukem Start Date:
    603   1.1     lukem End Date:
    604   1.1     lukem Base Tag:	thorpej-signal-base
    605  1.10      salo Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
    606   1.1     lukem Scope:		kernel
    607   1.1     lukem Notes:
    608   1.1     lukem 
    609   1.1     lukem Branch:		thorpej-setroot
    610   1.1     lukem Description:	?
    611   1.1     lukem Status:		Terminated; merged to -current
    612   1.1     lukem Start Date:
    613   1.1     lukem End Date:
    614   1.1     lukem Base Tag:
    615  1.10      salo Maintainer:	Jason Thorpe <thorpej (a] NetBSD.org>
    616   1.1     lukem Scope:		kernel
    617   1.1     lukem Notes:
    618   1.1     lukem 
    619  1.27      matt Branch:		matt-timespec
    620  1.27      matt Description:	Convert the kernel to struct timespec as its primary time
    621  1.27      matt 		storage mechanism.
    622  1.27      matt Status:		Active
    623  1.27      matt Start Date:	2005-02-19
    624  1.27      matt End Date:
    625  1.27      matt Base Tag:	
    626  1.27      matt Maintainer:	Matt Thomas <matt (a] NetBSD.org>
    627  1.27      matt Scope:		kernel
    628  1.27      matt Notes:	
    629   1.1     lukem 
    630   1.1     lukem Branch:		wrstuden-devbsize
    631   1.1     lukem Description:	Modify buffer cache to deal with different devices having
    632   1.1     lukem 		different block sizes. Also DEV_BSIZE would go away.
    633   1.1     lukem Status:		Terminated
    634   1.1     lukem Start Date:	Aug or Sept 1999
    635   1.1     lukem End Date:	1 Apr 2000
    636   1.1     lukem Base tag:	wrstuden-devbsize-base
    637  1.10      salo Maintainer:	Bill Studenmund <wrstuden (a] NetBSD.org>
    638   1.1     lukem Scope:		kernel
    639   1.1     lukem Notes:		No longer active due to lack of time, and introduction
    640   1.1     lukem 		of UBC. In terms of UBC, the primary cache for
    641   1.1     lukem 		file data is the VM cache, which needs to operate
    642   1.1     lukem 		in terms of VM pages. As no existing device has native
    643   1.1     lukem 		pages the same size as our VM pages, there already is
    644   1.1     lukem 		a mapping going on between the VM system and the
    645   1.1     lukem 		underlying blocks. So it would be easier and cleaner
    646   1.1     lukem 		to adjust that to deal w/ different block sizes.
    647   1.1     lukem 		Also with UBC, all i/o is in terms of bytes at an offset
    648   1.1     lukem 		with a certain length, so the exact block size isn't a big
    649   1.1     lukem 		deal.
    650   1.1     lukem 
    651   1.1     lukem 		Any other wrstuden-devbsize tag may (and should) go away.
    652   1.1     lukem 
    653   1.1     lukem 
    654  1.14       rtr Branch:		rtr-xorg-branch
    655  1.14       rtr Description:	xorg & static build alterations to src/x11
    656  1.14       rtr Status:		Active
    657  1.14       rtr Start Date:	Nov 15 2004
    658  1.14       rtr End Date:	
    659  1.14       rtr Base tag:	rtr-xorg-branch-base
    660  1.14       rtr Maintainer:	Tyler R. Retzlaff <rtr (a] NetBSD.org>
    661  1.14       rtr Scope:		x11
    662  1.14       rtr 		distrib/sets/lists
    663  1.14       rtr 		share/mk/bsd.x11.mk
    664  1.15       rtr 		share/mk/bsd.own.mk
    665  1.14       rtr 		etc/mtree/NetBSD.dist
    666  1.14       rtr Notes:		Requires parts of xsrc/xfree (HEAD)
    667  1.14       rtr 		xsrc/local, xsrc/xfree/xc/programs/Xserver/hw/netbsd
    668  1.14       rtr 		Requires xorg (XORG-6_8_1)
    669  1.14       rtr 
    670   1.1     lukem 
    671  1.25      yamt Branch:		yamt-km, yamt-km-doc
    672  1.19      yamt Description:	simplify/improve kernel memory management and bootstrap
    673  1.19      yamt Status:		Active
    674  1.19      yamt Start Date:	Tue Jan 25 2005
    675  1.19      yamt End Date:	
    676  1.25      yamt Base Tag:	yamt-km-base{,2}, yamt-km-doc-base
    677  1.19      yamt Maintainer:	YAMAMOTO Takashi <yamt (a] NetBSD.org>
    678  1.25      yamt Scope:		yamt-km: src/sys
    679  1.25      yamt 		yamt-km-doc: src/share/man/man9/uvm.9
    680  1.19      yamt Notes:		http://mail-index.NetBSD.org/tech-kern/2004/12/25/0005.html
    681  1.19      yamt 
    682  1.24      yamt 		the followings are per-port status.
    683  1.24      yamt 		(account names mean "tested by".)
    684  1.24      yamt 
    685  1.20      yamt 		works enough to go to multiuser:
    686  1.24      yamt 			alpha, i386 (yamt@)
    687  1.24      yamt 			pc532 (simonb@)
    688  1.28      yamt 			alpha, i386, mac68k, macppc, pmax, shark,
    689  1.34      yamt 			    sparc, sparc64, sun3, x68k (chs@)
    690  1.35      yamt 			cobalt, dreamcast, hp300, news68k, newsmips (tsutsui@)
    691  1.31      yamt 			amiga (mhitch@)
    692  1.32      yamt 			cats, hp700 (skrll@)
    693  1.28      yamt 
    694  1.28      yamt 		known to have the same problem as trunk:
    695  1.28      yamt 			vax (chs@, stuck while running kvm_mkdb)
    696  1.24      yamt 
    697  1.24      yamt 		known to have a problem:
    698  1.28      yamt 			hp300 (chs@, hang immediately after loading kernel)
    699  1.35      yamt 
    700  1.35      yamt 			luna68k (and, if any, other m68k ports which use TTR)
    701  1.35      yamt 			needs to be revisited.
    702  1.20      yamt 
    703  1.20      yamt 		buildable:
    704  1.20      yamt 			src/sys/arch/acorn26/conf/GENERIC
    705  1.20      yamt 			src/sys/arch/acorn32/conf/GENERIC
    706  1.20      yamt 			src/sys/arch/algor/conf/P6032
    707  1.20      yamt 			src/sys/arch/alpha/conf/GENERIC
    708  1.20      yamt 			src/sys/arch/alpha/conf/GENERIC.MP
    709  1.20      yamt 			src/sys/arch/amd64/conf/GENERIC
    710  1.20      yamt 			src/sys/arch/amd64/conf/GENERIC.MP
    711  1.20      yamt 			src/sys/arch/amiga/conf/GENERIC
    712  1.20      yamt 			src/sys/arch/arc/conf/GENERIC
    713  1.20      yamt 			src/sys/arch/atari/conf/MILAN-PCIIDE
    714  1.20      yamt 			src/sys/arch/bebox/conf/GENERIC
    715  1.20      yamt 			src/sys/arch/cats/conf/GENERIC
    716  1.20      yamt 			src/sys/arch/cesfic/conf/GENERIC
    717  1.20      yamt 			src/sys/arch/cobalt/conf/GENERIC
    718  1.20      yamt 			src/sys/arch/dreamcast/conf/GENERIC
    719  1.20      yamt 			src/sys/arch/evbarm/conf/TS7200
    720  1.20      yamt 			src/sys/arch/evbppc/conf/WALNUT
    721  1.20      yamt 			src/sys/arch/evbsh3/conf/COMPUTEXEVB
    722  1.26      yamt 			(with a patch in port-evbsh3/29334)
    723  1.20      yamt 			src/sys/arch/evbsh5/conf/CAYMAN64
    724  1.20      yamt 			src/sys/arch/hp300/conf/GENERIC
    725  1.20      yamt 			src/sys/arch/hp700/conf/GENERIC
    726  1.20      yamt 			src/sys/arch/hpcarm/conf/JORNADA728
    727  1.20      yamt 			src/sys/arch/hpcmips/conf/GENERIC
    728  1.20      yamt 			src/sys/arch/hpcsh/conf/GENERIC
    729  1.20      yamt 			src/sys/arch/hpcsh/conf/HPW650PA
    730  1.20      yamt 			src/sys/arch/i386/conf/GENERIC
    731  1.20      yamt 			src/sys/arch/i386/conf/GENERIC.MP
    732  1.20      yamt 			src/sys/arch/ibmnws/conf/GENERIC
    733  1.20      yamt 			src/sys/arch/iyonix/conf/GENERIC
    734  1.20      yamt 			src/sys/arch/luna68k/conf/GENERIC
    735  1.20      yamt 			src/sys/arch/mac68k/conf/GENERIC
    736  1.20      yamt 			src/sys/arch/macppc/conf/GENERIC
    737  1.20      yamt 			src/sys/arch/macppc/conf/GENERIC.MP
    738  1.20      yamt 			src/sys/arch/mipsco/conf/GENERIC
    739  1.20      yamt 			src/sys/arch/mvme68k/conf/GENERIC
    740  1.20      yamt 			src/sys/arch/netwinder/conf/GENERIC
    741  1.20      yamt 			src/sys/arch/news68k/conf/GENERIC
    742  1.20      yamt 			src/sys/arch/newsmips/conf/GENERIC
    743  1.20      yamt 			src/sys/arch/next68k/conf/GENERIC
    744  1.20      yamt 			src/sys/arch/ofppc/conf/GENERIC
    745  1.20      yamt 			src/sys/arch/pc532/conf/GENERIC
    746  1.20      yamt 			src/sys/arch/pmax/conf/GENERIC
    747  1.20      yamt 			src/sys/arch/prep/conf/GENERIC
    748  1.20      yamt 			src/sys/arch/sandpoint/conf/GENERIC
    749  1.20      yamt 			src/sys/arch/sbmips/conf/GENERIC
    750  1.20      yamt 			src/sys/arch/sgimips/conf/GENERIC32_IP3x
    751  1.20      yamt 			src/sys/arch/shark/conf/GENERIC
    752  1.20      yamt 			src/sys/arch/sparc/conf/GENERIC
    753  1.20      yamt 			src/sys/arch/sparc/conf/GENERIC.MP
    754  1.20      yamt 			src/sys/arch/sparc64/conf/GENERIC
    755  1.20      yamt 			src/sys/arch/sparc64/conf/GENERIC.MP
    756  1.20      yamt 			src/sys/arch/sun2/conf/GENERIC
    757  1.20      yamt 			src/sys/arch/sun3/conf/GENERIC
    758  1.20      yamt 			src/sys/arch/vax/conf/GENERIC
    759  1.20      yamt 			src/sys/arch/vax/conf/GENERIC.MP
    760  1.20      yamt 			src/sys/arch/x68k/conf/GENERIC
    761  1.20      yamt 			src/sys/arch/xen/conf/GENERIC
    762  1.20      yamt 
    763  1.21      yamt 		not tested at all:
    764  1.22      yamt 			mmeye
    765  1.21      yamt 			pdp10
    766  1.21      yamt 			playstation2
    767  1.21      yamt 
    768  1.19      yamt 
    769  1.30      tron Branch:		bouyer-xen2
    770  1.30      tron Description:	update xen port to xen 2.0, with support for domain0 operations
    771  1.33    bouyer Status:		Terminated
    772  1.30      tron Start Date:	Dec 13 2004
    773  1.33    bouyer End Date:	Mar 10 2005
    774  1.30      tron Base Tag:	netbsd-2-base
    775  1.30      tron Maintainer:	Manuel Bouyer <bouyer (a] NetBSD.org>
    776  1.30      tron Scope:		src/sys/arch/xen
    777  1.30      tron Notes:
    778  1.30      tron 
    779   1.1     lukem # Other:
    780   1.1     lukem 
    781   1.1     lukem Branch:		magnum
    782   1.1     lukem Description:	?
    783   1.1     lukem Status:		?
    784   1.1     lukem Start Date:
    785   1.1     lukem End Date:
    786   1.1     lukem Base Tag:	magnum-base
    787   1.1     lukem Maintainer:	?
    788   1.1     lukem Scope:		kernel
    789   1.1     lukem Notes:
    790