git.kernel.dk Git - linux-2.6-block.git/commit

author	Ingo Molnar <mingo@kernel.org>
	Tue, 18 Jul 2017 09:36:53 +0000 (11:36 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 18 Jul 2017 09:36:53 +0000 (11:36 +0200)
commit	1ed7d32763857fbdc8e406352404538e41050d22
tree	f97c5d8f548141bf7cdec0a9d7f22adb61da6efc	tree \| snapshot
parent	660da7c9228f685b2ebe664f9fd69aaddcc420b5	commit \| diff
parent	27aac20574110abfd594175a668dc58b23b2b14a	commit \| diff

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>

Linux 6.x block layer and io_uring tree(s)

RSS Atom

Documentation/admin-guide/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten_pv.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu_pv.c	diff1 \|	diff2 \|	blob \| history
drivers/idle/intel_idle.c	diff1 \|	diff2 \|	blob \| history