diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-27 12:25:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-27 12:25:26 -0800 |
| commit | 69978aa0f21f43529e11f924504dadb6ce2f229a (patch) | |
| tree | cad7f9c9b01b7d1839a3d12e9178ceb5b2b33873 /include/kvm | |
| parent | 2b4321503e62523e701405163a034875e92d68cf (diff) | |
| parent | 0d6da872d3e4a60f43c295386d7ff9a4cdcd57e9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Another two bug fixes:
- ptrace partial write information leak
- a guest page hinting regression introduced with v4.6"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/mm: Fix cmma unused transfer from pgste into pte
s390/ptrace: Preserve previous registers for short regset write
Diffstat (limited to 'include/kvm')