Merge branch 'cxgb4-fix-build-error'
authorDavid S. Miller <davem@davemloft.net>
Wed, 24 Jan 2018 15:56:59 +0000 (10:56 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Jan 2018 15:56:59 +0000 (10:56 -0500)
commit969ade4086b9f25ac345637b549074ed341bf729
tree2da504879fe5907464ec7278345ea831c4150fcc
parent9e1a27cdaba7da6ab3b78798653c9be454810435
parent325694e6c3484959d066d5c0e9bff4c5966491a3
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>