From 92760e4c9c62a21bd9eedf969ae71653cc86771b Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 9 Jun 2011 11:23:37 -0700
Subject: [PATCH] --- yaml --- r: 253320 b: refs/heads/master c:
 29cf519ee086686e5f0fc91cbb2d601dd1190f9c h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/lib/vsprintf.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 95dcca1f62d7..d80c635d6c4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dac853ae89043f1b7752875300faf614de43c74b
+refs/heads/master: 29cf519ee086686e5f0fc91cbb2d601dd1190f9c
diff --git a/trunk/lib/vsprintf.c b/trunk/lib/vsprintf.c
index c11205688fb4..4365df31a1d5 100644
--- a/trunk/lib/vsprintf.c
+++ b/trunk/lib/vsprintf.c
@@ -666,6 +666,8 @@ char *ip6_compressed_string(char *p, const char *addr)
 			colonpos = i;
 		}
 	}
+	if (longest == 1)		/* don't compress a single 0 */
+		colonpos = -1;
 
 	/* emit address */
 	for (i = 0; i < range; i++) {
@@ -826,7 +828,7 @@ int kptr_restrict __read_mostly;
  *       IPv4 uses dot-separated decimal with leading 0's (010.123.045.006)
  * - '[Ii]4[hnbl]' IPv4 addresses in host, network, big or little endian order
  * - 'I6c' for IPv6 addresses printed as specified by
- *       http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00
+ *       http://tools.ietf.org/html/rfc5952
  * - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form
  *       "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
  *       Options for %pU are: