CONFIG_SMP=y CONFIG_PREEMPT_NONE=n CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=y #CHECK#CONFIG_PREEMPT_RCU=y CONFIG_HZ_PERIODIC=n CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ_FULL=n CONFIG_RCU_FAST_NO_HZ=n CONFIG_RCU_TRACE=n CONFIG_HOTPLUG_CPU=n CONFIG_SUSPEND=n CONFIG_HIBERNATION=n CONFIG_RCU_NOCB_CPU=n CONFIG_DEBUG_LOCK_ALLOC=n CONFIG_PROVE_LOCKING=n CONFIG_RCU_BOOST=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n CONFIG_RCU_EXPERT=y CONFIG_RCU_TRACE=y Git repository'/> <link rel='vcs-git' href='http:///git.distanz.ch/cgit.cgi/linux/net-next.git' title='net-next.git Git repository'/> </head> <body> <div id='cgit'><table id='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='8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14'/><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=8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14'>refs</a><a class='active' href='/cgit.cgi/linux/net-next.git/log/drivers/usb/storage/unusual_cypress.h'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/drivers/usb/storage/unusual_cypress.h?id=8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14'>tree</a><a href='/cgit.cgi/linux/net-next.git/commit/drivers/usb/storage/unusual_cypress.h?id=8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/drivers/usb/storage/unusual_cypress.h?id=8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/drivers/usb/storage/unusual_cypress.h'> <input type='hidden' name='id' value='8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14'/><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/log/?id=8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14'>root</a>/<a href='/cgit.cgi/linux/net-next.git/log/drivers?id=8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14'>drivers</a>/<a href='/cgit.cgi/linux/net-next.git/log/drivers/usb?id=8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14'>usb</a>/<a href='/cgit.cgi/linux/net-next.git/log/drivers/usb/storage?id=8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14'>storage</a>/<a href='/cgit.cgi/linux/net-next.git/log/drivers/usb/storage/unusual_cypress.h?id=8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14'>unusual_cypress.h</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/cgit.cgi/linux/net-next.git/log/drivers/usb/storage/unusual_cypress.h?id=8ecd4591e7612a7ea5c67589cf1a7f18bd17ba14&showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr> 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 <davem@davemloft.net></td><td class='right'>2017-02-02 16:54:00 -0500</td></tr> <tr><th>committer</th><td>David S. Miller <davem@davemloft.net></td><td class='right'>2017-02-02 16:54:00 -0500</td></tr> <tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/fs?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>e2160156bf2a7d5018e99a9993fbcdda0abac09b</a> (<a href='/cgit.cgi/linux/net-next.git/patch/fs?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>patch</a>)</td></tr> <tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc</a> /<a href='/cgit.cgi/linux/net-next.git/tree/fs?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>fs</a></td></tr> <tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/fs?id=62e13097c46c69dbd7544ab2cd585ccf48f360a4'>62e13097c46c69dbd7544ab2cd585ccf48f360a4</a> (<a href='/cgit.cgi/linux/net-next.git/diff/fs?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b&id2=62e13097c46c69dbd7544ab2cd585ccf48f360a4'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/fs?id=6d04dfc8966019b8b0977b2cb942351f13d2b178'>6d04dfc8966019b8b0977b2cb942351f13d2b178</a> (<a href='/cgit.cgi/linux/net-next.git/diff/fs?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b&id2=6d04dfc8966019b8b0977b2cb942351f13d2b178'>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'>All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> </div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>Diffstat</a> (limited to 'fs')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/fs/cifs/readdir.c?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>fs/cifs/readdir.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='32%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/fs/fscache/cookie.c?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>fs/fscache/cookie.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='32%'><tr><td class='add' style='width: 15.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 84.4%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/fs/fscache/netfs.c?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>fs/fscache/netfs.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='32%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/fs/fscache/object.c?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>fs/fscache/object.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='32%'><tr><td class='add' style='width: 93.8%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/fs/nfs/nfs4proc.c?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>fs/nfs/nfs4proc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='32%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/fs/nfs/nfs4state.c?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>fs/nfs/nfs4state.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='32%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit.cgi/linux/net-next.git/diff/fs/nfs/pnfs.c?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>fs/nfs/pnfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='32%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr> </table><div class='diffstat-summary'>7 files changed, 42 insertions, 4 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c