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