[user]
	name = Tobias Klauser
	email = tklauser@distanz.ch
	signingkey = B5510F47

[core]
	abbrev = 12
	whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol

[alias]
	co = checkout
	st = status
	ci = commit
	br = branch
	d = diff
	ds = diff --stat
	fixes = show --pretty=fixes -s
	lp = log -p
	dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | bzip2 -9v > ../$(git describe HEAD).tar.bz2"
	up = pull --rebase --autostash
	cr = codereview
	change = codereview change
	gofmt = codereview gofmt
	mail = codereview mail
	pending = codereview pending
	submit = codereview submit
	sync = codereview sync

[pretty]
	fixes = Fixes: %h (\"%s\")
	commit = %h (\"%s\")

[color]
	ui = true
	diff = auto
	branch = auto
	status = auto

[color "diff"]
	whitespace = red reverse

[push]
	default = matching

[merge]
	tool = vimdiff

[grep]
	lineNumber = true

[sendemail]
	smtpserver = mail.zhinst.com
	suppresscc = self
	bcc = Tobias Klauser <tklauser@distanz.ch>

[stash]
	showPatch = true

[tag]
	sort = version:refname

[versionsort]
	prereleaseSuffix = -rc
[http]
	cookiefile = /home/tobiask/.gitcookies
ion>
<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=c92816275674c1491ce228ee49aa030a5fa1be04'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/tools/testing'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/tools/testing?id=c92816275674c1491ce228ee49aa030a5fa1be04'>tree</a><a class='active' href='/cgit.cgi/linux/net-next.git/commit/tools/testing?id=c92816275674c1491ce228ee49aa030a5fa1be04'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/tools/testing?id=c92816275674c1491ce228ee49aa030a5fa1be04'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/tools/testing'>
<input type='hidden' name='id' value='c92816275674c1491ce228ee49aa030a5fa1be04'/><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='path'>path: <a href='/cgit.cgi/linux/net-next.git/commit/?id=c92816275674c1491ce228ee49aa030a5fa1be04'>root</a>/<a href='/cgit.cgi/linux/net-next.git/commit/tools?id=c92816275674c1491ce228ee49aa030a5fa1be04'>tools</a>/<a href='/cgit.cgi/linux/net-next.git/commit/tools/testing?id=c92816275674c1491ce228ee49aa030a5fa1be04'>testing</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='c92816275674c1491ce228ee49aa030a5fa1be04'/><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>Linus Torvalds &lt;torvalds@linux-foundation.org&gt;</td><td class='right'>2017-01-15 12:40:53 -0800</td></tr>
<tr><th>committer</th><td>Linus Torvalds &lt;torvalds@linux-foundation.org&gt;</td><td class='right'>2017-01-15 12:40:53 -0800</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/tools/testing?id=c92816275674c1491ce228ee49aa030a5fa1be04'>c92816275674c1491ce228ee49aa030a5fa1be04</a> (<a href='/cgit.cgi/linux/net-next.git/patch/tools/testing?id=c92816275674c1491ce228ee49aa030a5fa1be04'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?id=c92816275674c1491ce228ee49aa030a5fa1be04'>97deb97f282c6b9f4f58e45a60ea78d1fe31df4e</a> /<a href='/cgit.cgi/linux/net-next.git/tree/tools/testing?id=c92816275674c1491ce228ee49aa030a5fa1be04'>tools/testing</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/tools/testing?id=2d5a7101a140adcf7a5d8677649847fbb2dd5a2f'>2d5a7101a140adcf7a5d8677649847fbb2dd5a2f</a> (<a href='/cgit.cgi/linux/net-next.git/diff/tools/testing?id=c92816275674c1491ce228ee49aa030a5fa1be04&amp;id2=2d5a7101a140adcf7a5d8677649847fbb2dd5a2f'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/tools/testing?id=c8a6a09c1c617402cc9254b2bc8da359a0347d75'>c8a6a09c1c617402cc9254b2bc8da359a0347d75</a> (<a href='/cgit.cgi/linux/net-next.git/diff/tools/testing?id=c92816275674c1491ce228ee49aa030a5fa1be04&amp;id2=c8a6a09c1c617402cc9254b2bc8da359a0347d75'>diff</a>)</td></tr></table>
<div class='commit-subject'>Merge tag 'char-misc-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc</div><div class='commit-msg'>Pull char/misc driver fixes from Greg KH:
 "Here are some small char/misc driver fixes for 4.10-rc4 that resolve
  some reported issues.

  The MEI driver issue resolves a lot of problems that people have been
  having, as does the mem driver fix. The other minor fixes resolve
  other reported issues.

  All of these have been in linux-next for a while"

* tag 'char-misc-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  vme: Fix wrong pointer utilization in ca91cx42_slave_get
  auxdisplay: fix new ht16k33 build errors
  ppdev: don't print a free'd string
  extcon: return error code on failure
  drivers: char: mem: Fix thinkos in kmem address checks
  mei: bus: enable OS version only for SPT and newer
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=c92816275674c1491ce228ee49aa030a5fa1be04'>Diffstat</a> (limited to 'tools/testing')</div><table summary='diffstat' class='diffstat'>