projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9e1a27c
325694e
)
Merge branch 'cxgb4-fix-build-error'
author
David S. Miller
<davem@davemloft.net>
Wed, 24 Jan 2018 15:56:59 +0000
(10:56 -0500)
committer
David S. Miller
<davem@davemloft.net>
Wed, 24 Jan 2018 15:56:59 +0000
(10:56 -0500)
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>
Trivial merge