diff options
| author | Linus Torvalds <[email protected]> | 2020-05-22 15:51:39 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2020-05-22 15:51:39 +0000 |
| commit | c8347bbf19f265c1bd254ca148f27caa71e77d61 (patch) | |
| tree | 06b20776bda5f6f2e5b801ebd010dbd028332928 /tools/perf/scripts/python/event_analyzing_sample.py | |
| parent | Merge tag 'apparmor-pr-2020-05-21' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | powerpc/64s: Disable STRICT_KERNEL_RWX (diff) | |
| download | kernel-c8347bbf19f265c1bd254ca148f27caa71e77d61.tar.gz kernel-c8347bbf19f265c1bd254ca148f27caa71e77d61.zip | |
Merge tag 'powerpc-5.7-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- a revert of a recent change to the PTE bits for 32-bit BookS, which
broke swap.
- a "fix" to disable STRICT_KERNEL_RWX for 64-bit in Kconfig, as it's
causing crashes for some people.
Thanks to Christophe Leroy and Rui Salvaterra.
* tag 'powerpc-5.7-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/64s: Disable STRICT_KERNEL_RWX
Revert "powerpc/32s: reorder Linux PTE bits to better match Hash PTE bits."
Diffstat (limited to 'tools/perf/scripts/python/event_analyzing_sample.py')
0 files changed, 0 insertions, 0 deletions
