Merge branch 's390-next'
authorDavid S. Miller <davem@davemloft.net>
Fri, 20 Oct 2017 12:11:05 +0000 (13:11 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Oct 2017 12:11:05 +0000 (13:11 +0100)
Julian Wiedmann says:

====================
s390/net: updates 2017-10-18

please apply some additional robustness fixes and cleanups for 4.15.
====================

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

Trivial merge