From: David S. Miller <davem@davemloft.net>
Date: Wed, 24 Jan 2018 15:56:59 +0000 (-0500)
Subject: Merge branch 'cxgb4-fix-build-error'
X-Git-Tag: v4.16-rc1~123^2~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=969ade4086b9f25ac345637b549074ed341bf729;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'cxgb4-fix-build-error'

Rahul Lakkireddy says:

====================
cxgb4: fix build error

Patch 1 fixes build error with compiling cudbg_zlib.c when
CONFIG_ZLIB_DEFLATE macro is not defined.

Patch 2 fixes following sparse warning:
"Using plain integer as NULL pointer"
====================

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

969ade4086b9f25ac345637b549074ed341bf729