Merge tag 'v3.11-rc5' into perf/core

Merge Linux 3.11-rc5, to sync up with the latest upstream fixes since -rc1.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index ca9fa4d32e07..07819bfa7dba 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -1026,9 +1026,10 @@ kvp_get_ip_info(int family, char *if_name, int op,
 
                                 if (sn_offset == 0)
                                         strcpy(sn_str, cidr_mask);
-                                else
+                                else {
+                                        strcat((char *)ip_buffer->sub_net, ";");
                                         strcat(sn_str, cidr_mask);
-                                strcat((char *)ip_buffer->sub_net, ";");
+                                }
                                 sn_offset += strlen(sn_str) + 1;
                         }