Merge branch 's390-qeth-fixes'