Module Name:    src
Committed By:   thorpej
Date:           Mon Sep 20 02:26:05 UTC 2021

Modified Files:
        src/doc: BRANCHES

Log Message:
Update the status of the thorpej-futex branch.


To generate a diff of this commit:
cvs rdiff -u -r1.364 -r1.365 src/doc/BRANCHES

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

Modified files:

Index: src/doc/BRANCHES
diff -u src/doc/BRANCHES:1.364 src/doc/BRANCHES:1.365
--- src/doc/BRANCHES:1.364	Mon Aug  9 20:49:08 2021
+++ src/doc/BRANCHES	Mon Sep 20 02:26:05 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: BRANCHES,v 1.364 2021/08/09 20:49:08 andvar Exp $
+#	$NetBSD: BRANCHES,v 1.365 2021/09/20 02:26:05 thorpej Exp $
 #
 # This file contains a list of branches that exist in the NetBSD CVS
 # tree and their current state.
@@ -747,9 +747,9 @@ Notes:
 
 Branch:		thorpej-futex
 Description:	Overhaul of futex operations to fix thread priority issues
-Status:		Active
+Status:		Partially merged
 Start Date:	Sun Nov 1 2020
-End Date:
+End Date:	Sun Aug 19 2021
 Base Tag:	thorpej-futex-base
 Maintainer:	Jason Thorpe <thor...@netbsd.org>
 Scope:		src/sys src/tests/lib/libc/sys src/distrib/sets/lists
@@ -761,6 +761,8 @@ Notes:		Normal futex operataions pass th
 		futex operations with respect to Linux compatibility.
 		Also includes implementations of eventfd and timerfd, as
 		well as some additional improvements to COMPAT_LINUX{,32}.
+		Branch was partially merged, with follow-ups to take place
+		on thorpej-futex2.
 
 Branch:		thorpej-futex2
 Description:	Overhaul of futex operations to fix thread priority issues

Reply via email to