Merge tag 'efi-urgent' into x86/urgent

 * Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/mm/srat.c
Simple merge

diff --cc include/linux/vmstat.h
Simple merge

diff --cc lib/Makefile
Simple merge