Merge branch 's390-net-fixes'
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 May 2017 16:37:49 +0000 (12:37 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 May 2017 16:37:49 +0000 (12:37 -0400)
Julian Wiedmann says:

====================
s390/net fixes

some qeth fixes for -net, the OSM/OSN one being the most crucial.
Please also queue these up for stable.
====================

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

Trivial merge