Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index eb62e58bff79..cf0cdeeb1db0 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -54,8 +54,8 @@ static int sockstat_seq_show(struct seq_file *seq, void *v)
         int orphans, sockets;
 
         local_bh_disable();
-        orphans = percpu_counter_sum_positive(&tcp_orphan_count),
-        sockets = percpu_counter_sum_positive(&tcp_sockets_allocated),
+        orphans = percpu_counter_sum_positive(&tcp_orphan_count);
+        sockets = percpu_counter_sum_positive(&tcp_sockets_allocated);
         local_bh_enable();
 
         socket_seq_show(seq);