Maintainer:

 * Tobias Klauser <tklauser@distanz.ch>
 * Daniel Borkmann <daniel@iogearbox.net>

Former maintainer:

 * Emmanuel Roullit <emmanuel.roullit@gmail.com>

Major contributors (> 30 commits):

 * Daniel Borkmann <daniel@iogearbox.net>
 * Tobias Klauser <tklauser@distanz.ch>
 * Emmanuel Roullit <emmanuel.roullit@gmail.com>
 * Markus Amend <markus@netsniff-ng.org>
 * Christoph Jaeger <email@christophjaeger.info>
 * Herbert Haas <herbert@perihel.at>*
 * Jon Schipp <jonschipp@gmail.com>
 * Vadim Kochan <vadim4j@gmail.com>

Minor contributors (<= 30 commits):

 * Stephen Wadeley <swadeley@redhat.com>
 * Hideo Hattori <hhatto.jp@gmail.com>
 * Peter Stuge <peter@stuge.se>
 * Scott Moeller <electronjoe@gmail.com>
 * Jesper Dangaard Brouer <brouer@redhat.com>
 * Jaroslav Škarvada <jskarvad@redhat.com>
 * Dennis Gilmore <dennis@ausil.us>
 * Dan Horák <dan@danny.cz>
 * Doug Burks <doug.burks@gmail.com>
 * Kartik Mistry <kartik@debian.org>
 * Ulrich Weber <uweber@astaro.com>
 * Teguh <info@egeektronic.com>
 * Markus Kötter <nepenthesdev@gmail.com>
 * Jim Binder <jbinder6342@gmail.com>
 * Ronald W. Henderson <rwhalb@nycap.rr.com>
 * Stefan Seering <sseerin@imn.htwk-leipzig.de>
 * Sibir Chakraborty <sibir.chakraborty@gmail.com>
 * Christian Wiese <chris@opensde.org>
 * Oliver Smith <oliver@zerolag.com>
 * Eric Dumazet <edumazet@google.com>
 * Michał Purzyński <michalpurzynski1@gmail.com>

Special thanks to some of our sponsors:

 * Deutsche Flugsicherung GmbH
 * ETH Zurich, Communications Systems Group
 * Max Planck Institute for Human Cognitive and Brain Sciences
 * Team Cymru

Notes:

The order of authors with > 30 commits listed here is sorted by contributions
from high to low through ``git log --no-merges $@ | grep Author: | \
cut -d: -f2 | cut -d\< -f1 | sort | uniq -c | sort -n -r''. The list of minor
contributors is currently unsorted and contains people who have contributed
code ``in some way'' (e.g. on the upstream or maintenance repositories), either
through Git or email.

Note that we have taken over the maintenance and further development of Herbert
Haas' mausezahn [ˈmauzəˌtsa:n] utility after he passed away in 2011. There were
no Git commit statistics available from the import of his project. The project
is currently in a staging area, but will be fully integrated soon. (*)

Want to join the core team? Submit enough great patches over a long time,
implement what's on the TODO file and show an ongoing, active interest in
supporting netsniff-ng. What's in it for you? If you ever come to Switzerland,
you get a free beer on Daniel and you can meet some great people involved in
this project. ;)
tion value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/linux/net-next.git/commit/?h=nds-private-remove&amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>root</a>/<a href='/cgit.cgi/linux/net-next.git/commit/net?h=nds-private-remove&amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>net</a>/<a href='/cgit.cgi/linux/net-next.git/commit/net/ceph?h=nds-private-remove&amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>ceph</a>/<a href='/cgit.cgi/linux/net-next.git/commit/net/ceph/osd_client.c?h=nds-private-remove&amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>osd_client.c</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='3efa70d78f218e4c9276b0bac0545e5184c1c47b'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>David S. Miller &lt;davem@davemloft.net&gt;</td><td class='right'>2017-02-07 16:29:30 -0500</td></tr>
<tr><th>committer</th><td>David S. Miller &lt;davem@davemloft.net&gt;</td><td class='right'>2017-02-07 16:29:30 -0500</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net/ceph/osd_client.c?h=nds-private-remove&amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>3efa70d78f218e4c9276b0bac0545e5184c1c47b</a> (<a href='/cgit.cgi/linux/net-next.git/patch/net/ceph/osd_client.c?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?h=nds-private-remove&amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>f4abe2f05e173023d2a262afd4aebb1e89fe6985</a> /<a href='/cgit.cgi/linux/net-next.git/tree/net/ceph/osd_client.c?h=nds-private-remove&amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>net/ceph/osd_client.c</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net/ceph/osd_client.c?h=nds-private-remove&amp;id=76e0e70e6452b971a69cc9794ff4a6715c11f7f2'>76e0e70e6452b971a69cc9794ff4a6715c11f7f2</a> (<a href='/cgit.cgi/linux/net-next.git/diff/net/ceph/osd_client.c?h=nds-private-remove&amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&amp;id2=76e0e70e6452b971a69cc9794ff4a6715c11f7f2'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net/ceph/osd_client.c?h=nds-private-remove&amp;id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742</a> (<a href='/cgit.cgi/linux/net-next.git/diff/net/ceph/osd_client.c?h=nds-private-remove&amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&amp;id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff</a>)</td></tr></table>
<div class='commit-subject'>Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net</div><div class='commit-msg'>The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>Diffstat</a> (limited to 'net/ceph/osd_client.c')</div><table summary='diffstat' class='diffstat'>