[PATCH 0/2] consolidated s390 device configuration