diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-13 15:07:11 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-13 15:07:11 +0900 |
| commit | 2ab99b001dea71c25bcf34f746f5781c880151bb (patch) | |
| tree | 887f2bdef2489f97a5653b462f246023c098bd33 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Linux 4.12-rc5 (diff) | |
| parent | s390: update defconfig (diff) | |
| download | wireguard-linux-2ab99b001dea71c25bcf34f746f5781c880151bb.tar.xz wireguard-linux-2ab99b001dea71c25bcf34f746f5781c880151bb.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
- A fix for KVM to avoid kernel oopses in case of host protection
faults due to runtime instrumentation
- A fix for the AP bus to avoid dead devices after unbind / bind
- A fix for a compile warning merged from the vfio_ccw tree
- Updated default configurations
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: update defconfig
s390/zcrypt: Fix blocking queue device after unbind/bind.
s390/vfio_ccw: make some symbols static
s390/kvm: do not rely on the ILC on kvm host protection fauls
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions