diff options
author | 2017-07-18 11:36:53 +0200 | |
---|---|---|
committer | 2017-07-18 11:36:53 +0200 | |
commit | 1ed7d32763857fbdc8e406352404538e41050d22 (patch) | |
tree | f97c5d8f548141bf7cdec0a9d7f22adb61da6efc /tools/perf/scripts/python/export-to-postgresql.py | |
parent | x86/mm: Enable CR4.PCIDE on supported systems (diff) | |
parent | x86/boot/KASLR: Rename process_e820_entry() into process_mem_region() (diff) | |
download | linux-rng-1ed7d32763857fbdc8e406352404538e41050d22.tar.xz linux-rng-1ed7d32763857fbdc8e406352404538e41050d22.zip |
Merge branch 'x86/boot' into x86/mm, to pick up interacting changes
The SME patches we are about to apply add some E820 logic, so merge in
pending E820 code changes first, to have a single code base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions