summaryrefslogtreecommitdiff
path: root/curvetun_mgmt_users.c
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-11 19:10:43 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-11 19:10:43 +0200
commit3163b713c4dbb0f92be80c57a8c720692e71df7f (patch)
tree43243435b8fcb86d0d9891d9cc7bc30d45592f41 /curvetun_mgmt_users.c
parent6511978b4b367e078e9a205e1109f7bd75d01ec5 (diff)
ifpps: align avg on systems with >8 CPUs
When running ifpps on systems with 16, 32 or more CPUs, 'avg:...' field is not being padded with witespaces as the rest of the CPU lines. This patch does that. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'curvetun_mgmt_users.c')
0 files changed, 0 insertions, 0 deletions
=nds-private-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&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 'include/dt-bindings/i2c')