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