git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 194a974 7958b22)

author	Ingo Molnar <mingo@kernel.org>
	Mon, 12 Mar 2018 11:10:03 +0000 (12:10 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Mon, 12 Mar 2018 11:10:03 +0000 (12:10 +0100)
commit	3c76db70eb70a0fbd40b3e0dec8f69ca344d1ff8
tree	a9dd314ac18992cdc2c50d4de60535a1b76ee351	tree \| snapshot
parent	194a9749c73d650c0b1dfdee04fb0bdf0a888ba8	commit \| diff
parent	7958b2246fadf54b7ff820a2a5a2c5ca1554716f	commit \| diff

Merge branch 'x86/pti' into x86/mm, to pick up dependencies

Signed-off-by: Ingo Molnar <mingo@kernel.org>

12 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/nospec-branch.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/paravirt.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable_32.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable_64.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
include/linux/compiler-gcc.h	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree