diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-07 10:59:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-07 10:59:23 -0800 |
| commit | 69f39c570561bb49efcaaf58e0dd96d90f5fc571 (patch) | |
| tree | 2d738aea4fa611e36c8228f7e2c2ecb2c3dacec4 /fs/nfs/callback_proc.c | |
| parent | b910a91836dae6612942bb07ad925460fd109dd0 (diff) | |
| parent | d3f468963cd6fd6d2aa5e26aed8b24232096d0e1 (diff) | |
| download | linux-69f39c570561bb49efcaaf58e0dd96d90f5fc571.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Nine bug fixes for s390:
- Three fixes for the expoline code, one of them is strictly speaking
a cleanup but as it relates to code added with 4.16 I would like to
include the patch.
- Three timer related fixes in the common I/O layer
- A fix for the handling of internal DASD request which could cause
panics.
- One correction in regard to the accounting of pud page tables vs.
compat tasks.
- The register scrubbing in entry.S caused spurious crashes, this is
fixed now as well"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/entry.S: fix spurious zeroing of r0
s390: Fix runtime warning about negative pgtables_bytes
s390: do not bypass BPENTER for interrupt system calls
s390/cio: clear timer when terminating driver I/O
s390/cio: fix return code after missing interrupt
s390/cio: fix ccw_device_start_timeout API
s390/clean-up: use CFI_* macros in entry.S
s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*)
s390/dasd: fix handling of internal requests
Diffstat (limited to 'fs/nfs/callback_proc.c')
0 files changed, 0 insertions, 0 deletions