Merge branch 'tipc-two-small-cleanups'
authorDavid S. Miller <davem@davemloft.net>
Fri, 5 Jan 2018 18:37:04 +0000 (13:37 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 5 Jan 2018 18:37:04 +0000 (13:37 -0500)
commiteb9aa1bfbad8c9fc280adf43cb480911295cfa3f
treec57200a8b9cf7491f3845e1d3c0b64c45d2dadad
parenta31e795a3b4d8808724c7ea80f382b0fda85be0f
parentd84d1b3b6b8c296de8d394002bc3a0ca910d7460
Merge branch 'tipc-two-small-cleanups'

Jon Maloy says:

====================
tipc: two small cleanups

These two commits are based on commit f9c935db8086 ("tipc: fix
problems with multipoint-to-point flow control") which has been
applied to 'net' but not yet to 'net-next'.
====================

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