Module Name: src
Committed By: bouyer
Date: Sun Jan 15 20:36:21 UTC 2017
Modified Files:
src/doc: BRANCHES
Log Message:
Document bouyer-socketcan
While there update status of bouyer-quota2 (which got merged a long
time ago).
To generate a diff of this commit:
cvs rdiff -u -r1.336 -r1.337 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.336 src/doc/BRANCHES:1.337
--- src/doc/BRANCHES:1.336 Tue Jul 19 02:04:06 2016
+++ src/doc/BRANCHES Sun Jan 15 20:36:21 2017
@@ -1,4 +1,4 @@
-# $NetBSD: BRANCHES,v 1.336 2016/07/19 02:04:06 pgoyette Exp $
+# $NetBSD: BRANCHES,v 1.337 2017/01/15 20:36:21 bouyer Exp $
#
# This file contains a list of branches that exist in the NetBSD CVS
# tree and their current state.
@@ -383,6 +383,17 @@ Notes: This code was on a branch becaus
cpuswitch.S which would otherwise make merging the
nathanw_sa branch difficult.
+Branch: bouyer-socketcan
+Description: Implement a CAN socket layer compatible with linux SocketCAN
+Status: Active
+Start Date: Sun Jan 15 2017
+End Date:
+Base Tag: bouyer-socketcan-base
+Maintainer: Manuel Bouyer <bou...@netbsd.org>
+Scope: src/
+Notes: Some documentation on SocketCAN is there:
+ https://www.kernel.org/doc/Documentation/networking/can.txt
+
Branch: cherry-xenmp
Description: Port i386 and amd64 Xen kernels to run MP
Status: Terminated
@@ -854,16 +865,6 @@ Scope: src/sys and src/common
Notes: Used as experiment sandbox and if successful hopefully one day
to be integrated.
-Branch: bouyer-quota2
-Description: modernise disk quotas
-Status: Active
-Start Date: Thu Jan 20 2011
-End Date:
-Base Tag: bouyer-quota2-base
-Maintainer: Manuel Bouyer <bou...@netbsd.org>
-Scope: src/
-Notes:
-
Branch: pgoyette-localcount
Description: Implement localcount reference counting as proposed by
riastradh@
@@ -920,6 +921,16 @@ Maintainer: Manuel Bouyer <bouyer@NetBSD
Scope: kernel
Notes:
+Branch: bouyer-quota2
+Description: modernise disk quotas
+Status: Terminated
+Start Date: Thu Jan 20 2011
+End Date: March 06 2011
+Base Tag: bouyer-quota2-base
+Maintainer: Manuel Bouyer <bou...@netbsd.org>
+Scope: src/
+Notes:
+
Branch: chap-midi
Description: Renovation of MIDI support
Status: Terminated; merged to -current
