Home | History | Annotate | Line # | Download | only in doc
BRANCHES revision 1.1
      1 #	$NetBSD: BRANCHES,v 1.1 2002/09/21 08:17:33 lukem Exp $
      2 #
      3 # This file contains a list of branches that exist in the NetBSD CVS
      4 # tree and their current state.
      5 #
      6 # This list is necessarily incomplete.
      7 # 
      8 # Within reason, developers may create branch and version tags at any
      9 # time for any purpose.  To avoid name collisions, private tags should
     10 # have names which begin with the developer's NetBSD login name
     11 # followed by a - or _ character (e.g., thorpej_scsipi,
     12 # thorpej-signal)
     13 # 
     14 # Any branch or version tag not listed here should be assumed to be
     15 # private to the developer who created it.  It is inappropriate for
     16 # anyone other than that developer to commit, move tags, or otherwise
     17 # modify the contents of the branch.
     18 #
     19 # Please update this file when a new branch is ready for consumption
     20 # by folks other than the maintainer, or when the use or status of an
     21 # existing branch changes significantly.
     22 #
     23 # Format:
     24 #   Branch:	  name of branch
     25 #   Description:  Purpose and intention of the branch
     26 #   Status:	  Active/Terminated/Dormant
     27 #   Start Date:	  date first instantiated
     28 #   End Date:	  date it was Terminated/made_Dormant, if any
     29 #   Base Tag:	  netbsd-1-5-base, etc.
     30 #   Maintainer:	  Somebody to blame.
     31 #   Scope:	  Portion of the tree covered.
     32 #   Notes:	  Various other info, perhaps explanation of special tags,
     33 #		  who-may-commit policies, etc.
     34 
     35 
     36 # Release branches:
     37 
     38 Branch:		comdex-fall-1999
     39 Description:	Special release branch for pre-1.5 release at
     40 		Fall 1999 COMDEX.
     41 Status:		Terminated
     42 Start Date:
     43 End Date:
     44 Base Tag:	comdex-fall-1999-base
     45 Maintainer:	?
     46 Scope:		Entire tree.
     47 Notes:
     48 
     49 Branch:		netbsd-0-9
     50 Description:	The NetBSD 0.9 release branch
     51 Status:		Terminated
     52 Start Date:
     53 End Date:
     54 Base Tag:	netbsd-0-9-base
     55 Maintainer:	Release Engineering <releng (a] netbsd.org>
     56 Scope:		Entire tree.
     57 Notes:		Subsidiary tags of: netbsd-0-9-ALPHA, netbsd-0-9-ALPHA2,
     58 		netbsd-0-9-BETA, netbsd-0-9-RELEASE.
     59 		Commits restricted to release engineering.
     60 
     61 Branch:		netbsd-1-0
     62 Description:	The NetBSD 1.0 release branch
     63 Status:		Terminated
     64 Start Date:
     65 End Date:
     66 Base Tag:	netbsd-1-0-base
     67 Maintainer:	Release Engineering <releng (a] netbsd.org>
     68 Scope:		Entire tree.
     69 Notes:
     70 		Commits restricted to release engineering.
     71 
     72 Branch:		netbsd-1-1
     73 Description:	The NetBSD 1.1 release branch
     74 Status:		Terminated
     75 Start Date:
     76 End Date:
     77 Base Tag:	netbsd-1-1-base
     78 Maintainer:	Release Engineering <releng (a] netbsd.org>
     79 Scope:		Entire tree.
     80 Notes:
     81 		Commits restricted to release engineering.
     82 
     83 Branch:		netbsd-1-2
     84 Description:	The NetBSD 1.2 release branch
     85 Status:		Terminated
     86 Start Date:
     87 End Date:
     88 Base Tag:	netbsd-1-2-base
     89 Maintainer:	Release Engineering <releng (a] netbsd.org>
     90 Scope:		Entire tree.
     91 Notes:
     92 		Commits restricted to release engineering.
     93 
     94 Branch:		netbsd-1-3
     95 Description:	The NetBSD 1.3 release branch
     96 Status:		Terminated
     97 Start Date:
     98 End Date:
     99 Base Tag:	netbsd-1-3-base
    100 Maintainer:	Release Engineering <releng (a] netbsd.org>
    101 Scope:		Entire tree.
    102 Notes:
    103 		Commits restricted to release engineering.
    104 
    105 Branch:		netbsd-1-4
    106 Description:	The NetBSD 1.4 release branch
    107 Status:		Active
    108 Start Date:	1 Apr 2000
    109 End Date:
    110 Base Tag:	netbsd-1-4-base
    111 Maintainer:	1.4 Release Engineering <releng-1-4 (a] netbsd.org>
    112 Scope:		Entire tree.
    113 Notes:
    114 		Commits restricted to release engineering.
    115 
    116 Branch:		netbsd-1-5
    117 Description:	The NetBSD 1.5 release branch
    118 Status:		Active
    119 Start Date:	20 Jun 2000
    120 End Date:
    121 Base Tag:	netbsd-1-5-base
    122 Maintainer:	1.5 Release Engineering <releng-1-5 (a] netbsd.org>
    123 Scope:		Entire tree.
    124 Notes:
    125 		Commits restricted to release engineering.
    126 
    127 
    128 # Individual developers' branches:
    129 
    130 
    131 Branch:		bouyer-scsipi
    132 Description:	Integration of atapi support
    133 Status:		Terminated
    134 Start Date:
    135 End Date:
    136 Base Tag:
    137 Maintainer:	Manuel Bouyer <bouyer (a] netbsd.org>
    138 Scope:		kernel
    139 Notes:		Superseded by thorpej_scsipi
    140 
    141 Branch:		chs-ubc
    142 Description:	? Unified Buffer Cache
    143 Status:		?
    144 Start Date:
    145 End Date:
    146 Base Tag:	chs-ubc-base
    147 Maintainer:	Chuck Silvers <chs (a] netbsd.org>
    148 Scope:		kernel
    149 Notes:
    150 
    151 Branch:		chs-ubc2
    152 Description:	? Unified Buffer Cache
    153 Status:		?
    154 Start Date:
    155 End Date:
    156 Base Tag:	chs-ubc2-base, chs-ubc2-newbase
    157 Maintainer:	Chuck Silvers <chs (a] netbsd.org>
    158 Scope:		kernel
    159 Notes:
    160 
    161 Branch:		cjs-build-against-obj-dir
    162 Description:	?
    163 Status:		?
    164 Start Date:
    165 End Date:
    166 Base Tag:
    167 Maintainer:	Curt Sampson <cjs (a] netbsd.org>
    168 Scope:		Entire tree.
    169 Notes:
    170 
    171 Branch:		eeh-paddr_t
    172 Description:	?
    173 Status:		?
    174 Start Date:
    175 End Date:
    176 Base Tag:	eeh-paddr_t-base
    177 Maintainer:	Eduardo Horvath <eeh (a] netbsd.org>
    178 Scope:		kernel
    179 Notes:
    180 
    181 Branch:		fvdl-softdep
    182 Description:	FFS soft dependencies
    183 Status:		?Terminated
    184 Start Date:
    185 End Date:
    186 Base Tag:	fvdl-softdep-base
    187 Maintainer:	Frank van der Linden <fvdl (a] netbsd.org>
    188 Scope:		kernel
    189 Notes:
    190 
    191 Branch:		gehenna-devsw
    192 Description:	auto-generation of devsw table
    193 Status:		Terminated
    194 Start Date:	16 May 2002
    195 End Date:	6 Sep 2002
    196 Base Tag:	gehenna-devsw-base
    197 Maintainer:	MAEKAWA Masahide <gehenna (a] netbsd.org>
    198 Scope:		syssrc
    199 Notes:		The goal is to get rid of the existing device switch tables in
    200 		port-dependent conf.c and to generate them dynamically by
    201 		config(8).
    202 
    203 Branch:		is-newarp
    204 Description:	?
    205 Status:		?
    206 Start Date:
    207 End Date:
    208 Base Tag:	is-newarp-base
    209 Maintainer:	Ignatios Souvatzis <is (a] netbsd.org>
    210 Scope:		kernel
    211 Notes:
    212 
    213 
    214 Branch:		kame
    215 Description:	KAME Project
    216 Status:		Dormant
    217 Start Date:	28 Jun 1999
    218 End Date:
    219 Base Tag:
    220 Maintainer:	Jun-ichiro itojun Hagino <itojun (a] netbsd.org>
    221 Scope:		kernel
    222 Notes:		http://www.kame.net
    223 		Used for "reference" purposes for early part of KAME
    224 		integration effort.  The branch is not actively used, as I
    225 		(itojun) use patch(1) and diff(1) for the KAME syncs.
    226 
    227 Branch:		kenh-if-detach
    228 Description:	Interface detach support.
    229 Status:		?
    230 Start Date:
    231 End Date:
    232 Base Tag:	kenh-if-detach-base
    233 Maintainer:	Ken Hornstein <kenh (a] netbsd.org>
    234 Scope:		kernel
    235 Notes:
    236 
    237 Branch:		kqueue
    238 Description:	kqueue kernel event notification mechanism (from FreeBSD)
    239 Status:		Active
    240 Start Date:	Tue Jul 10 23:08:38 EST 2001
    241 End Date:
    242 Base Tag:	kqueue-base
    243 Maintainer:	Jaromir Dolecek <jdolecek (a] NetBSD.org>
    244 Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
    245 Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
    246 		local internal changes to better suit NetBSD, and
    247 		enhancements such as looking up filters by name or
    248 		number, and dynamic registration of "user" filters.
    249 		The work is complete as is, but is awaiting more
    250 		feedback from various kernel gurus before going mainline.
    251 
    252 Branch:		marc-pcmcia
    253 Description:	PCMCIA support
    254 Status:		Terminated; merged to -current
    255 Start Date:
    256 End Date:
    257 Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
    258 Maintainer:	Marc Horowitz <marc (a] netbsd.org>
    259 Scope:		kernel
    260 Notes:
    261 
    262 Branch:		minoura_x68k_bus_h
    263 Description:	bus_space(9) and bus_dma(9) implementation for x68k
    264 Status:		Terminated; merged to -current
    265 Start Date:	23 Dec 1998
    266 End Date:	16 Mar 1999
    267 Base Tag:	minoura_x68k_bus_h-base
    268 Maintainer:	Minoura Makoto <minoura (a] netbsd.org>
    269 Scope:		sys/arch/x68k
    270 Notes:
    271 
    272 Branch:		minoura-xpg4dl
    273 Description:	Citrus Project locale subsystem
    274 Status:		Terminated; (partly) merged to -current
    275 Start Date:	28 March 2000
    276 End Date:
    277 Base Tag:	minoura-xpg4dl-base
    278 Maintainer:	Minoura Makoto <minoura (a] netbsd.org>
    279 Scope:		basesrc, syssrc, sharesrc
    280 Notes:		Citrus Project is developing dynamically-loadable, codeset-
    281 		independent locale subsystem.  Part of the implementation
    282 		(LC_CTYPE) called XPG4DL is now integrated to -current.
    283 
    284 Branch:		mrg-vm-swap
    285 Description:	?
    286 Status:		?
    287 Start Date:
    288 End Date:
    289 Base Tag:	?
    290 Maintainer:	Matthew R. Green <mrg (a] netbsd.org>
    291 Scope:		kernel
    292 Notes:
    293 
    294 Branch:		nathanw_sa
    295 Description:	Scheduler activations
    296 Status:		Active
    297 Start Date:	5 March 2001
    298 End Date:
    299 Base Tag:	nathanw_sa_base
    300 Maintainer:	Nathan Williams <nathanw (a] netbsd.org>
    301 Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
    302 		bin/ps usr.bin/systat usr.bin/top usr.bin/w
    303 		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
    304 
    305 Notes:		The idea of scheduler activations is described in the
    306 		classic paper by Anderson et al., in ACM Transactions
    307 		a on Computer Systems volume 10 issue 1 (1992),which
    308 		can be found at
    309 		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
    310 		Many ideas in the implementation are based on the
    311 		implementation of scheduler activations added to Mach
    312 		3.0 and described by Davis et al. in the University of
    313 		Washington CS tech report 92-08-93, which can be found
    314 		at
    315 		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
    316 
    317 		My USENIX paper on the subject can be found at
    318 		http://web.mit.edu/nathanw/www/usenix/
    319 
    320 		Please consult with the maintainer before committing
    321 		to this branch.
    322 		Other tags starting with nathanw_sa reserved for
    323 		branch management and are not guaranteed to be stable.
    324 
    325 Branch:		newlock
    326 Description:	New locking primitives, based on Solaris's
    327 Status:		Active
    328 Start Date:	March 9, 2002
    329 End Date:
    330 Base Tag:	newlock-base
    331 Maintainer:	Jason R. Thorpe <thorpej (a] netbsd.org>
    332 Scope:		Kernel
    333 
    334 Notes:		The goal is to replace the existing lockmgr() and
    335 		simple_lock() based locking mechanisms with the
    336 		primitives found in Solaris: mutexes and rwlocks.
    337 
    338 Branch:		perseant-lfsv2
    339 Description:	LFS incompatible on-disk data structure changes
    340 Status:		Terminated
    341 Start Date:	27 June 2001
    342 End Date:	16 July 2001
    343 Base Tag:	perseant-lfsv2-base
    344 Maintainer:	Konrad Schroder <perseant (a] netbsd.org>
    345 Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
    346 Notes:		This branch should be short-lived, I expect to merge as soon
    347 		as the data structures required for unremove are in and tested.
    348 
    349 Branch:	  	pkgviews
    350 Description:  	package views, enabling multiple conflicting packages to co-exist
    351 Status:		Active
    352 Start Date:	22 July 2002
    353 End Date:
    354 Base Tag:	pkgviews
    355 Maintainer:	Alistair Crooks <agc (a] netbsd.org>
    356 Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
    357 Notes:		A more flexible infrastructure for third-party packages by
    358 		allowing multiple conflicting packages and versions to co-exist
    359 		within the same tree
    360 
    361 Branch:		sommerfeld_i386mp_1
    362 Description:	Multiprocessor support for i386 using Intel MP BIOS.
    363 Status:		Active
    364 Start Date:	21 Feb 2000
    365 End Date:
    366 Base Tag:	sommerfeld_i386mpbase_1
    367 Maintainer:	Bill Sommerfeld <sommerfeld (a] netbsd.org>
    368 Scope:		sys/arch/i386
    369 Notes:
    370 		Code committed to the branch has booted to multiuser 
    371 		on at least one system.
    372 
    373 		Not guaranteed to compile against mainline since -current
    374 		may have changed incompatibly with the last branch update;
    375 		use "cvs update -D" to roll-back the rest of the tree to match.
    376 
    377 		Please get explicit permission from the maintainer 
    378 		before each commit, or your changes will be backed out.
    379 		Other tags starting with sommerfeld_ are private to 
    380 		the developer and are guaranteed to be unstable.
    381 		Only the maintainer should move tags.
    382 
    383 		Note that this branch uses a DIFFERENT scheme for 
    384 		synching with the mainline.  the maintainer uses some private
    385 		scripts for keeping them in synch; if you make commits 
    386 		to the branch to "resynchronize" things, you'll
    387 		probably do it wrong; instead, ask the maintainer to
    388 		resynchronize things.
    389 
    390 		See sys/arch/i386/TODO on the branch for a list of known
    391 		issues with the branch.
    392 
    393 Branch:		thorpej-devvp
    394 Description:	replace dev_t with struct vnode * in devsw entry points
    395 Status:		Active
    396 Start Date:	Sep 6 2001
    397 End Date:
    398 Base Tag:	thorpej-devvp-base
    399 Maintainer:	Jason Thorpe <thorpej (a] netbsd.org>
    400 Scope:		syssrc
    401 Notes:		Kernels built from this branch are not expected
    402 		to function correctly at this time.
    403 
    404 		Ports known to compile on this branch:
    405 			alpha
    406 			i386
    407 
    408 Branch:		thorpej-mips-cache
    409 Description:	overhaul MIPS cache support code
    410 Status:		Terminated; merged to -current
    411 Start Date:	Oct 23 2001
    412 End Date:	Nov 14 2001
    413 Base Tag:	thorpej-mips-cache-base
    414 Scope:		syssrc
    415 Notes:		This branch needs more debugging, testing, and more
    416 		ports need to be converted to the new world order.
    417 
    418 		The following processors have had cache ops
    419 		written:
    420 
    421 			* R2000/R3000 (cache_r3k) -- light testing,
    422 			  needs to be beat on a lot more to make
    423 			  sure it's working.
    424 
    425 			* R4000/R4400 (cache_r4k) -- mhitch (a] netbsd.org
    426 			  tracked down a bug, which has been fixed.
    427 
    428 			  Confirmed working on R4000-with-L2.
    429 
    430 			  Confirmed working on R4400-no-L2 and
    431 			  R4400-with-L2.
    432 
    433 			* R4600/R5000 (cache_r5k) -- shin (a] netbsd.org
    434 			  has committed fixes to this code.
    435 
    436 			  Confirmed working on R4600 v2 (SGI IP-22 with
    437 			  no SysAD L2 cache).
    438 
    439 			  Confirmed working on RM5260 (Algorithmics P-5064).
    440 
    441 			* TX39 (cache_tx39) -- uch (a] netbsd.org has
    442 			  committed fixes to this code.  Awaiting
    443 			  confirmation that it is working properly.
    444 
    445 			* R5900 (cache_r5900) -- uch (a] netbsd.org has
    446 			  written this code and tested it on a
    447 			  PlayStation 2.
    448 
    449 		The following ports have been updated to compile (and
    450 		use optimized-for-processor bus_dma routines).  Those
    451 		that have been tested and work are marked with [WORKING].
    452 
    453 			* algor		[WORKING]
    454 
    455 			* arc		[WORKING]
    456 
    457 			* pmax		[WORKING]
    458 
    459 			* playstation2	[WORKING]
    460 					Needs optimized bus_dmamap_sync().
    461 
    462 			* hpcmips	[need verification that this is working]
    463 					Needs optimized bus_dmamap_sync().
    464 
    465 			* sgimips	[WORKING]
    466 					Needs optimized bus_dmamap_sync().
    467 
    468 			* cobalt	[need testing]
    469 
    470 			* mipsco	[need testing]
    471 
    472 			* newsmips	[need testing]
    473 
    474 Branch:		thorpej_scsipi
    475 Description:	SCSI/ATAPI midlayer rewrite.
    476 Status:		Terminated; merged to -current
    477 Start Date:
    478 End Date:	Apr 25 2001
    479 Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
    480 Maintainer:	Manuel Bouyer <bouyer (a] netbsd.org>,
    481 		Jason Thorpe <thorpej (a] netbsd.org>
    482 Scope:		syssrc
    483 Notes:		When a change from -current is pulled up please move the
    484 		thorpej_scsipi_base tag to the revision you're syncing with.
    485 		thorpej_scsipi_nbase is private to maintainer (only
    486 		used when syncing the whole branch with HEAD).
    487 		Just before the merge, syssrc has been tagged with
    488 		thorpej_scsipi_beforemerge
    489 
    490 Branch:		thorpej-signal
    491 Description:	?
    492 Status:		?
    493 Start Date:
    494 End Date:
    495 Base Tag:	thorpej-signal-base
    496 Maintainer:	Jason Thorpe <thorpej (a] netbsd.org>
    497 Scope:		kernel
    498 Notes:
    499 
    500 Branch:		thorpej-setroot
    501 Description:	?
    502 Status:		Terminated; merged to -current
    503 Start Date:
    504 End Date:
    505 Base Tag:
    506 Maintainer:	Jason Thorpe <thorpej (a] netbsd.org>
    507 Scope:		kernel
    508 Notes:
    509 
    510 
    511 Branch:		wrstuden-devbsize
    512 Description:	Modify buffer cache to deal with different devices having
    513 		different block sizes. Also DEV_BSIZE would go away.
    514 Status:		Terminated
    515 Start Date:	Aug or Sept 1999
    516 End Date:	1 Apr 2000
    517 Base tag:	wrstuden-devbsize-base
    518 Maintainer:	Bill Studenmund <wrstuden (a] netbsd.org>
    519 Scope:		kernel
    520 Notes:		No longer active due to lack of time, and introduction
    521 		of UBC. In terms of UBC, the primary cache for
    522 		file data is the VM cache, which needs to operate
    523 		in terms of VM pages. As no existing device has native
    524 		pages the same size as our VM pages, there already is
    525 		a mapping going on between the VM system and the
    526 		underlying blocks. So it would be easier and cleaner
    527 		to adjust that to deal w/ different block sizes.
    528 		Also with UBC, all i/o is in terms of bytes at an offset
    529 		with a certain length, so the exact block size isn't a big
    530 		deal.
    531 
    532 		Any other wrstuden-devbsize tag may (and should) go away.
    533 
    534 
    535 
    536 # Other:
    537 
    538 Branch:		magnum
    539 Description:	?
    540 Status:		?
    541 Start Date:
    542 End Date:
    543 Base Tag:	magnum-base
    544 Maintainer:	?
    545 Scope:		kernel
    546 Notes:
    547