summaryrefslogtreecommitdiff
path: root/astraceroute/Makefile
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2013-07-13 17:41:41 +0200
committerTobias Klauser <tklauser@distanz.ch>2013-07-13 17:42:14 +0200
commite4465480c2fb8b23a0786e6d395597ea3d0d9888 (patch)
tree37564fd42c5a5a34e1788f61a8af52455827c310 /astraceroute/Makefile
parent634fddf161d80503d0e1cef59272152611317a76 (diff)
pcap_io: Use iterator variable of correct type
array_size() returns size_t, thus make i size_t too to avoid a warning regarding comparison of signed/unsigned. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'astraceroute/Makefile')
0 files changed, 0 insertions, 0 deletions
af6273fc683cd98cd0ce7bf0d04a02eed6742'>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 'tools/perf/bench/sched-messaging.c')