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