git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 52fa82c 054ac8a)

author	Borislav Petkov <bp@suse.de>
	Wed, 31 Mar 2021 16:04:19 +0000 (18:04 +0200)
committer	Borislav Petkov <bp@suse.de>
	Wed, 31 Mar 2021 16:04:19 +0000 (18:04 +0200)
commit	f2ac256b9a8b7e79847efcd82bd10fd876369b9f
tree	8769fa5130754ecc605df8803650293f88357879	tree \| snapshot
parent	52fa82c21f64e900a72437269a5cc9e0034b424e	commit \| diff
parent	054ac8ad5ebe4a69e1f0e842483821ddbe560121	commit \| diff

Merge 'x86/alternatives'

Pick up dependent changes.

Signed-off-by: Borislav Petkov <bp@suse.de>

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/smap.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/alternative.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/kvmclock.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten_pv.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git