Merge branch 'mm-hotfixes-stable' into mm-nonmm-stable to pick up changes

required to merge "kho: use unsigned long for nr_pages".

diff --cc kernel/liveupdate/kexec_handover.c
Simple merge

diff --cc kernel/vmcore_info.c
Simple merge