Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Tue, 19 Jun 2018 09:08:39 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23990392AbeFSHIlsq8PJ/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue Jun 19 09:07:30 2018 +0200 Commit: 5c5307e37fce2badec37dbfc606a1a306833cba2 Gitweb: https://git.linux-mips.org/g/ralf/linux/5c5307e37fce Branch: master --- MAINTAINERS | 9 ++ arch/s390/include/asm/css_chars.h | 62 +++++++------ drivers/s390/block/dasd.c | 171 ++++++++++++------------------------- drivers/s390/block/dasd_alias.c | 6 + drivers/s390/block/dasd_diag.c | 3 - drivers/s390/block/dasd_eckd.c | 46 +++++----- drivers/s390/block/dasd_eer.c | 10 +- drivers/s390/block/dasd_fba.c | 6 + drivers/s390/block/dasd_int.h | 26 +----- drivers/s390/cio/Makefile | 1 drivers/s390/cio/vfio_ccw_cp.c | 140 ++++++++++++++++-------------- drivers/s390/cio/vfio_ccw_drv.c | 5 + drivers/s390/cio/vfio_ccw_fsm.c | 17 +++- drivers/s390/cio/vfio_ccw_trace.h | 54 ++++++++++++ fs/jfs/xattr.c | 10 +- mm/memblock.c | 1 16 files changed, 296 insertions(+), 271 deletions(-)