Hi Jens, please apply the following patches for the next merge window. They clean up the string handling in the DASD driver. Jan Höppner (10): s390/dasd: Simplify uid string generation s390/dasd: Use sysfs_emit() over sprintf() s390/dasd: Remove unnecessary errorstring generation s390/dasd: Move allocation error message to DBF s390/dasd: Remove unused message logging macros s390/dasd: Use dev_err() over printk() s390/dasd: Remove %p format specifier from error messages s390/dasd: Remove PRINTK_HEADER and KMSG_COMPONENT definitions s390/dasd: Use dev_*() for device log messages s390/dasd: Improve ERP error messages drivers/s390/block/dasd.c | 101 +++++++------------ drivers/s390/block/dasd_3990_erp.c | 80 ++++----------- drivers/s390/block/dasd_alias.c | 8 -- drivers/s390/block/dasd_devmap.c | 34 +++---- drivers/s390/block/dasd_diag.c | 4 - drivers/s390/block/dasd_eckd.c | 157 +++++++++++------------------ drivers/s390/block/dasd_eer.c | 7 -- drivers/s390/block/dasd_erp.c | 9 +- drivers/s390/block/dasd_fba.c | 55 ++++------ drivers/s390/block/dasd_genhd.c | 5 - drivers/s390/block/dasd_int.h | 29 ------ drivers/s390/block/dasd_ioctl.c | 6 -- drivers/s390/block/dasd_proc.c | 5 - 13 files changed, 153 insertions(+), 347 deletions(-) -- 2.40.1
