diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 06:01:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 06:01:59 -0700 |
| commit | 260d16580db018e3faeb1992c70c13bf00e726b8 (patch) | |
| tree | de12ab8c1c47c7070b7a14e6f31a67bc90a74455 /block/blk-core.c | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux (diff) | |
| parent | s390/dasd: blk-mq conversion (diff) | |
| download | linux-dev-260d16580db018e3faeb1992c70c13bf00e726b8.tar.xz linux-dev-260d16580db018e3faeb1992c70c13bf00e726b8.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 second patch set for the 4.14 merge window:
- Convert the dasd device driver to the blk-mq interface.
- Provide three zcrypt interfaces for vfio_ap. These will be required
for KVM guest access to the crypto cards attached via the AP bus.
- A couple of memory management bug fixes."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/dasd: blk-mq conversion
s390/mm: use a single lock for the fields in mm_context_t
s390/mm: fix race on mm->context.flush_mm
s390/mm: fix local TLB flushing vs. detach of an mm address space
s390/zcrypt: externalize AP queue interrupt control
s390/zcrypt: externalize AP config info query
s390/zcrypt: externalize test AP queue
s390/mm: use VM_BUG_ON in crst_table_[upgrade|downgrade]
Diffstat (limited to 'block/blk-core.c')
0 files changed, 0 insertions, 0 deletions