| commit | fe23429e6bfec817abcf316f4782aed8426ea745 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 27 20:32:24 2017 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 27 20:32:24 2017 -0700 |
| tree | 097c9cb40381934d674d05927b95f15cb5d7d629 | |
| parent | d3eab75a7fdd32b4b9c342a07be3525c4d31a41a [diff] | |
| parent | 0a5e2ec2647737907d267c09dc9a25fab1468865 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux Pull s390 fix from Martin Schwidefsky: "A fix for a regression in regard to machine check handling in KVM. Keeping my fingers crossed that this is the last s390 fix for v4.14" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/kvm: fix detection of guest machine checks