diff options
author | 2021-02-12 13:39:32 +0100 | |
---|---|---|
committer | 2021-02-12 13:40:02 +0100 | |
commit | 40c1fa52cdb7c13ef88232e374b4b8ac8d820c4f (patch) | |
tree | 9343f6be910d5ccd6195a68ef9f4c251abc7418c /tools/perf/scripts/python/export-to-postgresql.py | |
parent | x86/{fault,efi}: Fix and rename efi_recover_from_page_fault() (diff) | |
parent | x86/Kconfig: Remove HPET_EMULATE_RTC depends on RTC (diff) | |
download | wireguard-linux-40c1fa52cdb7c13ef88232e374b4b8ac8d820c4f.tar.xz wireguard-linux-40c1fa52cdb7c13ef88232e374b4b8ac8d820c4f.zip |
Merge branch 'x86/cleanups' into x86/mm
Merge recent cleanups to the x86 MM code to resolve a conflict.
Conflicts:
arch/x86/mm/fault.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions