diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-11 19:28:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-11 19:28:48 +0100 |
| commit | fb7453e61a2b6c29ab08f87b71e2647efe816526 (patch) | |
| tree | edf5ab760dfb5d953d80b5f267ce627a1961189d /net/dccp/ccid.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mat... (diff) | |
| parent | Revert "s390/pci: remove bit_lock usage in interrupt handler" (diff) | |
| download | linux-fb7453e61a2b6c29ab08f87b71e2647efe816526.tar.xz linux-fb7453e61a2b6c29ab08f87b71e2647efe816526.zip | |
Merge tag 's390-5.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 bug fixes from Martin Schwidefsky:
- Fix specification exception on z196 during ap probe
- A fix for suspend-to-disk, the VMAP stack patch broke the
swsusp_arch_suspend function
- The EMC CKD ioctl of the dasd driver needs an additional size check
for user space data
- Revert an incorrect patch for the PCI base code that removed a bit
lock that turned out to be required after all
* tag 's390-5.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
Revert "s390/pci: remove bit_lock usage in interrupt handler"
s390/zcrypt: fix specification exception on z196 during ap probe
s390/dasd: fix using offset into zero size array error
s390/suspend: fix stack setup in swsusp_arch_suspend
Diffstat (limited to 'net/dccp/ccid.h')
0 files changed, 0 insertions, 0 deletions