diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-15 13:12:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-15 13:12:44 -0700 |
| commit | 9c69481ed0b4e6e525e6d8d4d3d83b612397e67d (patch) | |
| tree | 9d3f5e32f77662ead3b53f43ac43199f1ec6dcd7 /Makefile | |
| parent | 97d6e2b636c6e07b99965f3db9f20950d7de2ecc (diff) | |
| parent | cad49cfc44a5160e3fa09b18e4e7f7cacd13f27d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"One improvement for the zcrypt driver, the quality attribute for the
hwrng device has been missing. Without it the kernel entropy seeding
will not happen automatically.
And six bug fixes, the most important one is the fix for the vector
register corruption due to machine checks"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/nmi: fix vector register corruption
s390/process: fix sfpc inline assembly
s390/dasd: fix kernel panic when alias is set offline
s390/sclp: clear upper register halves in _sclp_print_early
s390/oprofile: fix compile error
s390/sclp: fix compile error
s390/zcrypt: enable s390 hwrng to seed kernel entropy
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions