diff options
| author | Linus Torvalds | 2015-05-21 19:54:50 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2015-05-21 19:54:50 -0700 |
| commit | 2f8126e3964261db3184d95bff1ae801e61239e9 (patch) | |
| tree | 8772e7dc91ca5393cdea9fd687287a12093c85f1 /crypto/algapi.c | |
| parent | 0c68e5bf6a5487305cff616aea4d98fa35affc30 (diff) | |
| parent | 7cded342c09f633666e71ee1ce048f218a9c5836 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Bug fixes.
Three for our crypto code, two for eBPF, and one memory management fix
to get machines with memory > 8TB working"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/mm: correct return value of pmd_pfn
s390/crypto: fix stckf loop
s390/zcrypt: Fix invalid domain handling during ap module unload
s390/bpf: Fix gcov stack space problem
s390/zcrypt: fixed ap poll timer behavior
s390/bpf: Adjust ALU64_DIV/MOD to match interpreter change
Diffstat (limited to 'crypto/algapi.c')
0 files changed, 0 insertions, 0 deletions