diff options
author | sjg <sjg@FreeBSD.org> | 2014-11-19 01:07:58 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2014-11-19 01:07:58 +0000 |
commit | b137080f19736ee33fede2e88bb54438604cf86b (patch) | |
tree | 377ac0ac449528621eb192cd245adadb5fd53668 /share/misc | |
parent | ab21a29eb607d4dfe389b965fbdee27558e791aa (diff) | |
parent | 4a8d07956d121238d006d34ffe7d6269744e8b1a (diff) | |
download | FreeBSD-src-b137080f19736ee33fede2e88bb54438604cf86b.zip FreeBSD-src-b137080f19736ee33fede2e88bb54438604cf86b.tar.gz |
Merge from head@274682
Diffstat (limited to 'share/misc')
-rw-r--r-- | share/misc/bsd-family-tree | 46 | ||||
-rw-r--r-- | share/misc/committers-ports.dot | 7 | ||||
-rw-r--r-- | share/misc/committers-src.dot | 8 | ||||
-rw-r--r-- | share/misc/scsi_modes | 3 |
4 files changed, 48 insertions, 16 deletions
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 930c91d..ad2d52c 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -291,21 +291,32 @@ FreeBSD 5.2 | | | | | | | | | | | | FreeBSD | | NetBSD 6.1.2 | | | 9.2 Mac OS X | | | | - | 10.9 | | OpenBSD 5.4 | - | | | | | DragonFly 3.6.0 - | | | | | | - *--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 - | | | | | - | | | | | + | | 10.9 | | OpenBSD 5.4 | + | `-----. | | | | DragonFly 3.6.0 + | \ | | | | | + *--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 | | | | | | | | | | | | | | | | | | @@ -640,6 +651,11 @@ NetBSD 6.0.5 2014-04-19 [NDB] NetBSD 6.1.4 2014-04-19 [NDB] OpenBSD 5.5 2014-05-01 [OBD] DragonFly 3.8.0 2014-06-04 [DFB] +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] +Mac OS X 10.10 2014-10-16 [APL] Bibliography ------------------------ diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 02c303e..f072236 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -49,6 +49,7 @@ ale [label="Alex Dupre\nale@FreeBSD.org\n2004/01/12"] alepulver [label="Alejandro Pulver\nalepulver@FreeBSD.org\n2006/04/01"] alexbl [label="Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/11"] alexey [label="Alexey Degtyarev\nalexey@FreeBSD.org\n2013/11/09"] +alonso [label="Alonso Schaich\nalonso@FreeBSD.org\n2014/08/14"] amdmi3 [label="Dmitry Marakasov\namdmi3@FreeBSD.org\n2008/06/19"] anray [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11"] antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2013/04/03"] @@ -86,6 +87,7 @@ delphij [label="Xin Li\ndelphij@FreeBSD.org\n2006/05/01"] demon [label="Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/11/13"] dhn [label="Dennis Herrmann\ndhn@FreeBSD.org\n2009/03/03"] dryice [label="Dryice Dong Liu\ndryice@FreeBSD.org\n2006/12/25"] +dvl [label="Dan Langille\ndvl@FreeBSD.org\n2014/08/10"] eadler [label="Eitan Adler\neadler@FreeBSD.org\n2011/08/17"] edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22"] ehaupt [label="Emanuel Haupt\nehaupt@FreeBSD.org\n2005/10/03"] @@ -419,11 +421,13 @@ marcus -> jmallett marino -> robak +makc -> alonso makc -> bf makc -> jhale makc -> rakuco mat -> bmah +mat -> dvl mat -> thierry mezz -> tmclaugh @@ -491,6 +495,8 @@ philip -> koitsu rafan -> chinsan +rakuco -> alonso + rene -> bar rene -> crees rene -> jgh @@ -558,6 +564,7 @@ wen -> pawel wg -> alexey wg -> danilo +wg -> dvl wg -> nemysis will -> lioux diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 891efa3..07d6aa7 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -170,6 +170,7 @@ grehan [label="Peter Grehan\ngrehan@FreeBSD.org\n2002/08/08"] grog [label="Greg Lehey\ngrog@FreeBSD.org\n1998/08/30"] gshapiro [label="Gregory Shapiro\ngshapiro@FreeBSD.org\n2000/07/12"] harti [label="Hartmut Brandt\nharti@FreeBSD.org\n2003/01/29"] +hiren [label="Hiren Panchasara\nhiren@FreeBSD.org\n2013/04/12"] hmp [label="Hiten Pandya\nhmp@FreeBSD.org\n2004/03/23"] ian [label="Ian Lepore\nian@FreeBSD.org\n2013/01/07"] iedowse [label="Ian Dowse\niedowse@FreeBSD.org\n2000/12/01"] @@ -178,6 +179,7 @@ ivoras [label="Ivan Voras\nivoras@FreeBSD.org\n2008/06/10"] 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"] +jch [label="Julien Charbon\njch@FreeBSD.org\n2014/09/24"] jchandra [label="Jayachandran C.\njchandra@FreeBSD.org\n2010/05/19"] jeff [label="Jeff Roberson\njeff@FreeBSD.org\n2002/02/21"] jh [label="Jaakko Heinonen\njh@FreeBSD.org\n2009/10/02"] @@ -228,6 +230,7 @@ mp [label="Mark Peek\nmp@FreeBSD.org\n2001/07/27"] mr [label="Michael Reifenberger\nmr@FreeBSD.org\n2001/09/30"] neel [label="Neel Natu\nneel@FreeBSD.org\n2009/09/20"] netchild [label="Alexander Leidinger\nnetchild@FreeBSD.org\n2005/03/31"] +ngie [label="Garrett Cooper\nngie@FreeBSD.org\n2014/07/27"] nork [label="Norikatsu Shigemura\nnork@FreeBSD.org\n2009/06/09"] np [label="Navdeep Parhar\nnp@FreeBSD.org\n2009/06/05"] nwhitehorn [label="Nathan Whitehorn\nnwhitehorn@FreeBSD.org\n2008/07/03"] @@ -482,6 +485,7 @@ jdp -> fjoe jhb -> arr jhb -> avg +jhb -> jch jhb -> jeff jhb -> kbyanc jhb -> peterj @@ -512,6 +516,8 @@ jlemon -> brooks jmallett -> pkelsey +jmmv -> ngie + joerg -> brian joerg -> eik joerg -> jmg @@ -623,6 +629,7 @@ rpaulo -> avg rpaulo -> bschmidt rpaulo -> dim rpaulo -> jmmv +rpaulo -> ngie rrs -> brucec rrs -> jchandra @@ -660,6 +667,7 @@ sam -> andre sam -> benjsc sam -> sephe +sbruno -> hiren sbruno -> jimharris schweikh -> dds diff --git a/share/misc/scsi_modes b/share/misc/scsi_modes index 4f7e59a..781b8f1 100644 --- a/share/misc/scsi_modes +++ b/share/misc/scsi_modes @@ -223,7 +223,8 @@ {Correction Span} i1 {Head Offset Count} i1 {Data Strobe Offset Count} i1 - {Reserved} *i1 + {LBPERE (LBP Error Reporting Enabled)} t1 + {Reserved} *t7 {Write Retry Count} i1 {Reserved} *i1 {Recovery Time Limit} i2 |