diff options
author | 2018-01-05 12:17:33 -0800 | |
---|---|---|
committer | 2018-01-05 12:17:33 -0800 | |
commit | 3eac69038322f52b7366e4e6bbdb06e749714133 (patch) | |
tree | ba00fba16bea1ffcc56d28c5653268ca7dc9389c /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'for-linus-4.15-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip (diff) | |
parent | s390/dasd: fix wrongly assigned configuration data (diff) | |
download | wireguard-linux-3eac69038322f52b7366e4e6bbdb06e749714133.tar.xz wireguard-linux-3eac69038322f52b7366e4e6bbdb06e749714133.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Four bug fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/dasd: fix wrongly assigned configuration data
s390: fix preemption race in disable_sacf_uaccess
s390/sclp: disable FORTIFY_SOURCE for early sclp code
s390/pci: handle insufficient resources during dma tlb flush
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions