BRANCHES revision 1.12 1 # $NetBSD: BRANCHES,v 1.12 2003/11/12 13:16:22 grant 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: ktrace-lwp
302 Description: ktrace support for lwp ids.
303 Status: Active
304 Start Date: Wed Jul 2 15:27:30 UTC 2003
305 End Date:
306 Base Tag: ktrace-lwp-base
307 Maintainer: Darren Reed <darrenr (a] NetBSD.org>
308 Scope: sys
309 Notes:
310
311 Branch: marc-pcmcia
312 Description: PCMCIA support
313 Status: Terminated; merged to -current
314 Start Date:
315 End Date:
316 Base Tag: marc-pcmcia-base, marc-pcmcia-bp
317 Maintainer: Marc Horowitz <marc (a] NetBSD.org>
318 Scope: kernel
319 Notes:
320
321 Branch: minoura_x68k_bus_h
322 Description: bus_space(9) and bus_dma(9) implementation for x68k
323 Status: Terminated; merged to -current
324 Start Date: 23 Dec 1998
325 End Date: 16 Mar 1999
326 Base Tag: minoura_x68k_bus_h-base
327 Maintainer: Minoura Makoto <minoura (a] NetBSD.org>
328 Scope: sys/arch/x68k
329 Notes:
330
331 Branch: minoura-xpg4dl
332 Description: Citrus Project locale subsystem
333 Status: Terminated; (partly) merged to -current
334 Start Date: 28 March 2000
335 End Date:
336 Base Tag: minoura-xpg4dl-base
337 Maintainer: Minoura Makoto <minoura (a] NetBSD.org>
338 Scope: basesrc, syssrc, sharesrc
339 Notes: Citrus Project is developing dynamically-loadable, codeset-
340 independent locale subsystem. Part of the implementation
341 (LC_CTYPE) called XPG4DL is now integrated to -current.
342
343 Branch: mrg-vm-swap
344 Description: ?
345 Status: ?
346 Start Date:
347 End Date:
348 Base Tag: ?
349 Maintainer: Matthew R. Green <mrg (a] NetBSD.org>
350 Scope: kernel
351 Notes:
352
353 Branch: nathanw_sa
354 Description: Scheduler activations
355 Status: Active
356 Start Date: 5 March 2001
357 End Date: 18 January 2003
358 Base Tag: nathanw_sa_base
359 Maintainer: Nathan Williams <nathanw (a] NetBSD.org>
360 Scope: kernel, libc, libkvm, libpthread, libpthread_dbg, include,
361 bin/ps usr.bin/systat usr.bin/top usr.bin/w
362 gnu/dist/toolchain/gdb gnu/usr.bin/gdb
363
364 Notes: The idea of scheduler activations is described in the
365 classic paper by Anderson et al., in ACM Transactions
366 a on Computer Systems volume 10 issue 1 (1992),which
367 can be found at
368 http://www.acm.org/pubs/citations/journals/tocs/1992-10-1/p53-anderson/
369 Many ideas in the implementation are based on the
370 implementation of scheduler activations added to Mach
371 3.0 and described by Davis et al. in the University of
372 Washington CS tech report 92-08-93, which can be found
373 at
374 ftp://ftp.cs.washington.edu/tr/1992/08/UW-CSE-92-08-03.PS.Z
375
376 My USENIX paper on the subject can be found at
377 http://web.mit.edu/nathanw/www/usenix/
378
379 Please consult with the maintainer before committing
380 to this branch.
381 Other tags starting with nathanw_sa reserved for
382 branch management and are not guaranteed to be stable.
383
384 Trunk tagged with "nathanw_sa_before_merge" prior to
385 merging branch down to trunk. Branch tagged with
386 "nathanw_sa_end" to indicate the ending revision of
387 the branch.
388
389 Branch: newlock
390 Description: New locking primitives, based on Solaris's
391 Status: Active
392 Start Date: March 9, 2002
393 End Date:
394 Base Tag: newlock-base
395 Maintainer: Jason R. Thorpe <thorpej (a] NetBSD.org>
396 Scope: Kernel
397
398 Notes: The goal is to replace the existing lockmgr() and
399 simple_lock() based locking mechanisms with the
400 primitives found in Solaris: mutexes and rwlocks.
401
402 Branch: perseant-lfsv2
403 Description: LFS incompatible on-disk data structure changes
404 Status: Terminated
405 Start Date: 27 June 2001
406 End Date: 16 July 2001
407 Base Tag: perseant-lfsv2-base
408 Maintainer: Konrad Schroder <perseant (a] NetBSD.org>
409 Scope: basesrc/{sbin/*lfs,libexec/lfs_cleanerd,usr.sbin/dumplfs}, syssrc/sys/ufs
410 Notes: This branch should be short-lived, I expect to merge as soon
411 as the data structures required for unremove are in and tested.
412
413 Branch: pkgviews
414 Description: package views, enabling multiple conflicting packages to co-exist
415 Status: Active
416 Start Date: 22 July 2002
417 End Date:
418 Base Tag: pkgviews
419 Maintainer: Alistair Crooks <agc (a] NetBSD.org>
420 Scope: pkgsrc, basesrc/usr.sbin/pkg_install
421 Notes: A more flexible infrastructure for third-party packages by
422 allowing multiple conflicting packages and versions to co-exist
423 within the same tree
424
425 Branch: sommerfeld_i386mp_1
426 Description: Multiprocessor support for i386 using Intel MP BIOS.
427 Status: Terminated; merged to -current
428 Start Date: 21 Feb 2000
429 End Date: 01 Oct 2002
430 Base Tag: sommerfeld_i386mpbase_1
431 Maintainer: Bill Sommerfeld <sommerfeld (a] NetBSD.org>
432 Scope: sys/arch/i386
433 Notes:
434 Code committed to the branch has booted to multiuser
435 on at least one system.
436
437 Not guaranteed to compile against mainline since -current
438 may have changed incompatibly with the last branch update;
439 use "cvs update -D" to roll-back the rest of the tree to match.
440
441 Please get explicit permission from the maintainer
442 before each commit, or your changes will be backed out.
443 Other tags starting with sommerfeld_ are private to
444 the developer and are guaranteed to be unstable.
445 Only the maintainer should move tags.
446
447 Note that this branch uses a DIFFERENT scheme for
448 synching with the mainline. the maintainer uses some private
449 scripts for keeping them in synch; if you make commits
450 to the branch to "resynchronize" things, you'll
451 probably do it wrong; instead, ask the maintainer to
452 resynchronize things.
453
454 See sys/arch/i386/TODO on the branch for a list of known
455 issues with the branch.
456
457 Branch: thorpej-devvp
458 Description: replace dev_t with struct vnode * in devsw entry points
459 Status: Active
460 Start Date: Sep 6 2001
461 End Date:
462 Base Tag: thorpej-devvp-base
463 Maintainer: Jason Thorpe <thorpej (a] NetBSD.org>
464 Scope: syssrc
465 Notes: Kernels built from this branch are not expected
466 to function correctly at this time.
467
468 Ports known to compile on this branch:
469 alpha
470 i386
471
472 Branch: thorpej-mips-cache
473 Description: overhaul MIPS cache support code
474 Status: Terminated; merged to -current
475 Start Date: Oct 23 2001
476 End Date: Nov 14 2001
477 Base Tag: thorpej-mips-cache-base
478 Scope: syssrc
479 Notes: This branch needs more debugging, testing, and more
480 ports need to be converted to the new world order.
481
482 The following processors have had cache ops
483 written:
484
485 * R2000/R3000 (cache_r3k) -- light testing,
486 needs to be beat on a lot more to make
487 sure it's working.
488
489 * R4000/R4400 (cache_r4k) -- mhitch (a] NetBSD.org
490 tracked down a bug, which has been fixed.
491
492 Confirmed working on R4000-with-L2.
493
494 Confirmed working on R4400-no-L2 and
495 R4400-with-L2.
496
497 * R4600/R5000 (cache_r5k) -- shin (a] NetBSD.org
498 has committed fixes to this code.
499
500 Confirmed working on R4600 v2 (SGI IP-22 with
501 no SysAD L2 cache).
502
503 Confirmed working on RM5260 (Algorithmics P-5064).
504
505 * TX39 (cache_tx39) -- uch (a] NetBSD.org has
506 committed fixes to this code. Awaiting
507 confirmation that it is working properly.
508
509 * R5900 (cache_r5900) -- uch (a] NetBSD.org has
510 written this code and tested it on a
511 PlayStation 2.
512
513 The following ports have been updated to compile (and
514 use optimized-for-processor bus_dma routines). Those
515 that have been tested and work are marked with [WORKING].
516
517 * algor [WORKING]
518
519 * arc [WORKING]
520
521 * pmax [WORKING]
522
523 * playstation2 [WORKING]
524 Needs optimized bus_dmamap_sync().
525
526 * hpcmips [need verification that this is working]
527 Needs optimized bus_dmamap_sync().
528
529 * sgimips [WORKING]
530 Needs optimized bus_dmamap_sync().
531
532 * cobalt [need testing]
533
534 * mipsco [need testing]
535
536 * newsmips [need testing]
537
538 Branch: thorpej_scsipi
539 Description: SCSI/ATAPI midlayer rewrite.
540 Status: Terminated; merged to -current
541 Start Date:
542 End Date: Apr 25 2001
543 Base Tag: thorpej_scsipi_base, thorpej_scsipi_nbase
544 Maintainer: Manuel Bouyer <bouyer (a] NetBSD.org>,
545 Jason Thorpe <thorpej (a] NetBSD.org>
546 Scope: syssrc
547 Notes: When a change from -current is pulled up please move the
548 thorpej_scsipi_base tag to the revision you're syncing with.
549 thorpej_scsipi_nbase is private to maintainer (only
550 used when syncing the whole branch with HEAD).
551 Just before the merge, syssrc has been tagged with
552 thorpej_scsipi_beforemerge
553
554 Branch: thorpej-signal
555 Description: ?
556 Status: ?
557 Start Date:
558 End Date:
559 Base Tag: thorpej-signal-base
560 Maintainer: Jason Thorpe <thorpej (a] NetBSD.org>
561 Scope: kernel
562 Notes:
563
564 Branch: thorpej-setroot
565 Description: ?
566 Status: Terminated; merged to -current
567 Start Date:
568 End Date:
569 Base Tag:
570 Maintainer: Jason Thorpe <thorpej (a] NetBSD.org>
571 Scope: kernel
572 Notes:
573
574
575 Branch: wrstuden-devbsize
576 Description: Modify buffer cache to deal with different devices having
577 different block sizes. Also DEV_BSIZE would go away.
578 Status: Terminated
579 Start Date: Aug or Sept 1999
580 End Date: 1 Apr 2000
581 Base tag: wrstuden-devbsize-base
582 Maintainer: Bill Studenmund <wrstuden (a] NetBSD.org>
583 Scope: kernel
584 Notes: No longer active due to lack of time, and introduction
585 of UBC. In terms of UBC, the primary cache for
586 file data is the VM cache, which needs to operate
587 in terms of VM pages. As no existing device has native
588 pages the same size as our VM pages, there already is
589 a mapping going on between the VM system and the
590 underlying blocks. So it would be easier and cleaner
591 to adjust that to deal w/ different block sizes.
592 Also with UBC, all i/o is in terms of bytes at an offset
593 with a certain length, so the exact block size isn't a big
594 deal.
595
596 Any other wrstuden-devbsize tag may (and should) go away.
597
598
599
600 # Other:
601
602 Branch: magnum
603 Description: ?
604 Status: ?
605 Start Date:
606 End Date:
607 Base Tag: magnum-base
608 Maintainer: ?
609 Scope: kernel
610 Notes:
611