[src/trunk]: src/doc Document bouyer-socketcan

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/baf4ded684f0
branches:  trunk
changeset: 820914:baf4ded684f0
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Jan 15 20:36:21 2017 +0000

description:
Document bouyer-socketcan
While there update status of bouyer-quota2 (which got merged a long
time ago).

diffstat:

 doc/BRANCHES |  33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diffs (61 lines):

diff -r f6f29854e431 -r baf4ded684f0 doc/BRANCHES
--- a/doc/BRANCHES      Sun Jan 15 20:10:25 2017 +0000
+++ b/doc/BRANCHES      Sun Jan 15 20:36:21 2017 +0000
@@ -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 @@
                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 <bouyer%NetBSD.org@localhost>
+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 @@
 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 <bouyer%NetBSD.org@localhost>
-Scope:         src/
-Notes:
-
 Branch:                pgoyette-localcount
 Description:   Implement localcount reference counting as proposed by
                riastradh@
@@ -920,6 +921,16 @@
 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 <bouyer%NetBSD.org@localhost>
+Scope:         src/
+Notes:
+
 Branch:        chap-midi
 Description:   Renovation of MIDI support
 Status:        Terminated; merged to -current