Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

All merge conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 0 deletions

diff --git a/geoip.c b/geoip.c
index 78b20fe..439c052 100644
--- a/geoip.c
+++ b/geoip.c
@@ -150,6 +150,9 @@ static void geoip_inflate(int which)
 	while ((ret = gzread(fpi, raw, sizeof(raw))) && ret2)
 		ret2 = fwrite(raw, ret, 1, fpo);
 
+	if (!gzeof(fpi))
+		panic("Error in gzread: %s\n", gzerror(fpi, &ret));
+
 	gzclose(fpi);
 	fclose(fpo);
 }