diff options
author | 2016-11-09 11:09:40 -0800 | |
---|---|---|
committer | 2016-11-09 11:09:40 -0800 | |
commit | ae67e87f408bbf2533f246049d6e66320f3b7a81 (patch) | |
tree | fed4dd38e3c72f49d72aa725fa718ca338088faf /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'iommu-fixes-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (diff) | |
parent | percpu: use notrace variant of preempt_disable/preempt_enable (diff) | |
download | wireguard-linux-ae67e87f408bbf2533f246049d6e66320f3b7a81.tar.xz wireguard-linux-ae67e87f408bbf2533f246049d6e66320f3b7a81.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Two bug fixes
- a memory alignment fix in the s390 only hypfs code
- a fix for the generic percpu code that caused ftrace to break on
s390. This is not relevant for x86 but for all architectures that
use the generic percpu code"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
percpu: use notrace variant of preempt_disable/preempt_enable
s390/hypfs: Use get_free_page() instead of kmalloc to ensure page alignment
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions