diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-23 20:42:12 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-23 20:42:12 +0300 |
| commit | 9bca7c40850eca2613d79878e6d730faeaa602cf (patch) | |
| tree | 12d6c145a1b194bb3bb028f4bddb34573440934b /fs/btrfs/dev-replace.c | |
| parent | e644645abf4788e919beeb97925fb6bf43e890a2 (diff) | |
| parent | 4c1cbcbd6c56c79de2c07159be4f55386bb0bef2 (diff) | |
| download | linux-9bca7c40850eca2613d79878e6d730faeaa602cf.tar.xz | |
Merge tag 's390-5.7-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik:
- Add missing R_390_JMP_SLOT relocation type in KASLR code.
- Fix set_huge_pte_at for empty ptes issue which has been uncovered
with arch page table helper tests.
- Correct initrd location for kdump kernel.
- Fix s390_mmio_read/write with MIO in PCI code.
* tag 's390-5.7-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/kaslr: add support for R_390_JMP_SLOT relocation type
s390/mm: fix set_huge_pte_at() for empty ptes
s390/kexec_file: fix initrd location for kdump kernel
s390/pci: Fix s390_mmio_read/write with MIO
Diffstat (limited to 'fs/btrfs/dev-replace.c')
0 files changed, 0 insertions, 0 deletions