From 7a78872dc5fa22c834d12e1f909c4fdf68da1879 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 12 Jun 2014 15:56:21 +0200
Subject: netsniff-ng 0.5.9-rc1

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b435ed5..2ae9311 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,9 @@ endif
 
 VERSION = 0
 PATCHLEVEL = 5
-SUBLEVEL = 8
-EXTRAVERSION =
-NAME = Ziggomatic
+SUBLEVEL = 9
+EXTRAVERSION = -rc1
+NAME = Cilonen
 
 TOOLS ?= $(CONFIG_TOOLS)
 TOOLS ?= netsniff-ng trafgen astraceroute flowtop ifpps bpfc curvetun mausezahn
-- 
cgit v1.2.3-54-g00ecf

='header'>
<tr>
<td class='logo' rowspan='2'><a href='/cgit.cgi/'><img src='/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/cgit.cgi/'>index</a> : <a href='/cgit.cgi/linux/net-next.git/'>net-next.git</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='8b2180b3bf0338625cab07da6543acb436df9c40'/><input type='hidden' name='id2' value='0af32fb468b4a4434dd759d68611763658650b59'/><select name='h' onchange='this.form.submit();'>
<option value='emaclite-cleanup'>emaclite-cleanup</option>
<option value='master' selected='selected'>master</option>
<option value='nds-private-remove'>nds-private-remove</option>
<option value='packet-loop-back'>packet-loop-back</option>
<option value='packet-rx-pump-back'>packet-rx-pump-back</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/linux/net-next.git/'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?id=8b2180b3bf0338625cab07da6543acb436df9c40'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/?id=8b2180b3bf0338625cab07da6543acb436df9c40'>tree</a><a href='/cgit.cgi/linux/net-next.git/commit/?id=8b2180b3bf0338625cab07da6543acb436df9c40'>commit</a><a class='active' href='/cgit.cgi/linux/net-next.git/diff/?id=8b2180b3bf0338625cab07da6543acb436df9c40&amp;id2=0af32fb468b4a4434dd759d68611763658650b59'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/'>
<input type='hidden' name='id' value='8b2180b3bf0338625cab07da6543acb436df9c40'/><input type='hidden' name='id2' value='0af32fb468b4a4434dd759d68611763658650b59'/><select name='qt'>
<option value='grep'>log msg</option>
<option 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='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='8b2180b3bf0338625cab07da6543acb436df9c40'/><input type='hidden' name='id2' value='0af32fb468b4a4434dd759d68611763658650b59'/><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><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=8b2180b3bf0338625cab07da6543acb436df9c40&amp;id2=0af32fb468b4a4434dd759d68611763658650b59'>Diffstat</a></div><table summary='diffstat' class='diffstat'>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>Akinobu Mita &lt;akinobu.mita@gmail.com&gt;</td><td class='right'>2011-07-26 16:09:01 -0700</td></tr>
<tr><th>committer</th><td>Linus Torvalds &lt;torvalds@linux-foundation.org&gt;</td><td class='right'>2011-07-26 16:49:46 -0700</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/include/linux/fault-inject.h?id=8307fc257cf3931d87e172bd8663e80c3d1e56a3'>8307fc257cf3931d87e172bd8663e80c3d1e56a3</a> (<a href='/cgit.cgi/linux/net-next.git/patch/include/linux/fault-inject.h?id=8307fc257cf3931d87e172bd8663e80c3d1e56a3'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?id=8307fc257cf3931d87e172bd8663e80c3d1e56a3'>4f265586a0617284be4baec5b5d6990cdea13b31</a> /<a href='/cgit.cgi/linux/net-next.git/tree/include/linux/fault-inject.h?id=8307fc257cf3931d87e172bd8663e80c3d1e56a3'>include/linux/fault-inject.h</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/include/linux/fault-inject.h?id=6b16f748a0d4546726bb53cad58525adfd6425e9'>6b16f748a0d4546726bb53cad58525adfd6425e9</a> (<a href='/cgit.cgi/linux/net-next.git/diff/include/linux/fault-inject.h?id=8307fc257cf3931d87e172bd8663e80c3d1e56a3&amp;id2=6b16f748a0d4546726bb53cad58525adfd6425e9'>diff</a>)</td></tr></table>
<div class='commit-subject'>fault-injection: cleanup simple attribute of stacktrace_depth</div><div class='commit-msg'>Minor cosmetic changes for simple attribute of stacktrace_depth:

 - use min_t()
 - reduce #ifdef by moving a function
 - do not use partly capitalized function name

Signed-off-by: Akinobu Mita &lt;akinobu.mita@gmail.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=8307fc257cf3931d87e172bd8663e80c3d1e56a3'>Diffstat</a> (limited to 'include/linux/fault-inject.h')</div><table summary='diffstat' class='diffstat'>