Merge sync of head

6 files changed, 90 insertions, 24 deletions

diff --git a/share/misc/Makefile b/share/misc/Makefile
index 8318f1d..9ae988a 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -1,14 +1,21 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 .PATH:	${.CURDIR}/../../sys/dev/usb
 
 FILES=	ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \
 	committers-src.dot eqnchar flowers init.ee \
 	iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
-	scsi_modes usb_hid_usages usbdevs \
+	scsi_modes \
 	organization.dot
 
 FILESDIR=	${BINDIR}/misc
 
+.if ${MK_USB} != "no"
+FILES+=	usb_hid_usages
+FILES+=	usbdevs
+.endif
+
 .include <bsd.prog.mk>
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index ad2d52c..0bf1113 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -296,33 +296,40 @@ FreeBSD 5.2           |      |                 |                       |
  |            \       |      |       |         |                       |
  *--FreeBSD    |      |      |    NetBSD 6.1.3 |                       |
  |   10.0      |      |      |       |         |                       |
- |             |      |      |       |         |               DragonFly 3.6.1
- |             |      |      |       |         |                       |
- |             |      |      |       |         |                       |
- |             |      |      |       |         |               DragonFly 3.6.2
- |             |      |      |    NetBSD 6.1.4 |                       |
- |             |      |      |                 |                       |
- |             |      |      |            OpenBSD 5.5                  |
- |             |      |      |                 |                       |
- |             |      |      |                 |               DragonFly 3.8.0
- |             |      |      |                 |                       |
- |             |      |      |                 |                       |
- |             |      |      |                 |               DragonFly 3.8.1
- |             |      |      |                 |                       |
- |             |      |      |                 |                       |
- |             |      |      |                 |               DragonFly 3.6.3
- |             |      |      |                 |                       |
- |          FreeBSD   |      |                 |                       |
- |            9.3     |      |                 |                       |
- |                    |      |                 |               DragonFly 3.8.2
- |                 Mac OS X  |                 |                       |
- |                   10.10   |                 |                       |
- |                    |      |                 |                       |
+ |     |       |      |      |       |         |               DragonFly 3.6.1
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |               DragonFly 3.6.2
+ |     |       |      |      |    NetBSD 6.1.4 |                       |
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |    OpenBSD 5.5                  |
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |               DragonFly 3.8.0
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |               DragonFly 3.8.1
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |                       |
+ |     |       |      |      |       |         |               DragonFly 3.6.3
+ |     |       |      |      |       |         |                       |
+ |     |    FreeBSD   |      |       |         |                       |
+ |     |      9.3     |      |       |         |                       |
+ |     |              |      |    NetBSD 6.1.5 |               DragonFly 3.8.2
+ |     |           Mac OS X  |                 |                       |
+ |     |             10.10   |                 |                       |
+ |     |              |      |            OpenBSD 5.6                  |
+ |  FreeBSD           |      |                 |                       |
+ |   10.1             |      |                 |               DragonFly 4.0.1
  |                    |      |                 |                       |
+ |                    |      |                 |               DragonFly 4.0.2
  |                    |      |                 |                       |
+ |                    |      |                 |               DragonFly 4.0.3
  |                    |      |                 |                       |
+ |                    |      |                 |               DragonFly 4.0.4
  |                    |      |                 |                       |
+ |                    |      |                 |               DragonFly 4.0.5
  |                    |      |                 |                       |
+ |                    |      |            OpenBSD 5.7                  |
  |                    |      |                 |                       |
  |                    |      |                 |                       |
 FreeBSD 11 -current   |  NetBSD -current  OpenBSD -current     DragonFly -current
@@ -655,7 +662,16 @@ DragonFly 3.8.1		2014-06-16 [DFB]
 DragonFly 3.6.3		2014-06-17 [DFB]
 FreeBSD 9.3		2014-07-05 [FBD]
 DragonFly 3.8.2		2014-08-08 [DFB]
+NetBSD 6.1.5		2014-09-22 [NBD]
 Mac OS X 10.10		2014-10-16 [APL]
+OpenBSD 5.6		2014-11-01 [OBD]
+FreeBSD 10.1		2014-11-14 [FBD]
+DragonFly 4.0.1		2014-11-25 [DFB]
+DragonFly 4.0.2		2015-01-07 [DFB]
+DragonFly 4.0.3		2015-01-21 [DFB]
+DragonFly 4.0.4		2015-03-09 [DFB]
+DragonFly 4.0.5		2015-03-23 [DFB]
+OpenBSD 5.7		2015-05-01 [OBD]
 
 Bibliography
 ------------------------
@@ -675,6 +691,10 @@ McKusick, Marshall Kirk, George Neville-Neil. The Design and
 Implementation of the FreeBSD Operating System.
 Addison-Wesley Professional, Published: Aug 2, 2004. ISBN 0-201-70245-2
 
+McKusick, Marshall Kirk, George Neville-Neil, Robert Watson. The
+Design and Implementation of the FreeBSD Operating System, 2nd Edition.
+Pearson Education, Inc., 2014. ISBN 0-321-96897-2
+
 Doug McIlroy. Research Unix Reader.
 
 Michael G. Brown. The Role of BSD in the Development of Unix.
diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot
index 42ab60b..5b169d8 100644
--- a/share/misc/committers-doc.dot
+++ b/share/misc/committers-doc.dot
@@ -53,6 +53,7 @@ node [color=lightblue2, style=filled, bgcolor=black];
 ale [label="Alex Dupre\nale@FreeBSD.org\n2003/12/22"]
 allanjude [label="Allan Jude\nallanjude@FreeBSD.org\n2014/05/17"]
 bcr [label="Benedict Reuschling\nbcr@FreeBSD.org\n2009/12/24"]
+bhd [label="Björn Heidotting\nbhd@FreeBSD.org\n2014/10/14"]
 blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"]
 brd [label="Brad Davis\nbrd@FreeBSD.org\n2005/06/01"]
 brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2003/01/13"]
@@ -102,6 +103,7 @@ bcr -> dru
 bcr -> crees
 bcr -> jgh
 bcr -> allanjude
+bcr -> bhd
 
 blackend -> ale
 
diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot
index f072236..00e85f7 100644
--- a/share/misc/committers-ports.dot
+++ b/share/misc/committers-ports.dot
@@ -67,6 +67,7 @@ beech [label="Beech Rintoul\nbeech@FreeBSD.org\n2007/05/30"]
 bf [label="Brendan Fabeny\nbf@FreeBSD.org\n2010/06/02"]
 bland [label="Alexander Nedotsukov\nbland@FreeBSD.org\n2003/08/14"]
 bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2000/08/23"]
+bofh [label="Muhammad Moinur Rahman\nbofh@FreeBSD.org\n2014/12/23"]
 brix [label="Henrik Brix Andersen\nbrix@FreeBSD.org\n2007/10/31"]
 brooks [label="Brooks Davies\nbrooks@FreeBSD.org\n2004/05/03"]
 bsam [label="Boris Samorodov\nbsam@FreeBSD.org\n2006/07/20"]
@@ -115,6 +116,7 @@ itetcu [label="Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07"]
 jacula [label="Giuseppe Pilichi\njacula@FreeBSD.org\n2010/04/05"]
 jadawin [label="Philippe Audeoud\njadawin@FreeBSD.org\n2008/03/02"]
 jase [label="Jase Thew\njase@FreeBSD.org\n2012/05/30"]
+jbeich [label="Jan Beich\njbeich@FreeBSD.org\n2015/01/19"]
 jgh [label="Jason Helfman\njgh@FreeBSD.org\n2011/12/16"]
 jhale [label="Jason E. Hale\njhale@FreeBSD.org\n2012/09/10"]
 jkim [label="Jung-uk Kim\njkim@FreeBSD.org\n2007/09/12"]
@@ -126,6 +128,7 @@ josef [label="Josef El-Rayes\njosef@FreeBSD.org\n2004/12/20"]
 jpaetzel [label="Josh Paetzel\njpaetzel@FreeBSD.org\n2008/09/05"]
 jsa [label="Joseph S. Atkinson\njsa@FreeBSD.org\n2010/07/15"]
 jylefort [label="Jean-Yves Lefort\njylefort@FreeBSD.org\n2005/04/12"]
+kami [label="Dominic Fandrey\nkami@FreeBSD.org\n2014/09/09"]
 kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2003/02/21"]
 kmoore [label="Kris Moore\nkmoore@FreeBSD.org\n2009/04/14"]
 knu [label="Akinori Musha\nknu@FreeBSD.org\n2000/03/22"]
@@ -188,8 +191,10 @@ rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/07/21"]
 robak [label="Bartek Rutkowski\nrobak@FreeBSD.org\n2014/06/10"]
 rodrigo [label="Rodrigo Osorio\nrodrigo@FreeBSD.org\n2014/01/15"]
 romain [label="Romain Tartiere\nromain@FreeBSD.org\n2010/01/24"]
+rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2014/07/15"]
 sahil [label="Sahil Tandon\nsahil@FreeBSD.org\n2010/04/11"]
 sat [label="Andrew Pantyukhin\nsat@FreeBSD.org\n2006/05/06"]
+sbruno [label="Sean Bruno\nsbruno@FreeBSD.org\n2014/09/14"]
 sbz [label="Sofian Brabez\nsbz@FreeBSD.org\n2011/03/14"]
 scheidell [label="Michael Scheidell\nscheidell@FreeBSD.org\n2011/11/06"]
 sem [label="Sergey Matveychuk\nsem@FreeBSD.org\n2004/07/07"]
@@ -256,14 +261,20 @@ avilla -> jhale
 avilla -> rakuco
 
 bdrewery -> dbn
+bdrewery -> sbruno
 bdrewery -> trociny
 
 bapt -> bdrewery
+bapt -> bofh
 bapt -> eadler
+bapt -> grembo
+bapt -> jbeich
 bapt -> jlaffaye
 bapt -> marius
 bapt -> marino
 bapt -> rodrigo
+bapt -> rpaulo
+bapt -> sbruno
 
 beat -> decke
 beat -> marius
@@ -291,6 +302,8 @@ crees -> madpilot
 crees -> gblach
 crees -> tijl
 
+cs -> kami
+
 culot -> danilo
 culot -> jase
 culot -> marino
@@ -339,6 +352,8 @@ fjoe -> osa
 
 flo -> bar
 flo -> jase
+flo -> jbeich
+flo -> grembo
 
 flz -> garga
 flz -> johans
@@ -389,6 +404,7 @@ knu -> maho
 knu -> nobutaka
 knu -> nork
 
+koobs -> kami
 koobs -> xmj
 
 krion -> brooks
@@ -419,6 +435,7 @@ marcus -> bland
 marcus -> eik
 marcus -> jmallett
 
+marino -> bofh
 marino -> robak
 
 makc -> alonso
@@ -534,6 +551,7 @@ swills -> feld
 swills -> milki
 swills -> pclin
 swills -> robak
+swills -> rpaulo
 swills -> xmj
 
 tabthorpe -> ashish
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index 07d6aa7..9af30b7 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -113,6 +113,7 @@ andrew [label="Andrew Turner\nandrew@FreeBSD.org\n2010/07/19"]
 antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2008/02/03"]
 ariff [label="Ariff Abdullah\nariff@FreeBSD.org\n2005/11/14"]
 art [label="Artem Belevich\nart@FreeBSD.org\n2011/03/29"]
+arybchik [label="Andrew Rybchenko\narybchik@FreeBSD.org\n2014/10/12"]
 asomers [label="Alan Somers\nasomers@FreeBSD.org\n2013/04/24"]
 avg [label="Andriy Gapon\navg@FreeBSD.org\n2009/02/18"]
 bapt [label="Baptiste Daroussin\nbapt@FreeBSD.org\n2011/12/23"]
@@ -152,6 +153,7 @@ eivind [label="Eivind Eklund\neivind@FreeBSD.org\n1997/02/02"]
 emaste [label="Ed Maste\nemaste@FreeBSD.org\n2005/10/04"]
 emax [label="Maksim Yevmenkin\nemax@FreeBSD.org\n2003/10/12"]
 eri [label="Ermal Luci\neri@FreeBSD.org\n2008/06/11"]
+erj [label="Eric Joyner\nerj@FreeBSD.org\n2014/12/14"]
 fabient [label="Fabien Thomas\nfabient@FreeBSD.org\n2009/03/16"]
 fanf [label="Tony Finch\nfanf@FreeBSD.org\n2002/05/05"]
 fjoe [label="Max Khon\nfjoe@FreeBSD.org\n2001/08/06"]
@@ -176,6 +178,7 @@ ian [label="Ian Lepore\nian@FreeBSD.org\n2013/01/07"]
 iedowse [label="Ian Dowse\niedowse@FreeBSD.org\n2000/12/01"]
 imp [label="Warner Losh\nimp@FreeBSD.org\n1996/09/20"]
 ivoras [label="Ivan Voras\nivoras@FreeBSD.org\n2008/06/10"]
+jah [label="Jason A. Harmening\njah@FreeBSD.org\n2015/03/08"]
 jamie [label="Jamie Gritton\njamie@FreeBSD.org\n2009/01/28"]
 jasone [label="Jason Evans\njasone@FreeBSD.org\n1999/03/03"]
 jceel [label="Jakub Klama\njceel@FreeBSD.org\n2011/09/25"]
@@ -208,6 +211,7 @@ kensmith [label="Ken Smith\nkensmith@FreeBSD.org\n2004/01/23"]
 kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2006/07/23"]
 kib [label="Konstantin Belousov\nkib@FreeBSD.org\n2006/06/03"]
 kmacy [label="Kip Macy\nkmacy@FreeBSD.org\n2005/06/01"]
+kp [label="Kristof Provost\nkp@FreeBSD.org\n2015/03/22"]
 le [label="Lukas Ertl\nle@FreeBSD.org\n2004/02/02"]
 loos [label="Luiz Otavio O Souza\nloos@FreeBSD.org\n2013/07/03"]
 lstewart [label="Lawrence Stewart\nlstewart@FreeBSD.org\n2008/10/06"]
@@ -236,6 +240,7 @@ np [label="Navdeep Parhar\nnp@FreeBSD.org\n2009/06/05"]
 nwhitehorn [label="Nathan Whitehorn\nnwhitehorn@FreeBSD.org\n2008/07/03"]
 obrien [label="David E. O'Brien\nobrien@FreeBSD.org\n1996/10/29"]
 olli [label="Oliver Fromme\nolli@FreeBSD.org\n2008/02/14"]
+oshogbo [label="Mariusz Zaborski\noshogbo@FreeBSD.org\n2015/04/15"]
 peadar [label="Peter Edwards\npeadar@FreeBSD.org\n2004/03/08"]
 peter [label="Peter Wemm\npeter@FreeBSD.org\n1995/07/04"]
 peterj [label="Peter Jeremy\npeterj@FreeBSD.org\n2012/09/14"]
@@ -294,10 +299,12 @@ tuexen [label="Michael Tuexen\ntuexen@FreeBSD.org\n2009/06/06"]
 tychon [label="Tycho Nightingale\ntychon@FreeBSD.org\n2014/01/21"]
 ume [label="Hajimu UMEMOTO\nume@FreeBSD.org\n2000/02/26"]
 uqs [label="Ulrich Spoerlein\nuqs@FreeBSD.org\n2010/01/28"]
+vangyzen [label="Eric van Gyzen\nvangyzen@FreeBSD.org\n2015/03/08"]
 vanhu [label="Yvan Vanhullebus\nvanhu@FreeBSD.org\n2008/07/21"]
 versus [label="Konrad Jankowski\nversus@FreeBSD.org\n2008/10/27"]
 weongyo [label="Weongyo Jeong\nweongyo@FreeBSD.org\n2007/12/21"]
 wes [label="Wes Peters\nwes@FreeBSD.org\n1998/11/25"]
+whu [label="Wei Hu\nwhu@FreeBSD.org\n2015/02/11"]
 wkoszek [label="Wojciech A. Koszek\nwkoszek@FreeBSD.org\n2006/02/21"]
 wollman [label="Garrett Wollman\nwollman@FreeBSD.org\n????/??/??"]
 wsalamon [label="Wayne Salamon\nwsalamon@FreeBSD.org\n2005/06/25"]
@@ -428,6 +435,7 @@ gavin -> versus
 gibbs -> mjacob
 gibbs -> njl
 gibbs -> royger
+gibbs -> whu
 
 glebius -> mav
 
@@ -438,6 +446,9 @@ gnn -> vanhu
 gnn -> lstewart
 gnn -> np
 gnn -> davide
+gnn -> arybchik
+gnn -> erj
+gnn -> kp
 
 grehan -> bryanv
 
@@ -483,6 +494,8 @@ jb -> sson
 
 jdp -> fjoe
 
+jfv -> erj
+
 jhb -> arr
 jhb -> avg
 jhb -> jch
@@ -540,6 +553,7 @@ ken -> slm
 kib -> ae
 kib -> dchagin
 kib -> gjb
+kib -> jah
 kib -> jlh
 kib -> jpaetzel
 kib -> lulf
@@ -552,6 +566,7 @@ kib -> rmh
 kib -> stas
 kib -> tijl
 kib -> trociny
+kib -> vangyzen
 kib -> zont
 
 kmacy -> lstewart
@@ -612,12 +627,14 @@ philip -> ed
 philip -> jls
 philip -> matteo
 philip -> uqs
+philip -> kp
 
 phk -> jkoshy
 phk -> mux
 
 pjd -> kib
 pjd -> lulf
+pjd -> oshogbo
 pjd -> smh
 pjd -> trociny
 
@@ -625,6 +642,8 @@ rgrimes -> markm
 
 rmacklem -> jwd
 
+royger -> whu
+
 rpaulo -> avg
 rpaulo -> bschmidt
 rpaulo -> dim
diff --git a/share/misc/organization.dot b/share/misc/organization.dot
index ece8a0d..d93afd3 100644
--- a/share/misc/organization.dot
+++ b/share/misc/organization.dot
@@ -30,7 +30,7 @@ coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\nmatthew"]
 doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"]
 doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs"]
 portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"]
-portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nantoine, bapt, bdrewery,\ndecke, erwin, mat,\nmiwi, swills, tabthorpe"]
+portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nantoine, bapt, bdrewery,\nerwin, mat, swills"]
 portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nculot"]
 re [label="Primary Release Engineering Team\nre@FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith"]
 secteam [label="Security Team\nsecteam@FreeBSD.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"]