Merge branch 's390-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Aug 2017 17:58:40 +0000 (10:58 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Aug 2017 17:58:40 +0000 (10:58 -0700)
Julian Wiedmann says:

====================
s390/net: updates for 4.14

a mixed bag of minor fixes, cleanups and refactors for net-next. Please apply.
====================

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

Trivial merge