diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-06 19:15:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-06 19:15:23 -0700 |
commit | 2c669275dc3245e2866a0eea15bda8ec8d1ab8db (patch) | |
tree | a977377155b3199333f9f1a1bcdbb351f52ce124 /arch/ia64/include | |
parent | 6e6c5b960644125b6f2fc2cd04e62bff0771923e (diff) | |
parent | 0c6b2975a9a7a86cbdce0054b0b9690ed6afc0fe (diff) | |
download | talos-obmc-linux-2c669275dc3245e2866a0eea15bda8ec8d1ab8db.tar.gz talos-obmc-linux-2c669275dc3245e2866a0eea15bda8ec8d1ab8db.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Martin Schwidefsky:
- The fixup for the blk-mq clash with the scm driver
- An improvement for the dasd driver in regard to raw I/O
- Bug fixes and cleanup
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
Update my email address
s390/syscalls: Fix out of bounds arguments access
s390/vfio_ccw: remove unused variable
s390/dasd: remove unneeded code
s390/crash: Remove unused KEXEC_NOTE_BYTES
s390/zcrypt: Fix missing newlines at some debug feature messages.
s390/dasd: Make raw I/O usable without prefix support
s390/dasd: Rename dasd_raw_build_cp()
s390/dasd: Refactor prefix_LRE() and related functions
s390: fix up for "blk-mq: switch ->queue_rq return value to blk_status_t"
Diffstat (limited to 'arch/ia64/include')
0 files changed, 0 insertions, 0 deletions