summaryrefslogtreecommitdiff
path: root/curvetun.zsh
diff options
context:
space:
mode:
authorDaniel Borkmann <daniel@iogearbox.net>2015-05-07 13:32:59 +0200
committerDaniel Borkmann <daniel@iogearbox.net>2015-05-07 13:32:59 +0200
commitd9432291168e7e15877bdd4c1c23ed0dc8913246 (patch)
tree745641f1ffb472aeee59b05a660306a6b82b1422 /curvetun.zsh
parentf6d211974eff4ba67461262031af54fdb4f54210 (diff)
netsniff-ng: add comment wrt NOATIME and fix whitespace
Just add a comment to the reader, so that it's obvious. The second condition could have been spared in case of open_or_die(), but it's nothing critical and the extra indent can be spared instead. Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'curvetun.zsh')
0 files changed, 0 insertions, 0 deletions
45e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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 <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_ib.c')