Home | History | Annotate | Line # | Download | only in doc
BRANCHES revision 1.8
      1 #	$NetBSD: BRANCHES,v 1.8 2002/12/18 05:03:34 gmcgarry 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:		gmcgarry_ctxsw
    228 Description:	Separate scheduler from context-switch code
    229 Status:		Active
    230 Start Date:	18 December 2002
    231 End Date:
    232 Base Tag:	gmcgarry_ctxsw_base
    233 Maintainer:	Gregory McGarry <gmcgarry (a] netbsd.org>
    234 Scope:		kernel
    235 Notes:		Removing knowledge of the schedular and its run queues
    236 		from the machine-dependent context switch code is the
    237 		first step in cleaning up the scheduler.  It is necessary
    238 		for the newlock branch, making the scheduler SMP friendly,
    239 		adding real-time scheduler extensions, and reducing the
    240 		number of code paths for LWP and proc switching.
    241 
    242 Branch:		gmcgarry_ucred
    243 Description:	Integrate and encapsulate user credentials
    244 Status:		Active
    245 Start Date:	18 December 2002
    246 End Date:
    247 Base Tag:	gmcgarry_ucred_base
    248 Maintainer:	Gregory McGarry <gmcgarry (a] netbsd.org>
    249 Scope:		kernel
    250 Notes:		merge pcred and ucred and poolify
    251 
    252 Branch:		is-newarp
    253 Description:	?
    254 Status:		?
    255 Start Date:
    256 End Date:
    257 Base Tag:	is-newarp-base
    258 Maintainer:	Ignatios Souvatzis <is (a] netbsd.org>
    259 Scope:		kernel
    260 Notes:
    261 
    262 
    263 Branch:		kame
    264 Description:	KAME Project
    265 Status:		Dormant
    266 Start Date:	28 Jun 1999
    267 End Date:
    268 Base Tag:
    269 Maintainer:	Jun-ichiro itojun Hagino <itojun (a] netbsd.org>
    270 Scope:		kernel
    271 Notes:		http://www.kame.net
    272 		Used for "reference" purposes for early part of KAME
    273 		integration effort.  The branch is not actively used, as I
    274 		(itojun) use patch(1) and diff(1) for the KAME syncs.
    275 
    276 Branch:		kenh-if-detach
    277 Description:	Interface detach support.
    278 Status:		?
    279 Start Date:
    280 End Date:
    281 Base Tag:	kenh-if-detach-base
    282 Maintainer:	Ken Hornstein <kenh (a] netbsd.org>
    283 Scope:		kernel
    284 Notes:
    285 
    286 Branch:		kqueue
    287 Description:	kqueue kernel event notification mechanism (from FreeBSD)
    288 Status:		Terminated; merged to -current
    289 Start Date:	Tue Jul 10 23:08:38 EST 2001
    290 End Date:	Tue Oct 24 09:14:14 GMT 2002
    291 Base Tag:	kqueue-base
    292 Maintainer:	Jaromir Dolecek <jdolecek (a] NetBSD.org>
    293 Scope:		kernel, libc/sys, share/man/man9, usr.bin/fstat
    294 Notes:		Integration of FreeBSD's kqueue(2) mechanism, with various
    295 		local internal changes to better suit NetBSD, and
    296 		enhancements such as looking up filters by name or
    297 		number, and dynamic registration of "user" filters.
    298 		The work is complete as is, but is awaiting more
    299 		feedback from various kernel gurus before going mainline.
    300 
    301 Branch:		marc-pcmcia
    302 Description:	PCMCIA support
    303 Status:		Terminated; merged to -current
    304 Start Date:
    305 End Date:
    306 Base Tag:	marc-pcmcia-base, marc-pcmcia-bp
    307 Maintainer:	Marc Horowitz <marc (a] netbsd.org>
    308 Scope:		kernel
    309 Notes:
    310 
    311 Branch:		minoura_x68k_bus_h
    312 Description:	bus_space(9) and bus_dma(9) implementation for x68k
    313 Status:		Terminated; merged to -current
    314 Start Date:	23 Dec 1998
    315 End Date:	16 Mar 1999
    316 Base Tag:	minoura_x68k_bus_h-base
    317 Maintainer:	Minoura Makoto <minoura (a] netbsd.org>
    318 Scope:		sys/arch/x68k
    319 Notes:
    320 
    321 Branch:		minoura-xpg4dl
    322 Description:	Citrus Project locale subsystem
    323 Status:		Terminated; (partly) merged to -current
    324 Start Date:	28 March 2000
    325 End Date:
    326 Base Tag:	minoura-xpg4dl-base
    327 Maintainer:	Minoura Makoto <minoura (a] netbsd.org>
    328 Scope:		basesrc, syssrc, sharesrc
    329 Notes:		Citrus Project is developing dynamically-loadable, codeset-
    330 		independent locale subsystem.  Part of the implementation
    331 		(LC_CTYPE) called XPG4DL is now integrated to -current.
    332 
    333 Branch:		mrg-vm-swap
    334 Description:	?
    335 Status:		?
    336 Start Date:
    337 End Date:
    338 Base Tag:	?
    339 Maintainer:	Matthew R. Green <mrg (a] netbsd.org>
    340 Scope:		kernel
    341 Notes:
    342 
    343 Branch:		nathanw_sa
    344 Description:	Scheduler activations
    345 Status:		Active
    346 Start Date:	5 March 2001
    347 End Date:
    348 Base Tag:	nathanw_sa_base
    349 Maintainer:	Nathan Williams <nathanw (a] netbsd.org>
    350 Scope:		kernel, libc, libkvm, libpthread, libpthread_dbg, include, 
    351 		bin/ps usr.bin/systat usr.bin/top usr.bin/w
    352 		gnu/dist/toolchain/gdb gnu/usr.bin/gdb
    353 
    354 Notes:		The idea of scheduler activations is described in the
    355 		classic paper by Anderson et al., in ACM Transactions
    356 		a on Computer Systems volume 10 issue 1 (1992),which
    357 		can be found at
    358 		http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
    359 		Many ideas in the implementation are based on the
    360 		implementation of scheduler activations added to Mach
    361 		3.0 and described by Davis et al. in the University of
    362 		Washington CS tech report 92-08-93, which can be found
    363 		at
    364 		ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
    365 
    366 		My USENIX paper on the subject can be found at
    367 		http://web.mit.edu/nathanw/www/usenix/
    368 
    369 		Please consult with the maintainer before committing
    370 		to this branch.
    371 		Other tags starting with nathanw_sa reserved for
    372 		branch management and are not guaranteed to be stable.
    373 
    374 Branch:		newlock
    375 Description:	New locking primitives, based on Solaris's
    376 Status:		Active
    377 Start Date:	March 9, 2002
    378 End Date:
    379 Base Tag:	newlock-base
    380 Maintainer:	Jason R. Thorpe <thorpej (a] netbsd.org>
    381 Scope:		Kernel
    382 
    383 Notes:		The goal is to replace the existing lockmgr() and
    384 		simple_lock() based locking mechanisms with the
    385 		primitives found in Solaris: mutexes and rwlocks.
    386 
    387 Branch:		perseant-lfsv2
    388 Description:	LFS incompatible on-disk data structure changes
    389 Status:		Terminated
    390 Start Date:	27 June 2001
    391 End Date:	16 July 2001
    392 Base Tag:	perseant-lfsv2-base
    393 Maintainer:	Konrad Schroder <perseant (a] netbsd.org>
    394 Scope:		basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
    395 Notes:		This branch should be short-lived, I expect to merge as soon
    396 		as the data structures required for unremove are in and tested.
    397 
    398 Branch:	  	pkgviews
    399 Description:  	package views, enabling multiple conflicting packages to co-exist
    400 Status:		Active
    401 Start Date:	22 July 2002
    402 End Date:
    403 Base Tag:	pkgviews
    404 Maintainer:	Alistair Crooks <agc (a] netbsd.org>
    405 Scope:		pkgsrc, basesrc/usr.sbin/pkg_install
    406 Notes:		A more flexible infrastructure for third-party packages by
    407 		allowing multiple conflicting packages and versions to co-exist
    408 		within the same tree
    409 
    410 Branch:		sommerfeld_i386mp_1
    411 Description:	Multiprocessor support for i386 using Intel MP BIOS.
    412 Status:		Terminated; merged to -current
    413 Start Date:	21 Feb 2000
    414 End Date:	01 Oct 2002
    415 Base Tag:	sommerfeld_i386mpbase_1
    416 Maintainer:	Bill Sommerfeld <sommerfeld (a] netbsd.org>
    417 Scope:		sys/arch/i386
    418 Notes:
    419 		Code committed to the branch has booted to multiuser 
    420 		on at least one system.
    421 
    422 		Not guaranteed to compile against mainline since -current
    423 		may have changed incompatibly with the last branch update;
    424 		use "cvs update -D" to roll-back the rest of the tree to match.
    425 
    426 		Please get explicit permission from the maintainer 
    427 		before each commit, or your changes will be backed out.
    428 		Other tags starting with sommerfeld_ are private to 
    429 		the developer and are guaranteed to be unstable.
    430 		Only the maintainer should move tags.
    431 
    432 		Note that this branch uses a DIFFERENT scheme for 
    433 		synching with the mainline.  the maintainer uses some private
    434 		scripts for keeping them in synch; if you make commits 
    435 		to the branch to "resynchronize" things, you'll
    436 		probably do it wrong; instead, ask the maintainer to
    437 		resynchronize things.
    438 
    439 		See sys/arch/i386/TODO on the branch for a list of known
    440 		issues with the branch.
    441 
    442 Branch:		thorpej-devvp
    443 Description:	replace dev_t with struct vnode * in devsw entry points
    444 Status:		Active
    445 Start Date:	Sep 6 2001
    446 End Date:
    447 Base Tag:	thorpej-devvp-base
    448 Maintainer:	Jason Thorpe <thorpej (a] netbsd.org>
    449 Scope:		syssrc
    450 Notes:		Kernels built from this branch are not expected
    451 		to function correctly at this time.
    452 
    453 		Ports known to compile on this branch:
    454 			alpha
    455 			i386
    456 
    457 Branch:		thorpej-mips-cache
    458 Description:	overhaul MIPS cache support code
    459 Status:		Terminated; merged to -current
    460 Start Date:	Oct 23 2001
    461 End Date:	Nov 14 2001
    462 Base Tag:	thorpej-mips-cache-base
    463 Scope:		syssrc
    464 Notes:		This branch needs more debugging, testing, and more
    465 		ports need to be converted to the new world order.
    466 
    467 		The following processors have had cache ops
    468 		written:
    469 
    470 			* R2000/R3000 (cache_r3k) -- light testing,
    471 			  needs to be beat on a lot more to make
    472 			  sure it's working.
    473 
    474 			* R4000/R4400 (cache_r4k) -- mhitch (a] netbsd.org
    475 			  tracked down a bug, which has been fixed.
    476 
    477 			  Confirmed working on R4000-with-L2.
    478 
    479 			  Confirmed working on R4400-no-L2 and
    480 			  R4400-with-L2.
    481 
    482 			* R4600/R5000 (cache_r5k) -- shin (a] netbsd.org
    483 			  has committed fixes to this code.
    484 
    485 			  Confirmed working on R4600 v2 (SGI IP-22 with
    486 			  no SysAD L2 cache).
    487 
    488 			  Confirmed working on RM5260 (Algorithmics P-5064).
    489 
    490 			* TX39 (cache_tx39) -- uch (a] netbsd.org has
    491 			  committed fixes to this code.  Awaiting
    492 			  confirmation that it is working properly.
    493 
    494 			* R5900 (cache_r5900) -- uch (a] netbsd.org has
    495 			  written this code and tested it on a
    496 			  PlayStation 2.
    497 
    498 		The following ports have been updated to compile (and
    499 		use optimized-for-processor bus_dma routines).  Those
    500 		that have been tested and work are marked with [WORKING].
    501 
    502 			* algor		[WORKING]
    503 
    504 			* arc		[WORKING]
    505 
    506 			* pmax		[WORKING]
    507 
    508 			* playstation2	[WORKING]
    509 					Needs optimized bus_dmamap_sync().
    510 
    511 			* hpcmips	[need verification that this is working]
    512 					Needs optimized bus_dmamap_sync().
    513 
    514 			* sgimips	[WORKING]
    515 					Needs optimized bus_dmamap_sync().
    516 
    517 			* cobalt	[need testing]
    518 
    519 			* mipsco	[need testing]
    520 
    521 			* newsmips	[need testing]
    522 
    523 Branch:		thorpej_scsipi
    524 Description:	SCSI/ATAPI midlayer rewrite.
    525 Status:		Terminated; merged to -current
    526 Start Date:
    527 End Date:	Apr 25 2001
    528 Base Tag:	thorpej_scsipi_base, thorpej_scsipi_nbase
    529 Maintainer:	Manuel Bouyer <bouyer (a] netbsd.org>,
    530 		Jason Thorpe <thorpej (a] netbsd.org>
    531 Scope:		syssrc
    532 Notes:		When a change from -current is pulled up please move the
    533 		thorpej_scsipi_base tag to the revision you're syncing with.
    534 		thorpej_scsipi_nbase is private to maintainer (only
    535 		used when syncing the whole branch with HEAD).
    536 		Just before the merge, syssrc has been tagged with
    537 		thorpej_scsipi_beforemerge
    538 
    539 Branch:		thorpej-signal
    540 Description:	?
    541 Status:		?
    542 Start Date:
    543 End Date:
    544 Base Tag:	thorpej-signal-base
    545 Maintainer:	Jason Thorpe <thorpej (a] netbsd.org>
    546 Scope:		kernel
    547 Notes:
    548 
    549 Branch:		thorpej-setroot
    550 Description:	?
    551 Status:		Terminated; merged to -current
    552 Start Date:
    553 End Date:
    554 Base Tag:
    555 Maintainer:	Jason Thorpe <thorpej (a] netbsd.org>
    556 Scope:		kernel
    557 Notes:
    558 
    559 
    560 Branch:		wrstuden-devbsize
    561 Description:	Modify buffer cache to deal with different devices having
    562 		different block sizes. Also DEV_BSIZE would go away.
    563 Status:		Terminated
    564 Start Date:	Aug or Sept 1999
    565 End Date:	1 Apr 2000
    566 Base tag:	wrstuden-devbsize-base
    567 Maintainer:	Bill Studenmund <wrstuden (a] netbsd.org>
    568 Scope:		kernel
    569 Notes:		No longer active due to lack of time, and introduction
    570 		of UBC. In terms of UBC, the primary cache for
    571 		file data is the VM cache, which needs to operate
    572 		in terms of VM pages. As no existing device has native
    573 		pages the same size as our VM pages, there already is
    574 		a mapping going on between the VM system and the
    575 		underlying blocks. So it would be easier and cleaner
    576 		to adjust that to deal w/ different block sizes.
    577 		Also with UBC, all i/o is in terms of bytes at an offset
    578 		with a certain length, so the exact block size isn't a big
    579 		deal.
    580 
    581 		Any other wrstuden-devbsize tag may (and should) go away.
    582 
    583 
    584 
    585 # Other:
    586 
    587 Branch:		magnum
    588 Description:	?
    589 Status:		?
    590 Start Date:
    591 End Date:
    592 Base Tag:	magnum-base
    593 Maintainer:	?
    594 Scope:		kernel
    595 Notes:
    596