Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/doc/BRANCHES,v
rcsdiff: /ftp/cvs/cvsroot/src/doc/BRANCHES,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.252
retrieving revision 1.253
diff -u -p -r1.252 -r1.253
--- src/doc/BRANCHES	2008/05/19 02:14:45	1.252
+++ src/doc/BRANCHES	2008/05/27 18:52:43	1.253
@@ -1,4 +1,4 @@
-#	$NetBSD: BRANCHES,v 1.252 2008/05/19 02:14:45 yamt Exp $
+#	$NetBSD: BRANCHES,v 1.253 2008/05/27 18:52:43 wrstuden Exp $
 #
 # This file contains a list of branches that exist in the NetBSD CVS
 # tree and their current state.
@@ -505,7 +505,26 @@ Notes:		This branch is based off of the 
 		include not allocating memory while preparing to tsleep(),
 		reducing inappropriate upcall delivery (hopefully also
 		eliminating the need to mlock stacks), and being
-		able to pthread_kill() running threads.
+		able to pthread_kill() running threads. At this date,
+		most goals have been achieved. This branch also includes
+		fixes to gdb to support working with threaded apps.
+
+Branch:  	wrstuden-revivesa
+Description:	Fix a number of issues present with Scheduler Activations.
+Status: 	Active
+Start Date:	10 May 2008
+End Date:
+Base Tag:	wrstuden-revivesa-base
+Maintainer:	Bill Stouder-Studenmund <wrstuden@NetBSD.org>
+Scope:		src, though all the interesting stuff is in the kernel
+Notes:		This branch is intended to revive Scheduler Activations
+		in -current in the 5.0 era. This branch's main goal is
+		to re-add syscall compatability so that SA-based libpthread
+		programs can run with a -current kernel. 1:1 threading will
+		remain the NetBSD-default. This branch will re-add necessary
+		upcall support, and will also serve as a chance to clean
+		out cruft that had accumulated in the implementation over
+		time.
 
 Branch:		yamt-kmem
 Description: