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