diff options
author | 2018-07-13 11:44:12 -0700 | |
---|---|---|
committer | 2018-07-13 11:44:12 -0700 | |
commit | e6ef760731ada512d7258c5ed48423144f831eab (patch) | |
tree | b4f5abb16bace95751b5648c993559ef584e1ca6 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'trace-v4.18-rc3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
parent | ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot (diff) | |
download | linux-dev-e6ef760731ada512d7258c5ed48423144f831eab.tar.xz linux-dev-e6ef760731ada512d7258c5ed48423144f831eab.zip |
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A couple of small fixes this time around from Steven for an
interaction between ftrace and kernel read-only protection, and
Vladimir for nommu"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot
ARM: 8775/1: NOMMU: Use instr_sync instead of plain isb in common code
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions