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