diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-05 18:33:35 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-05 18:33:35 +0100 |
| commit | cfb4b571e8b56b65d1a893bda5153647fda823b9 (patch) | |
| tree | d507f6ab8f0eb8bc52ad7b9371d442ecafef35d4 /Documentation/features | |
| parent | Merge branch 'parisc-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | s390/pkey/zcrypt: Support EP11 AES secure keys (diff) | |
| download | linux-cfb4b571e8b56b65d1a893bda5153647fda823b9.tar.xz linux-cfb4b571e8b56b65d1a893bda5153647fda823b9.zip | |
Merge tag 's390-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Vasily Gorbik:
"The second round of s390 fixes and features for 5.6:
- Add KPROBES_ON_FTRACE support
- Add EP11 AES secure keys support
- PAES rework and prerequisites for paes-s390 ciphers selftests
- Fix page table upgrade for hugetlbfs"
* tag 's390-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/pkey/zcrypt: Support EP11 AES secure keys
s390/zcrypt: extend EP11 card and queue sysfs attributes
s390/zcrypt: add new low level ep11 functions support file
s390/zcrypt: ep11 structs rework, export zcrypt_send_ep11_cprb
s390/zcrypt: enable card/domain autoselect on ep11 cprbs
s390/crypto: enable clear key values for paes ciphers
s390/pkey: Add support for key blob with clear key value
s390/crypto: Rework on paes implementation
s390: support KPROBES_ON_FTRACE
s390/mm: fix dynamic pagetable upgrade for hugetlbfs
Diffstat (limited to 'Documentation/features')
| -rw-r--r-- | Documentation/features/debug/kprobes-on-ftrace/arch-support.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/features/debug/kprobes-on-ftrace/arch-support.txt b/Documentation/features/debug/kprobes-on-ftrace/arch-support.txt index 4fae0464ddff..32b297295fff 100644 --- a/Documentation/features/debug/kprobes-on-ftrace/arch-support.txt +++ b/Documentation/features/debug/kprobes-on-ftrace/arch-support.txt @@ -24,7 +24,7 @@ | parisc: | ok | | powerpc: | ok | | riscv: | TODO | - | s390: | TODO | + | s390: | ok | | sh: | TODO | | sparc: | TODO | | um: | TODO | |